libcontextsubscriber/{customer,unit}-tests: cdb updates

23 files changed, 23 insertions, 1 deletions

diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYCONSTRUCTIONSTRING.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYCONSTRUCTIONSTRING.expected
index 043f1514..938e67ae 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYCONSTRUCTIONSTRING.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYCONSTRUCTIONSTRING.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYDOC.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYDOC.expected
index 79146d4e..6a9608c1 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYDOC.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYDOC.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYPLUGIN.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYPLUGIN.expected
index a654158e..bbc390b4 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYPLUGIN.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYPLUGIN.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYTYPE.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYTYPE.expected
index 40362cc5..3815ca9d 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYTYPE.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/Battery.Charging_KEYTYPE.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/KEYS.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/KEYS.expected
index fe2bbd1e..063dd82a 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/KEYS.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/KEYS.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/Makefile.am b/libcontextsubscriber/customer-tests/update-contextkit-providers/Makefile.am
index 02a7cafa..b3b8b44d 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/Makefile.am
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/Makefile.am
@@ -2,6 +2,9 @@ check-customer:
 	$(MAKE) -C @abs_top_srcdir@ all
 	./test.sh
 
+clean-local:
+	rm -f *.actual *.cdb
+
 EXTRA_DIST = test.sh Battery.Charging_KEYCONSTRUCTIONSTRING.expected	\
 	Battery.Charging_KEYDOC.expected				\
 	Battery.Charging_KEYPLUGIN.expected				\
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/PLUGINS.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/PLUGINS.expected
index a654158e..bbc390b4 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/PLUGINS.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/PLUGINS.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/contextkit-dbus_KEYS.expected b/libcontextsubscriber/customer-tests/update-contextkit-providers/contextkit-dbus_KEYS.expected
index fe2bbd1e..063dd82a 100644
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/contextkit-dbus_KEYS.expected
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/contextkit-dbus_KEYS.expected
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/regen.sh b/libcontextsubscriber/customer-tests/update-contextkit-providers/regen.sh
new file mode 100755
index 00000000..28585fd1
--- /dev/null
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/regen.sh
@@ -0,0 +1,18 @@
+#!/bin/bash -e
+
+function regendb {
+    cdb -q "cache.cdb" "$1" > "$2.expected"
+}
+
+export CONTEXT_CORE_DECLARATIONS=.
+../../update-contextkit-providers/update-contextkit-providers .
+
+regendb "KEYS" "KEYS"
+regendb "PLUGINS" "PLUGINS"
+regendb "contextkit-dbus:KEYS" "contextkit-dbus_KEYS"
+regendb "Battery.Charging:KEYTYPE" "Battery.Charging_KEYTYPE"
+regendb "Battery.Charging:KEYDOC" "Battery.Charging_KEYDOC"
+regendb "Battery.Charging:KEYPLUGIN" "Battery.Charging_KEYPLUGIN"
+regendb "Battery.Charging:KEYCONSTRUCTIONSTRING" "Battery.Charging_KEYCONSTRUCTIONSTRING"
+echo "Regen succeeded!"
+exit 0
diff --git a/libcontextsubscriber/customer-tests/update-contextkit-providers/test.sh b/libcontextsubscriber/customer-tests/update-contextkit-providers/test.sh
index d2236f3e..82838ee0 100755
--- a/libcontextsubscriber/customer-tests/update-contextkit-providers/test.sh
+++ b/libcontextsubscriber/customer-tests/update-contextkit-providers/test.sh
@@ -62,6 +62,7 @@ function checkperm {
 BASEDIR=`dirname $0`
 
 # Test using command line param
+export CONTEXT_PROVIDERS="/tmp/wrong/path"
 ../../update-contextkit-providers/update-contextkit-providers "./"
 dotest
 checkperm
diff --git a/libcontextsubscriber/unit-tests/cdb-creation/.gitignore b/libcontextsubscriber/unit-tests/cdb-creation/.gitignore
new file mode 100644
index 00000000..fa871e9d
--- /dev/null
+++ b/libcontextsubscriber/unit-tests/cdb-creation/.gitignore
@@ -0,0 +1 @@
+*.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v1.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v1.cdb
index 0a8285d4..1a4f3c91 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v1.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v1.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v2.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v2.cdb
index 9b4129b1..84785ee0 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v2.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers2v2.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v1.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v1.cdb
index 0a8285d4..1a4f3c91 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v1.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v1.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v2.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v2.cdb
index 264c8820..f1a88060 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v2.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers3v2.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v1.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v1.cdb
index 0a8285d4..1a4f3c91 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v1.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v1.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v2.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v2.cdb
index c203201d..3bf42ac2 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v2.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-dynamic/context-providers4v2.cdb
diff --git a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-static/cache.cdb b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-static/cache.cdb
index a68ee792..61dd994c 100644
--- a/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-static/cache.cdb
+++ b/libcontextsubscriber/unit-tests/contextpropertyinfo-cdb-static/cache.cdb
diff --git a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v1.cdb b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v1.cdb
index 0a8285d4..1a4f3c91 100644
--- a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v1.cdb
+++ b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v1.cdb
diff --git a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v2.cdb b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v2.cdb
index fe515cc6..30e70e3e 100644
--- a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v2.cdb
+++ b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-dynamic/context-providers1v2.cdb
diff --git a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am
index 1bc9da49..9d25f258 100644
--- a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am
+++ b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/Makefile.am
@@ -6,7 +6,6 @@ contextregistryinfounittest_cdb_static_SOURCES = contextregistryinfounittest.cpp
 COVERAGE_FILES = contextregistryinfo.cpp 	\
 		 infobackend.cpp		\
 		 infocdbbackend.cpp
-EXTRA_DIST = cache.cdb
 
 # do the testing, coverage, etc. stuff
 # tests.am is using +=, so we have to set a value here for these four always
diff --git a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/cache.cdb b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/cache.cdb
index a68ee792..61dd994c 100644
--- a/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/cache.cdb
+++ b/libcontextsubscriber/unit-tests/contextregistryinfo-cdb-static/cache.cdb
diff --git a/libcontextsubscriber/update-contextkit-providers/cache.cdb b/libcontextsubscriber/update-contextkit-providers/cache.cdb
new file mode 100644
index 00000000..47474a26
--- /dev/null
+++ b/libcontextsubscriber/update-contextkit-providers/cache.cdb