1 files changed, 34 insertions, 21 deletions

diff --git a/test/tests/persistence_BasicAPITest.lua b/test/tests/persistence_BasicAPITest.lua
index 6672c05..c4c6e50 100644
--- a/test/tests/persistence_BasicAPITest.lua
+++ b/test/tests/persistence_BasicAPITest.lua
@@ -22,56 +22,59 @@ local testPrefix ="persistence_BasicAPITest_"
 
 -- This tests the 'insert' verb of the persistence API
 _AFT.describe(testPrefix.."insert_with_verification",function()
-  _AFT.callVerb("persistence", "insert", {key="TESTinsert", value="insert"})
+  _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTinsert", value="insert"})
   _AFT.assertVerbResponseEquals("persistence","read", {key="TESTinsert"},{value="insert"})
-  _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
+  _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTinsert"})
+  _AFT.assertVerbResponseEqualsError("persistence","read", {key="TESTinsert"},{value="insert"})
 end)
 
 -- This tests the 'update' verb of the persistence API
 _AFT.describe(testPrefix.."update_with_verification",function()
-  _AFT.callVerb("persistence", "insert", {key="TESTinsert", value="myvalue"})
-  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTinsert"},{value="myvalue"})
-  _AFT.callVerb("persistence", "update", {key="TESTinsert", value="newvalue"})
-  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTinsert"},{value="newvalue"})
-  _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
+  _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTupdate", value="myvalue"})
+  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTupdate"},{value="myvalue"})
+  _AFT.assertVerbStatusSuccess("persistence", "update", {key="TESTupdate", value="newvalue"})
+  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTupdate"},{value="newvalue"})
+  _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTupdate"})
+  _AFT.assertVerbResponseEqualsError("persistence","read", {key="TESTupdate"},{value="myvalue"})
+  _AFT.assertVerbResponseEqualsError("persistence","read", {key="TESTupdate"},{value="newvalue"})
 end)
 
 -- This tests the 'delete' verb of the persistence API
 _AFT.describe(testPrefix.."delete_with_verification",function()
-  _AFT.callVerb("persistence", "insert", {key="TESTinsert", value="delete"})
-  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTinsert"},{value="delete"})
-  _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
-  _AFT.assertVerbResponseEqualsError("persistence","read", {key="TESTinsert"},{value="delete"})
+  _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTdelete", value="delete"})
+  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTdelete"},{value="delete"})
+  _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTdelete"})
+  _AFT.assertVerbResponseEqualsError("persistence","read", {key="TESTdelete"},{value="delete"})
 end)
 
 -- This tests the 'insert' verb of the persistence API
 _AFT.testVerbStatusSuccess(testPrefix.."insert","persistence","insert", {key="TESTinsert", value="insert"}, nil,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
+    _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTinsert"})
   end)
 
 -- This tests the 'delete' verb of the persistence API
 _AFT.testVerbStatusSuccess(testPrefix.."delete","persistence","delete", {key="TESTdelete"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TESTdelete", value="delete"})
+    _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTdelete", value="delete"})
   end, nil)
 
 -- This tests the 'update' verb of the persistence API
 _AFT.testVerbStatusSuccess(testPrefix.."update","persistence","update", {key="TESTupdate", value="testupdate"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TESTupdate", value="newupdate"})
+    _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTupdate", value="newupdate"})
   end,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TESTupdate"})
+    _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTupdate"})
   end)
 
 -- This tests the 'read' verb of the persistence API
 _AFT.testVerbStatusSuccess(testPrefix.."read","persistence","read", {key="TESTread"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TESTread", value="myvalue"})
+    _AFT.assertVerbStatusSuccess("persistence", "insert", {key="TESTread", value="myvalue"})
   end,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TESTread"})
+    _AFT.assertVerbStatusSuccess("persistence", "delete", {key="TESTread"})
   end)
 
 -- This tests the 'read' verb of the persistence API
@@ -80,7 +83,19 @@ _AFT.testVerbStatusError(testPrefix.."read-unknow-value","persistence","read", {
 -- This tests the 'insert' verb of the persistence API
 _AFT.testVerbStatusError(testPrefix.."insert-without-value","persistence","insert", {key="TESTread-unknow-value"}, nil,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TEST"})
+    _AFT.assertVerbStatusError("persistence", "delete", {key="TEST"})
+  end)
+
+-- This tests the 'insert' verb of the persistence API
+_AFT.testVerbStatusError(testPrefix.."insert-with-wrong_key","persistence","insert", {wrong_key="TESTinsert-wrong-key", value="TESTinsert-wrong-key"}, nil,
+  function()
+    _AFT.assertVerbStatusError("persistence", "delete", {key="TESTinsert-wrong-key"})
+  end)
+
+-- This tests the 'insert' verb of the persistence API
+_AFT.testVerbStatusError(testPrefix.."insert-with-wrong_value","persistence","insert", {key="TESTinsert-wrong-value", wrong_value="TESTinsert-wrong-value"}, nil,
+  function()
+    _AFT.assertVerbStatusError("persistence", "delete", {key="TESTinsert-wrong-value"})
   end)
 
 -- This tests the 'delete' verb of the persistence API
@@ -90,6 +105,4 @@ _AFT.testVerbStatusError(testPrefix.."delete-unknow-key","persistence","delete",
 _AFT.testVerbStatusError(testPrefix.."insert-with-anything","persistence","insert", {value="TESTinsert-with-anything"}, nil, nil)
 
 -- This tests the 'update' verb of the persistence API
-_AFT.testVerbStatusError(testPrefix.."update-unkwon-null-value","persistence","update", {key=null}, nil, nil)
-
-_AFT.exitAtEnd()
+_AFT.testVerbStatusError(testPrefix.."update-unkwon-null-value","persistence","update", {key=null}, nil, nil)
\ No newline at end of file