Avoid using EntityRecordWithColumns in EntityRecordStorageTest and its test environment.

Author: armiol

server/src/test/java/io/spine/server/storage/EntityRecordStorageTest.java

@@ -40,7 +40,6 @@
 import io.spine.server.entity.EntityRecord;
 import io.spine.server.entity.TransactionalEntity;
 import io.spine.server.entity.storage.EntityRecordStorage;
-import io.spine.server.entity.storage.EntityRecordWithColumns;
 import io.spine.server.storage.given.EntityRecordStorageTestEnv.TestCounterEntity;
 import io.spine.server.storage.given.GivenStorageProject;
 import io.spine.test.storage.StgProject;
@@ -75,6 +74,7 @@
 import static io.spine.server.storage.given.EntityRecordStorageTestEnv.newRecord;
 import static io.spine.server.storage.given.EntityRecordStorageTestEnv.recordWithCols;
 import static io.spine.server.storage.given.EntityRecordStorageTestEnv.recordsWithColumnsFrom;
+import static io.spine.server.storage.given.GivenStorageProject.newEntityRecord;
 import static io.spine.server.storage.given.GivenStorageProject.newState;
 import static io.spine.test.storage.StgProject.Status.CANCELLED;
 import static io.spine.test.storage.StgProject.Status.CANCELLED_VALUE;
@@ -491,13 +491,12 @@ void severalNewRecords() {
             var storage = storage();
             var bulkSize = 5;
 
-            Map<StgProjectId, EntityRecordWithColumns<StgProjectId>> initial =
+            Map<StgProjectId, RecordWithColumns<StgProjectId, EntityRecord>> initial =
                     new HashMap<>(bulkSize);
 
             for (var i = 0; i < bulkSize; i++) {
-                var id = newId();
-                var record = newStorageRecord(id);
-                initial.put(id, newRecord(id, record));
+                var record = newEntityRecord();
+                initial.put(record.id(), record);
             }
             storage.writeAll(initial.values());
 

server/src/test/java/io/spine/server/storage/given/EntityRecordStorageTestEnv.java

@@ -37,12 +37,10 @@
 import io.spine.server.entity.Entity;
 import io.spine.server.entity.EntityRecord;
 import io.spine.server.entity.HasLifecycleColumns;
-import io.spine.server.entity.LifecycleFlags;
 import io.spine.server.entity.StorageConverter;
 import io.spine.server.entity.TestTransaction;
 import io.spine.server.entity.TransactionalEntity;
 import io.spine.server.entity.storage.EntityRecordStorage;
-import io.spine.server.entity.storage.EntityRecordWithColumns;
 import io.spine.server.entity.storage.SpecScanner;
 import io.spine.server.entity.storage.given.TaskViewProjection;
 import io.spine.server.storage.MessageRecordSpec;
@@ -80,41 +78,6 @@ private EntityRecordStorageTestEnv() {
     private static final MessageRecordSpec<StgProjectId, EntityRecord> spec =
             SpecScanner.scan(TestCounterEntity.class);
 
-    public static EntityRecord buildStorageRecord(StgProjectId id,
-                                                  EntityState<StgProjectId> state) {
-        var wrappedState = pack(state);
-        var record = EntityRecord.newBuilder()
-                .setEntityId(pack(id))
-                .setState(wrappedState)
-                .setVersion(GivenVersion.withNumber(0))
-                .build();
-        return record;
-    }
-
-    public static EntityRecord buildStorageRecord(StgProjectId id,
-                                                  EntityState<StgProjectId> state,
-                                                  LifecycleFlags lifecycleFlags) {
-        var wrappedState = pack(state);
-        var record = EntityRecord.newBuilder()
-                .setEntityId(pack(id))
-                .setState(wrappedState)
-                .setVersion(GivenVersion.withNumber(0))
-                .setLifecycleFlags(lifecycleFlags)
-                .build();
-        return record;
-    }
-
-    public static EntityRecord buildStorageRecord(TestCounterEntity entity) {
-        var wrappedState = pack(entity.state());
-        var record = EntityRecord.newBuilder()
-                .setEntityId(pack(entity.id()))
-                .setState(wrappedState)
-                .setVersion(GivenVersion.withNumber(0))
-                .setLifecycleFlags(entity.lifecycleFlags())
-                .build();
-        return record;
-    }
-
     /**
      * Creates new instance of the test entity.
      */
@@ -185,11 +148,6 @@ var record = StorageConverter.toEntityRecord(entity)
         return RecordWithColumns.create(record, SpecScanner.scan(entity));
     }
 
-    public static EntityRecordWithColumns<StgProjectId>
-    newRecord(StgProjectId id, EntityRecord record) {
-        return EntityRecordWithColumns.create(id, record);
-    }
-
     public static void assertQueryHasSingleResult(
             StgProject.Query query,
             EntityRecord expected,