4 files changed, 38 insertions, 78 deletions
diff --git a/test/afb-test.sh b/test/afb-test.sh
deleted file mode 100755
index 38c46ff..0000000
--- a/test/afb-test.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-BINDER=$(command -v afb-daemon)
-AFBTEST="$(pkg-config --variable libdir afb-test)/aft.so"
-PROCNAME="aft-persistence"
-PORT=1234
-TOKEN=
-LOGFILE="test.log"
-[ "$1" ] && BUILDDIR="$1" || exit 1
-
-TESTPACKAGEDIR="${BUILDDIR}/package-test"
-export AFT_CONFIG_PATH="${TESTPACKAGEDIR}/etc"
-export AFT_PLUGIN_PATH="${TESTPACKAGEDIR}/var:${TESTPACKAGEDIR}/lib/plugins"
-
-pkill $PROCNAME
-
-timeout -s 9 10	 "${BINDER}" 	--name="${PROCNAME}" \
-				--port="${PORT}" \
-				--roothttp=. \
-				--tracereq=common \
-				--token=${TOKEN} \
-				--workdir="${TESTPACKAGEDIR}" \
-				--binding="../package/lib/afb-persistence-binding.so" \
-				--binding="$AFBTEST" \
-				--call="aft-persistence/launch_all_tests:{}" \
-				--call="aft-persistence/exit:{}" \
-				-vvv > "${LOGFILE}" 2>&1
-
-find "${BUILDDIR}" -name test_results.log -exec cat {} \;
diff --git a/test/fixtures/CMakeLists.txt b/test/fixtures/CMakeLists.txt
deleted file mode 100644
index e7864b2..0000000
--- a/test/fixtures/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-###########################################################################
-# Copyright 2018 IoT.bzh
-#
-# author:Frédéric Marec <frederic.marec@iot.bzh>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-###########################################################################
-
-##################################################
-# Data persistence test configuration files
-##################################################
-PROJECT_TARGET_ADD(data-files)
-
-	file(GLOB DATA_FILES "*.json")
-	add_input_files("${DATA_FILES}")
-
-	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
-	LABELS "TEST-DATA"
-	OUTPUT_NAME ${TARGET_NAME}
-	)
diff --git a/test/fixtures/test1.json b/test/fixtures/test1.json
deleted file mode 100644
index d0b3a8f..0000000
--- a/test/fixtures/test1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{"test":
-    {
-        "test":"test"
-    }
-}
-\ No newline at end of file
diff --git a/test/tests/persistence_BasicAPITest.lua b/test/tests/persistence_BasicAPITest.lua
index 6d65697..6672c05 100644
--- a/test/tests/persistence_BasicAPITest.lua
+++ b/test/tests/persistence_BasicAPITest.lua
@@ -21,49 +21,73 @@
 local testPrefix ="persistence_BasicAPITest_"
 
 -- This tests the 'insert' verb of the persistence API
-_AFT.testVerbStatusSuccess(testPrefix.."insert","persistence","insert", {key="TEST", value="myvalue"}, nil,
+_AFT.describe(testPrefix.."insert_with_verification",function()
+  _AFT.callVerb("persistence", "insert", {key="TESTinsert", value="insert"})
+  _AFT.assertVerbResponseEquals("persistence","read", {key="TESTinsert"},{value="insert"})
+  _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
+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"})
+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"})
+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="TEST"})
+    _AFT.callVerb("persistence", "delete", {key="TESTinsert"})
   end)
 
 -- This tests the 'delete' verb of the persistence API
-_AFT.testVerbStatusSuccess(testPrefix.."delete","persistence","delete", {key="TEST"},
+_AFT.testVerbStatusSuccess(testPrefix.."delete","persistence","delete", {key="TESTdelete"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TEST", value="myvalue"})
+    _AFT.callVerb("persistence", "insert", {key="TESTdelete", value="delete"})
   end, nil)
 
 -- This tests the 'update' verb of the persistence API
-_AFT.testVerbStatusSuccess(testPrefix.."update","persistence","update", {key="TEST", value="test"},
+_AFT.testVerbStatusSuccess(testPrefix.."update","persistence","update", {key="TESTupdate", value="testupdate"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TEST", value="myvalue"})
+    _AFT.callVerb("persistence", "insert", {key="TESTupdate", value="newupdate"})
   end,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TEST"})
+    _AFT.callVerb("persistence", "delete", {key="TESTupdate"})
   end)
 
 -- This tests the 'read' verb of the persistence API
-_AFT.testVerbStatusSuccess(testPrefix.."read","persistence","read", {key="TEST"},
+_AFT.testVerbStatusSuccess(testPrefix.."read","persistence","read", {key="TESTread"},
   function()
-    _AFT.callVerb("persistence", "insert", {key="TEST", value="myvalue"})
+    _AFT.callVerb("persistence", "insert", {key="TESTread", value="myvalue"})
   end,
   function()
-    _AFT.callVerb("persistence", "delete", {key="TEST"})
+    _AFT.callVerb("persistence", "delete", {key="TESTread"})
   end)
 
 -- This tests the 'read' verb of the persistence API
-_AFT.testVerbStatusError(testPrefix.."read-unknow-value","persistence","read", {key="TEST"}, nil, nil)
+_AFT.testVerbStatusError(testPrefix.."read-unknow-value","persistence","read", {key="TESTread-unknow-value"}, nil, nil)
 
 -- This tests the 'insert' verb of the persistence API
-_AFT.testVerbStatusError(testPrefix.."insert-without-value","persistence","insert", {key="TEST"}, nil,
+_AFT.testVerbStatusError(testPrefix.."insert-without-value","persistence","insert", {key="TESTread-unknow-value"}, nil,
   function()
     _AFT.callVerb("persistence", "delete", {key="TEST"})
   end)
 
 -- This tests the 'delete' verb of the persistence API
-_AFT.testVerbStatusError(testPrefix.."delete-unknow-key","persistence","delete", {key="TEST"}, nil, nil)
+_AFT.testVerbStatusError(testPrefix.."delete-unknow-key","persistence","delete", {key="TESTdelete-unknow-key"}, nil, nil)
 
 -- This tests the 'insert' verb of the persistence API
-_AFT.testVerbStatusError(testPrefix.."insert-with-anything","persistence","insert", {value="talenka"}, nil, nil)
+_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)