Make entity state comparison in migration tests clearer

Author: dmitrykuzmin

server/src/test/java/io/spine/server/procman/ProcessManagerRepositoryTest.java

@@ -721,10 +721,22 @@ void performCustomMigrationForMultiple() {
                 repository.find(filters, ResponseFormat.getDefaultInstance());
 
         ImmutableList<TestProcessManager> results = ImmutableList.copyOf(foundAfterMigration);
+        Project expectedState1 = pm1
+                .state()
+                .toBuilder()
+                .setName(SetTestProcessName.NEW_NAME)
+                .setIdString(pm1.getIdString())
+                .build();
+        Project expectedState2 = pm2
+                .state()
+                .toBuilder()
+                .setName(SetTestProcessName.NEW_NAME)
+                .setIdString(pm2.getIdString())
+                .build();
         assertThat(results).hasSize(2);
         assertThat(results)
-                .comparingElementsUsing(stateWithPropagatedName())
-                .containsExactly(pm1, pm2);
+                .comparingElementsUsing(entityState())
+                .containsExactly(expectedState1, expectedState2);
     }
 
     @Test
@@ -791,10 +803,20 @@ void updateColumnsForMultiple() {
                 repository.find(filters, ResponseFormat.getDefaultInstance());
 
         ImmutableList<TestProcessManager> results = ImmutableList.copyOf(found);
+        Project expectedState1 = pm1
+                .state()
+                .toBuilder()
+                .setIdString(pm1.getIdString())
+                .build();
+        Project expectedState2 = pm2
+                .state()
+                .toBuilder()
+                .setIdString(pm2.getIdString())
+                .build();
         assertThat(results).hasSize(2);
         assertThat(results)
-                .comparingElementsUsing(stateWithUpdatedColumns())
-                .containsExactly(pm1, pm2);
+                .comparingElementsUsing(entityState())
+                .containsExactly(expectedState1, expectedState2);
     }
 
     @Test
@@ -854,33 +876,11 @@ private static TargetFilters targetFilters(QueryFilter first, QueryFilter... res
                 .build();
     }
 
-    private static Correspondence<TestProcessManager, TestProcessManager> stateWithPropagatedName() {
-        return Correspondence.from(ProcessManagerRepositoryTest::hasStateWithName, "has state");
-    }
-
-    private static boolean
-    hasStateWithName(TestProcessManager actual, TestProcessManager expected) {
-        Project expectedState = expected
-                .state()
-                .toBuilder()
-                .setIdString(expected.getIdString())
-                .setName(SetTestProcessName.NEW_NAME)
-                .build();
-        return actual.state().equals(expectedState);
-    }
-
-    private static Correspondence<TestProcessManager, TestProcessManager>
-    stateWithUpdatedColumns() {
-        return Correspondence.from(ProcessManagerRepositoryTest::hasStateWithColumns, "has state");
+    private static Correspondence<TestProcessManager, Project> entityState() {
+        return Correspondence.from(ProcessManagerRepositoryTest::hasState, "has state");
     }
 
-    private static boolean
-    hasStateWithColumns(TestProcessManager actual, TestProcessManager expected) {
-        Project expectedState = expected
-                .state()
-                .toBuilder()
-                .setIdString(expected.getIdString())
-                .build();
-        return actual.state().equals(expectedState);
+    private static boolean hasState(TestProcessManager actual, Project expected) {
+        return actual.state().equals(expected);
     }
 }

server/src/test/java/io/spine/server/projection/ProjectionRepositoryTest.java

@@ -624,10 +624,22 @@ void performCustomMigrationForMultiple() {
                 repository.find(filters, ResponseFormat.getDefaultInstance());
 
         ImmutableList<TestProjection> results = ImmutableList.copyOf(foundAfterMigration);
+        Project expectedState1 = projection1
+                .state()
+                .toBuilder()
+                .setName(SetTestProjectionName.NEW_NAME)
+                .setIdString(projection1.getIdString())
+                .build();
+        Project expectedState2 = projection2
+                .state()
+                .toBuilder()
+                .setName(SetTestProjectionName.NEW_NAME)
+                .setIdString(projection2.getIdString())
+                .build();
         assertThat(results).hasSize(2);
         assertThat(results)
-                .comparingElementsUsing(stateWithPropagatedName())
-                .containsExactly(projection1, projection2);
+                .comparingElementsUsing(entityState())
+                .containsExactly(expectedState1, expectedState2);
     }
 
     @Test
@@ -694,10 +706,20 @@ void updateColumnsForMultiple() {
                 repository.find(filters, ResponseFormat.getDefaultInstance());
 
         ImmutableList<TestProjection> results = ImmutableList.copyOf(found);
+        Project expectedState1 = projection1
+                .state()
+                .toBuilder()
+                .setIdString(projection1.getIdString())
+                .build();
+        Project expectedState2 = projection2
+                .state()
+                .toBuilder()
+                .setIdString(projection2.getIdString())
+                .build();
         assertThat(results).hasSize(2);
         assertThat(results)
-                .comparingElementsUsing(stateWithUpdatedColumns())
-                .containsExactly(projection1, projection2);
+                .comparingElementsUsing(entityState())
+                .containsExactly(expectedState1, expectedState2);
     }
 
     @Test
@@ -757,30 +779,11 @@ private static TargetFilters targetFilters(QueryFilter first, QueryFilter... res
                 .build();
     }
 
-    private static Correspondence<TestProjection, TestProjection> stateWithPropagatedName() {
-        return Correspondence.from(ProjectionRepositoryTest::hasStateWithName, "has state");
-    }
-
-    private static boolean hasStateWithName(TestProjection actual, TestProjection expected) {
-        Project expectedState = expected
-                .state()
-                .toBuilder()
-                .setIdString(expected.getIdString())
-                .setName(SetTestProjectionName.NEW_NAME)
-                .build();
-        return actual.state().equals(expectedState);
-    }
-
-    private static Correspondence<TestProjection, TestProjection> stateWithUpdatedColumns() {
-        return Correspondence.from(ProjectionRepositoryTest::hasStateWithColumns, "has state");
+    private static Correspondence<TestProjection, Project> entityState() {
+        return Correspondence.from(ProjectionRepositoryTest::hasState, "has state");
     }
 
-    private static boolean hasStateWithColumns(TestProjection actual, TestProjection expected) {
-        Project expectedState = expected
-                .state()
-                .toBuilder()
-                .setIdString(expected.getIdString())
-                .build();
-        return actual.state().equals(expectedState);
+    private static boolean hasState(TestProjection actual, Project expected) {
+        return actual.state().equals(expected);
     }
 }