test fixed

kaaproject · Jul 20, 2016 · c0710b4 · c0710b4
1 parent 9d94fc9
commit c0710b4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 51 deletions.
diff --git a/...src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java b/...src/main/java/org/kaaproject/kaa/server/common/dao/model/sql/EventClassFamilyVersion.java
@@ -105,54 +105,28 @@ public void setCreatedTime(long createdTime) {
     }
 
     @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + (int) (createdTime ^ (createdTime >>> 32));
-        result = prime * result
-                + ((createdUsername == null) ? 0 : createdUsername.hashCode());
-        result = prime * result + ((id == null) ? 0 : id.hashCode());
-        result = prime * result + version;
-        result = prime * result + ((records == null) ? 0 : records.hashCode());
-        return result;
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        EventClassFamilyVersion that = (EventClassFamilyVersion) o;
+
+        if (createdTime != that.createdTime) return false;
+        if (version != that.version) return false;
+        if (createdUsername != null ? !createdUsername.equals(that.createdUsername) : that.createdUsername != null)
+            return false;
+        if (records != null ? !records.equals(that.records) : that.records != null) return false;
+
+        return true;
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        EventClassFamilyVersion other = (EventClassFamilyVersion) obj;
-        if (createdTime != other.createdTime) {
-            return false;
-        }
-        if (createdUsername == null) {
-            if (other.createdUsername != null) {
-                return false;
-            }
-        } else if (!createdUsername.equals(other.createdUsername)) {
-            return false;
-        }
-        if (id == null) {
-            if (other.id != null) {
-                return false;
-            }
-        } else if (!id.equals(other.id)) {
-            return false;
-        } else if (records == null) {
-            if (other.records != null) {
-                return false;
-            }
-        } else if (!records.equals(other.records)) {
-            return false;
-        }
-        return version == other.version;
+    public int hashCode() {
+        int result = records != null ? records.hashCode() : 0;
+        result = 31 * result + version;
+        result = 31 * result + (createdUsername != null ? createdUsername.hashCode() : 0);
+        result = 31 * result + (int) (createdTime ^ (createdTime >>> 32));
+        return result;
     }
 
     @Override

diff --git a/...ao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java b/...ao/src/test/java/org/kaaproject/kaa/server/common/dao/impl/sql/HibernateAbstractTest.java
@@ -27,8 +27,10 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.junit.Assert;
 import org.kaaproject.kaa.common.dto.KaaAuthorityDto;
@@ -417,11 +419,19 @@ protected List<EventClass> generateEventClass(Tenant tenant, EventClassFamily ev
 
         EventClass eventClass;
         EventClassFamilyVersion eventClassFamilyVersion = eventClassFamily.getSchemas().get(0);
-        List<EventClass> eventClasses = new ArrayList<>(count);
+        List<EventClass> records = eventClassFamilyVersion.getRecords();
+        if (records == null) {
+            records = new ArrayList<>();
+        }
         for (int i = 0; i < count; i++) {
             eventClass = new EventClass();
             eventClass.setTenant(tenant);
-            eventClass.setCtlSchema(generateCTLSchema(DEFAULT_FQN, i, tenant, CTLSchemaScopeDto.TENANT));
+            Integer version = 1;
+            try {
+                version = ctlSchemaDao.find().stream().max((ctl1, ctl2) -> Integer.compare(ctl1.getVersion(), ctl2.getVersion())).get().getVersion()+1;
+            } catch (NoSuchElementException e) {}
+
+            eventClass.setCtlSchema(generateCTLSchema(DEFAULT_FQN, version, tenant, CTLSchemaScopeDto.TENANT));
             eventClass.setEcf(eventClassFamilyVersion);
             eventClass.setFqn("Test FQN" + RANDOM.nextInt());
             eventClass.setType(EventClassType.EVENT);
@@ -431,11 +441,15 @@ protected List<EventClass> generateEventClass(Tenant tenant, EventClassFamily ev
             eventClass.setCreatedUsername("test createdUsername" + RANDOM.nextInt());
             eventClass.setCreatedTime(new Date().getTime());
             eventClass.setApplication(generateApplication(tenant));
-
-            eventClass = eventClassDao.save(eventClass);
-            Assert.assertNotNull(eventClass);
-            eventClasses.add(eventClass);
+            records.add(eventClass);
         }
+        eventClassFamilyVersion.setRecords(records);
+        eventClassFamilyDao.save(eventClassFamily);
+        eventClassFamily = eventClassFamilyDao.findById(eventClassFamily.getStringId());
+        Long ecfvId = eventClassFamilyVersion.getId();
+        eventClassFamilyVersion = eventClassFamily.getSchemas().stream().filter(ecfv -> ecfv.getId().equals(ecfvId)).collect(Collectors.toList()).get(0);
+        List<EventClass> eventClasses = new ArrayList<>(count);
+        eventClasses.addAll(eventClassFamilyVersion.getRecords());
         return eventClasses;
     }