Add isNotWithin() to Translation2dSubject and Translation3dSubject

Author: kcooney

testing/src/main/java/com/team2813/lib2813/testing/truth/Translation2dSubject.java

@@ -54,12 +54,33 @@ public TolerantComparison<Translation2d> isWithin(double tolerance) {
     return new TolerantComparison<Translation2d>() {
       @Override
       public void of(Translation2d expected) {
-        x().isWithin(tolerance).of(expected.getX());
-        y().isWithin(tolerance).of(expected.getY());
+        if (expected == null) {
+          throw new NullPointerException("Expected value cannot be null.");
+        }
+        checkDistance(expected).isWithin(tolerance).of(0);
       }
     };
   }
 
+  public TolerantComparison<Translation2d> isNotWithin(double tolerance) {
+    return new TolerantComparison<Translation2d>() {
+      @Override
+      public void of(Translation2d expected) {
+        if (expected == null) {
+          throw new NullPointerException("Expected value cannot be null.");
+        }
+        checkDistance(expected).isNotWithin(tolerance).of(0);
+      }
+    };
+  }
+
+  private DoubleSubject checkDistance(Translation2d expected) {
+    if (expected == null) {
+      throw new NullPointerException("Expected value cannot be null.");
+    }
+    return check("%s", actual).that(nonNullActual().getDistance(expected));
+  }
+
   public void isZero() {
     if (!Translation2d.kZero.equals(actual)) {
       failWithActual(simpleFact("expected to be zero"));

testing/src/main/java/com/team2813/lib2813/testing/truth/Translation3dSubject.java

@@ -54,13 +54,33 @@ public TolerantComparison<Translation3d> isWithin(double tolerance) {
     return new TolerantComparison<Translation3d>() {
       @Override
       public void of(Translation3d expected) {
-        x().isWithin(tolerance).of(expected.getX());
-        y().isWithin(tolerance).of(expected.getY());
-        z().isWithin(tolerance).of(expected.getZ());
+        if (expected == null) {
+          throw new NullPointerException("Expected value cannot be null.");
+        }
+        checkDistance(expected).isWithin(tolerance).of(0);
       }
     };
   }
 
+  public TolerantComparison<Translation3d> isNotWithin(double tolerance) {
+    return new TolerantComparison<Translation3d>() {
+      @Override
+      public void of(Translation3d expected) {
+        if (expected == null) {
+          throw new NullPointerException("Expected value cannot be null.");
+        }
+        checkDistance(expected).isNotWithin(tolerance).of(0);
+      }
+    };
+  }
+
+  private DoubleSubject checkDistance(Translation3d expected) {
+    if (expected == null) {
+      throw new NullPointerException("Expected value cannot be null.");
+    }
+    return check("%s", actual).that(nonNullActual().getDistance(expected));
+  }
+
   public void isZero() {
     if (!Translation3d.kZero.equals(actual)) {
       failWithActual(simpleFact("expected to be zero"));

testing/src/test/java/com/team2813/lib2813/testing/truth/Translation2dSubjectTest.java

@@ -15,16 +15,40 @@
 */
 package com.team2813.lib2813.testing.truth;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 import edu.wpi.first.math.geometry.Translation2d;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
 /** Tests for {@link Translation2dSubject}. */
 class Translation2dSubjectTest {
   private static final Translation2d TRANSLATION = new Translation2d(7.353, 0.706);
 
+  @Test
+  public void isWithin_nullActual_throws() {
+    Translation2d actual = null;
+
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> Translation2dSubject.assertThat(actual).isWithin(0.01).of(TRANSLATION));
+    assertThat(e).hasMessageThat().contains("non-null");
+  }
+
+  @Test
+  public void isWithin_nullExpected_throwsNullPointerException() {
+    Translation2d expected = null;
+
+    NullPointerException e =
+        assertThrows(
+            NullPointerException.class,
+            () -> Translation2dSubject.assertThat(TRANSLATION).isWithin(0.01).of(expected));
+    assertThat(e).hasMessageThat().contains("cannot be null");
+  }
+
   @ParameterizedTest
   @ArgumentsSource(Pose2dComponent.TranslationsArgumentsProvider.class)
   public void isWithin_valueWithinTolerance_doesNotThrow(Pose2dComponent component) {
@@ -36,10 +60,28 @@ public void isWithin_valueWithinTolerance_doesNotThrow(Pose2dComponent component
   @ParameterizedTest
   @ArgumentsSource(Pose2dComponent.TranslationsArgumentsProvider.class)
   public void isWithin_valueNotWithinTolerance_throws(Pose2dComponent component) {
-    Translation2d closeTranslation = component.add(TRANSLATION, 0.011);
+    Translation2d closeTranslation = component.add(TRANSLATION, 0.016);
 
     assertThrows(
         AssertionError.class,
         () -> Translation2dSubject.assertThat(closeTranslation).isWithin(0.01).of(TRANSLATION));
   }
+
+  @ParameterizedTest
+  @ArgumentsSource(Pose2dComponent.TranslationsArgumentsProvider.class)
+  public void isNotWithin_valueNotWithinTolerance_doesNotThrow(Pose2dComponent component) {
+    Translation2d closeTranslation = component.add(TRANSLATION, 0.016);
+
+    Translation2dSubject.assertThat(closeTranslation).isNotWithin(0.01).of(TRANSLATION);
+  }
+
+  @ParameterizedTest
+  @ArgumentsSource(Pose2dComponent.TranslationsArgumentsProvider.class)
+  public void isNotWithin_valueWithinTolerance_throws(Pose2dComponent component) {
+    Translation2d closeTranslation = component.add(TRANSLATION, 0.009);
+
+    assertThrows(
+        AssertionError.class,
+        () -> Translation2dSubject.assertThat(closeTranslation).isNotWithin(0.01).of(TRANSLATION));
+  }
 }

testing/src/test/java/com/team2813/lib2813/testing/truth/Translation3dSubjectTest.java

@@ -15,16 +15,40 @@
 */
 package com.team2813.lib2813.testing.truth;
 
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import edu.wpi.first.math.geometry.Translation3d;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 
 /** Tests for {@link Translation3dSubject}. */
 class Translation3dSubjectTest {
   private static final Translation3d TRANSLATION = new Translation3d(7.353, 0.706, 42.00);
 
+  @Test
+  public void isWithin_nullActual_throws() {
+    Translation3d actual = null;
+
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> Translation3dSubject.assertThat(actual).isWithin(0.01).of(TRANSLATION));
+    assertThat(e).hasMessageThat().contains("non-null");
+  }
+
+  @Test
+  public void isWithin_nullExpected_throwsNullPointerException() {
+    Translation3d expected = null;
+
+    NullPointerException e =
+        assertThrows(
+            NullPointerException.class,
+            () -> Translation3dSubject.assertThat(TRANSLATION).isWithin(0.01).of(expected));
+    assertThat(e).hasMessageThat().contains("cannot be null");
+  }
+
   @ParameterizedTest
   @ArgumentsSource(Pose3dComponent.TranslationsArgumentsProvider.class)
   public void isWithin_valueWithinTolerance_doesNotThrow(Pose3dComponent component) {
@@ -36,10 +60,28 @@ public void isWithin_valueWithinTolerance_doesNotThrow(Pose3dComponent component
   @ParameterizedTest
   @ArgumentsSource(Pose3dComponent.TranslationsArgumentsProvider.class)
   public void isWithin_valueNotWithinTolerance_throws(Pose3dComponent component) {
-    Translation3d closeTranslation = component.add(TRANSLATION, 0.011);
+    Translation3d closeTranslation = component.add(TRANSLATION, 0.04);
 
     assertThrows(
         AssertionError.class,
         () -> Translation3dSubject.assertThat(closeTranslation).isWithin(0.01).of(TRANSLATION));
   }
+
+  @ParameterizedTest
+  @ArgumentsSource(Pose3dComponent.TranslationsArgumentsProvider.class)
+  public void isNotWithin_valueNotWithinTolerance_doesNotThrow(Pose3dComponent component) {
+    Translation3d closeTranslation = component.add(TRANSLATION, 0.016);
+
+    Translation3dSubject.assertThat(closeTranslation).isNotWithin(0.01).of(TRANSLATION);
+  }
+
+  @ParameterizedTest
+  @ArgumentsSource(Pose3dComponent.TranslationsArgumentsProvider.class)
+  public void isNotWithin_valueWithinTolerance_throws(Pose3dComponent component) {
+    Translation3d closeTranslation = component.add(TRANSLATION, 0.009);
+
+    assertThrows(
+        AssertionError.class,
+        () -> Translation3dSubject.assertThat(closeTranslation).isNotWithin(0.01).of(TRANSLATION));
+  }
 }