test fixes

orientechnologies · Jun 19, 2018 · 4dec5f0 · 4dec5f0
1 parent 444fb36
commit 4dec5f0
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 40 deletions.
diff --git a/core/src/test/java/com/orientechnologies/orient/core/record/impl/ODocumentTest.java b/core/src/test/java/com/orientechnologies/orient/core/record/impl/ODocumentTest.java
@@ -382,47 +382,53 @@ public void testNoDirtySameBytes() {
 
   @Test
   public void testGetDiffFromOriginalSimple(){
-    ODatabaseDocumentTx db = new ODatabaseDocumentTx("memory:" + ODocumentTest.class.getSimpleName());
-    db.create();
-
-    OClass claz = db.createClassIfNotExist("TestClass");
-
-    ODocument doc = new ODocument(claz);
-    String fieldName = "testField";
-    String constantFieldName = "constantField";
-    String originalValue = "orValue";
-    String testValue = "testValue";
-    String removeField = "removeField";
-
-    doc.field(fieldName, originalValue);
-    doc.field(constantFieldName, "someValue");
-    doc.field(removeField, "removeVal");
-
-    doc = db.save(doc);
-
-//    doc._fields.get(fieldName).original = originalValue;
-//    doc._fields.get(constantFieldName).changed = false;
-    doc.field(fieldName, testValue);
-    doc.removeField(removeField);
-    ODocument dc = doc.getDeltaFromOriginal();
-
-    ODocument updatePart = dc.field("u");
-    ODocument deletePart = dc.field("d");
-
-    assertFalse(updatePart._fields.containsKey(constantFieldName));
-    assertTrue(updatePart._fields.containsKey(fieldName));
-    assertEquals(updatePart.field(fieldName), testValue);
-
-    assertFalse(deletePart._fields.containsKey(constantFieldName));
-    assertTrue(deletePart._fields.containsKey(removeField));    
-
-    doc = db.save(doc);    
-    db.close();
+    ODatabaseDocumentTx db = null;
+    try{
+      db = new ODatabaseDocumentTx("memory:" + ODocumentTest.class.getSimpleName());
+      db.create();
+
+      OClass claz = db.createClassIfNotExist("TestClass");
+
+      ODocument doc = new ODocument(claz);
+      String fieldName = "testField";
+      String constantFieldName = "constantField";
+      String originalValue = "orValue";
+      String testValue = "testValue";
+      String removeField = "removeField";
+
+      doc.field(fieldName, originalValue);
+      doc.field(constantFieldName, "someValue");
+      doc.field(removeField, "removeVal");
+
+      doc = db.save(doc);
+
+      doc.field(fieldName, testValue);
+      doc.removeField(removeField);
+      ODocument dc = doc.getDeltaFromOriginal();
+
+      ODocument updatePart = dc.field("u");
+      ODocument deletePart = dc.field("d");
+
+      assertFalse(updatePart._fields.containsKey(constantFieldName));
+      assertTrue(updatePart._fields.containsKey(fieldName));
+      assertEquals(updatePart.field(fieldName), testValue);
+
+      assertFalse(deletePart._fields.containsKey(constantFieldName));
+      assertTrue(deletePart._fields.containsKey(removeField));    
+
+      doc = db.save(doc);    
+    }
+    finally{
+      if (db != null)
+        db.drop();
+    }
   }
 
   @Test
   public void testGetDiffFromOriginalNested(){
-    ODatabaseDocumentTx db = new ODatabaseDocumentTx("memory:" + ODocumentTest.class.getSimpleName());
+    ODatabaseDocumentTx db = null;
+    try{
+    db = new ODatabaseDocumentTx("memory:" + ODocumentTest.class.getSimpleName());
     db.create();
 
     OClass claz = db.createClassIfNotExist("TestClass");
@@ -448,7 +454,8 @@ public void testGetDiffFromOriginalNested(){
 
     doc.field(nestedDocField, nestedDoc);
 
-     ODocument dc = doc.getDeltaFromOriginal();
+    ODocument dc = doc.getDeltaFromOriginal();
+    dc = dc.field("u");
     assertFalse(dc._fields.containsKey(constantFieldName));
     assertTrue(dc._fields.containsKey(nestedDocField));        
 
@@ -457,7 +464,11 @@ public void testGetDiffFromOriginalNested(){
     assertTrue(nestedDc._fields.containsKey(fieldName));
     assertEquals(nestedDc.field(fieldName), testValue);
 
-    db.close();
+    }
+    finally{
+      if (db != null)
+        db.drop();
+    }
   }
 
 }
diff --git a/...java/com/orientechnologies/orient/server/distributed/impl/OTransactionPhase1TaskTest.java b/...java/com/orientechnologies/orient/server/distributed/impl/OTransactionPhase1TaskTest.java
@@ -108,7 +108,7 @@ public void testExecutionConcurrentModificationUpdate() throws Exception {
 
     assertTrue(res.getResultPayload() instanceof OTxConcurrentModification);
     assertEquals(((OTxConcurrentModification) res.getResultPayload()).getRecordId(), old.getIdentity());
-    assertEquals(((OTxConcurrentModification) res.getResultPayload()).getVersion(), doc.getVersion());
+    assertEquals(((OTxConcurrentModification) res.getResultPayload()).getVersion(), doc.getVersion());                
   }
 
   @Test