Merge branch 'protocol_chge_provider' of git@gitorious.org:maemo-af/contextkit into protocol_chge_provider

4 files changed, 31 insertions, 29 deletions

diff --git a/debian/libcontextprovider-tests.install b/debian/libcontextprovider-tests.install
index dfa4ac57..0314327f 100644
--- a/debian/libcontextprovider-tests.install
+++ b/debian/libcontextprovider-tests.install
@@ -5,3 +5,4 @@ usr/lib/libcontextprovider-tests/subscriptiontests
 usr/lib/libcontextprovider-tests/typestests
 usr/lib/libcontextprovider-tests/valuechangestests
 usr/lib/libcontextprovider-tests/servicetest
+usr/share/libcontextprovider-tests/multiprovider
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 780e41dc..4a178bf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ install: build
 	cp -rf libcontextsubscriber/customer-tests/subscription debian/tmp/usr/share/libcontextsubscriber-tests/
 	cp -rf libcontextsubscriber/customer-tests/registry debian/tmp/usr/share/libcontextsubscriber-tests/
 	cp -rf libcontextsubscriber/customer-tests/pluginchanging debian/tmp/usr/share/libcontextsubscriber-tests/
+	cp -rf libcontextprovider/customer-tests/multiprovider debian/tmp/usr/share/libcontextprovider-tests/
 
 	mkdir debian/tmp/usr/share/libcontextsubscriber-tests/common
 	cp libcontextsubscriber/customer-tests/common/*.sh debian/tmp/usr/share/libcontextsubscriber-tests/common
diff --git a/libcontextprovider/customer-tests/Makefile.am b/libcontextprovider/customer-tests/Makefile.am
index e7219f07..03f893ec 100644
--- a/libcontextprovider/customer-tests/Makefile.am
+++ b/libcontextprovider/customer-tests/Makefile.am
@@ -14,6 +14,6 @@ check-customer:
 libcontextprovidertestsdir = $(datadir)/libcontextprovider-tests
 libcontextprovidertests_DATA = tests.xml
 
-EXTRA_DIST = tests.xml coverage-build runTests.sh
+EXTRA_DIST = tests.xml coverage-build runTests.sh multiprovider
 
 include $(top_srcdir)/am/covoptioncheck.am
diff --git a/libcontextprovider/customer-tests/multiprovider/multiprovider.py b/libcontextprovider/customer-tests/multiprovider/multiprovider.py
index e1f094de..882144ce 100644
--- a/libcontextprovider/customer-tests/multiprovider/multiprovider.py
+++ b/libcontextprovider/customer-tests/multiprovider/multiprovider.py
@@ -92,23 +92,23 @@ class MultiProvider(unittest.TestCase):
 
                 provider_a.send("test.int = 2")
                 client.send("waitforchanged 1000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/int int:2",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/int int:2",3))
 
                 provider_b.send("test.int = 1")
                 client.send("waitforchanged 1000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/int int:1",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/int int:1",3))
 
                 provider_a.send("test.int = 1")
                 client.send("waitforchanged 1000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/int int:1",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/int int:1",3))
 
                 provider_b.send("test.int = 2")
                 client.send("waitforchanged 1000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/int int:2",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/int int:2",3))
 
                 client.close()
                 provider_a.close()
@@ -151,12 +151,12 @@ class MultiProvider(unittest.TestCase):
                 client = CLTool("client")
 
                 client.send("assign session com.nokia.test.a providerA")
-                client.expect(CLTool.STDOUT,
-				   "Assigned providerA",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Assigned providerA",3))
 
                 client.send("assign session com.nokia.test.b providerB")
-                client.expect(CLTool.STDOUT,
-				   "Assigned providerB",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Assigned providerB",3))
 
                 sleep(2)
 
@@ -170,18 +170,18 @@ class MultiProvider(unittest.TestCase):
 
                 provider_a.send("test.double = 3.5")
                 client.send("waitforchanged 3000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/double double:3.5",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/double double:3.5",3))
 
                 provider_b.send("test.double = 4.5")
                 client.send("waitforchanged 3000")
-                client.expect(CLTool.STDOUT,
-                    "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/double double:4.5",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+                    "ValueChanged: com.nokia.test.b /org/maemo/contextkit/test/double double:4.5",3))
 
                 provider_a.send("test.double = 3.5")
                 client.send("waitforchanged 3000")
-                client.expect(CLTool.STDOUT,
-                    "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/double double:3.5",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+                    "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/double double:3.5",3))
 
                 client.close()
                 provider_a.close()
@@ -223,12 +223,12 @@ class MultiProvider(unittest.TestCase):
                 client = CLTool("client")
 
                 client.send("assign session com.nokia.test.a providerA")
-                client.expect(CLTool.STDOUT,
-				   "Assigned providerA",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Assigned providerA",3))
 
                 client.send("assign session com.nokia.test.b providerB")
-                client.expect(CLTool.STDOUT,
-				   "Assigned providerB",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Assigned providerB",3))
 
                 sleep(2)
 
@@ -242,18 +242,18 @@ class MultiProvider(unittest.TestCase):
 
                 provider_a.send("test.truth = false")
                 client.send("waitforchanged 3000")
-                client.expect(CLTool.STDOUT,
-				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/truth bool:false",3)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "ValueChanged: com.nokia.test.a /org/maemo/contextkit/test/truth bool:false",3))
 
                 provider_b.send("test.truth = false")
                 client.send("waitforchanged 5000")
-                client.expect(CLTool.STDOUT,
-				   "Timeout",6)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Timeout",6))
 
                 provider_a.send("test.truth = false")
                 client.send("waitforchanged 5000")
-                client.expect(CLTool.STDOUT,
-				   "Timeout",6)
+                self.assert_(client.expect(CLTool.STDOUT,
+				   "Timeout",6))
 
                 client.close()
                 provider_a.close()