tweak

astubbs · Apr 21, 2022 · b4ab4f9 · b4ab4f9
1 parent 7e4fcd3
commit b4ab4f9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/generator/src/test/java/io/stubbs/truth/generator/internal/SourceClassSetsTests.java b/generator/src/test/java/io/stubbs/truth/generator/internal/SourceClassSetsTests.java
@@ -16,7 +16,6 @@
  */
 public class SourceClassSetsTests {
 
-    // todo use bootstrapped ResultSubject
     @Test
     public void duplicatesClassInSpecifiedPackage() {
         TruthGenerator tg = TruthGeneratorAPI.createDefaultOptions(TEST_OUTPUT_DIRECTORY);

diff --git a/generator/src/test/java/io/stubbs/truth/generator/internal/TruthGeneratorTest.java b/generator/src/test/java/io/stubbs/truth/generator/internal/TruthGeneratorTest.java
@@ -4,6 +4,7 @@
 import com.google.common.truth.Correspondence;
 import com.google.common.truth.ObjectArraySubject;
 import com.google.common.truth.Truth;
+import io.stubbs.truth.ManagedTruth;
 import io.stubbs.truth.generator.SourceClassSets;
 import io.stubbs.truth.generator.TestModelUtils;
 import io.stubbs.truth.generator.TruthGeneratorAPI;
@@ -240,28 +241,28 @@ public void test_legacy_mode() {
     /**
      * Given a single class or classes, generate subjects for all references classes in any nested return values
      */
-    // todo use bootstrapped ResultSubject
     @Test
     public void recursive_generation() {
         TruthGenerator tg = TruthGeneratorAPI.createDefaultOptions(TEST_OUTPUT_DIRECTORY);
-        var allGeneratedSystems = tg.generate(MyEmployee.class).getAll();
+        var allGeneratedSystems = tg.generate(MyEmployee.class);
 
         //
-        assertThat(allGeneratedSystems).containsKey(MyEmployee.class);
-        assertThat(allGeneratedSystems).containsKey(IdCard.class);
-        assertThat(allGeneratedSystems).containsKey(MyEmployee.State.class);
+        var assertGeneratedSet = ManagedTruth.assertThat(allGeneratedSystems).getAll();
+        assertGeneratedSet.containsKey(MyEmployee.class);
+        assertGeneratedSet.containsKey(IdCard.class);
+        assertGeneratedSet.containsKey(MyEmployee.State.class);
 
         // lost in the generics
-        assertThat(allGeneratedSystems).doesNotContainKey(Project.class);
+        assertGeneratedSet.doesNotContainKey(Project.class);
 
         //
-        assertThat(allGeneratedSystems).containsKey(UUID.class);
-        assertThat(allGeneratedSystems).containsKey(ZonedDateTime.class);
-        assertThat(allGeneratedSystems).containsKey(DayOfWeek.class);
+        assertGeneratedSet.containsKey(UUID.class);
+        assertGeneratedSet.containsKey(ZonedDateTime.class);
+        assertGeneratedSet.containsKey(DayOfWeek.class);
 
         // recursive subjects that shouldn't be included
-        assertThat(allGeneratedSystems).doesNotContainKey(Spliterator.class);
-        assertThat(allGeneratedSystems).doesNotContainKey(Stream.class);
+        assertGeneratedSet.doesNotContainKey(Spliterator.class);
+        assertGeneratedSet.doesNotContainKey(Stream.class);
     }
 
     /**