libcontextsubscriber/unit-tests/: cdbreader and cdbwriter merged to one common cdb testcase

6 files changed, 10 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index 89321dd7..865567e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,7 @@ AC_CONFIG_FILES([
         libcontextsubscriber/man/Makefile
         libcontextsubscriber/src/Makefile
         libcontextsubscriber/unit-tests/Makefile
-        libcontextsubscriber/unit-tests/cdbreader/Makefile
-        libcontextsubscriber/unit-tests/cdbwriter/Makefile
+        libcontextsubscriber/unit-tests/cdb/Makefile
         libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/Makefile
         libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-static/Makefile
         libcontextsubscriber/unit-tests/contextpropertyinfo-xml-dynamic/Makefile
diff --git a/libcontextsubscriber/.gitignore b/libcontextsubscriber/.gitignore
index 655c27d3..56195e8b 100644
--- a/libcontextsubscriber/.gitignore
+++ b/libcontextsubscriber/.gitignore
@@ -28,8 +28,7 @@ contextsubscriber-1.0.pc
 /unit-tests/contextpropertyinfo-cdb-static/contextpropertyinfounittest-cdb-static
 /unit-tests/contextpropertyinfo-xml-dynamic/contextpropertyinfounittest-xml-dynamic
 /unit-tests/contextpropertyinfo-cdb-dynamic/contextpropertyinfounittest-cdb-dynamic
-/unit-tests/cdbreader/cdbreaderunittest
-/unit-tests/cdbwriter/cdbwriterunittest
+/unit-tests/cdb/cdbunittest
 /unit-tests/provider/provider-unit-tests
 /unit-tests/propertyhandle/propertyhandle-unit-tests
 /unit-tests/handlesignalrouter/handlesignalrouter-unit-tests
diff --git a/libcontextsubscriber/unit-tests/Makefile.am b/libcontextsubscriber/unit-tests/Makefile.am
index 6d34ab45..9de79714 100644
--- a/libcontextsubscriber/unit-tests/Makefile.am
+++ b/libcontextsubscriber/unit-tests/Makefile.am
@@ -1,5 +1,5 @@
 SUBDIRSTESTS = provider propertyhandle handlesignalrouter               \
-	cdbwriter contextregistryinfo-xml-static			\
+	cdb contextregistryinfo-xml-static				\
 	contextpropertyinfo-xml-static contextregistryinfo-cdb-static	\
 	contextpropertyinfo-cdb-static contextregistryinfo-cdb-dynamic	\
 	contextpropertyinfo-cdb-dynamic					\
diff --git a/libcontextsubscriber/unit-tests/cdbwriter/.gitignore b/libcontextsubscriber/unit-tests/cdb/.gitignore
index bda91efe..bda91efe 100644
--- a/libcontextsubscriber/unit-tests/cdbwriter/.gitignore
+++ b/libcontextsubscriber/unit-tests/cdb/.gitignore
diff --git a/libcontextsubscriber/unit-tests/cdbwriter/Makefile.am b/libcontextsubscriber/unit-tests/cdb/Makefile.am
index 05a81db9..bccb776c 100644
--- a/libcontextsubscriber/unit-tests/cdbwriter/Makefile.am
+++ b/libcontextsubscriber/unit-tests/cdb/Makefile.am
@@ -1,7 +1,7 @@
-check_PROGRAMS = cdbwriterunittest
+check_PROGRAMS = cdbunittest
 
 # test's sources
-cdbwriterunittest_SOURCES = cdbwriterunittest.cpp
+cdbunittest_SOURCES = cdbunittest.cpp
 
 COVERAGE_FILES = cdbwriter.cpp cdbreader.cpp
 
@@ -11,12 +11,12 @@ AM_CXXFLAGS = '-I$(srcdir)/../util/'
 AM_LDFLAGS = $(CDB_LIBS)
 FROM_SOURCE = cdbreader.h cdbreader.cpp cdbwriter.cpp cdbwriter.h loggingfeatures.h # copy these files from the real source
 FROM_SOURCE_DIR = $(srcdir)/../../src
-LDADD = 
+LDADD =
 include $(top_srcdir)/am/tests.am
 
-nodist_cdbwriterunittest_SOURCES = mocs.cpp
-QT_TOMOC = $(filter %.h, $(cdbwriterunittest_SOURCES) $(FROM_SOURCE))
+nodist_cdbunittest_SOURCES = mocs.cpp
+QT_TOMOC = $(filter %.h, $(cdbunittest_SOURCES) $(FROM_SOURCE))
 include $(top_srcdir)/am/qt.am
 
 # when MOCing from .cpp file, you also has to help the dependency tracker
-cdbwriterunittest.o: cdbwriterunittest.moc
+cdbunittest.o: cdbunittest.moc
diff --git a/libcontextsubscriber/unit-tests/cdbwriter/cdbwriterunittest.cpp b/libcontextsubscriber/unit-tests/cdb/cdbunittest.cpp
index da25b09e..0f580515 100644
--- a/libcontextsubscriber/unit-tests/cdbwriter/cdbwriterunittest.cpp
+++ b/libcontextsubscriber/unit-tests/cdb/cdbunittest.cpp
@@ -137,5 +137,5 @@ void CDBUnitTest::cleanupTestCase()
     QFile::remove("test-fdo.cdb");
 }
 
-#include "cdbwriterunittest.moc"
+#include "cdbunittest.moc"
 QTEST_MAIN(CDBUnitTest);