Fixed one test case and removed two duplicated ones.

python/test/src/testipaaca.py

@@ -69,16 +69,22 @@ class IpaacaCommitTestCases(unittest.TestCase):
 		self.ob.add(self.iu)
 		time.sleep(0.1)
 		self.iu.commit()
-		with self.assertRaises(ipaaca.IUCommittedError):
+		try:
 			self.iu.payload['data'] = 'updatedData'
+			self.fail("Expected an IUCommittedError but it was not raised.")
+		except ipaaca.IUCommittedError, e:
+			pass
 	
 	def testCommitAndRemoteWrite(self):
 		self.ob.add(self.iu)
-		time.sleep(0.1)
 		self.iu.commit()
+		time.sleep(0.1)
 		received_iu = self.ib.iu_store[self.iu.uid]
-		with self.assertRaises(ipaaca.IUCommittedError):
+		try:
 			received_iu.payload['data'] = 'updatedData'
+			self.fail("Expected an IUCommittedError but it was not raised.")
+		except ipaaca.IUCommittedError, e:
+			pass
 
 
 class IpaacaLinksTestCase(unittest.TestCase):
@@ -118,27 +124,6 @@ class IpaacaLinksTestCase(unittest.TestCase):
 		grinlinks = received_iu.get_links('grin')
 		self.assertEqual(len(grinlinks), 0)
 
-class IpaacaCommitTestCase(unittest.TestCase):
-	def setUp(self):
-		self.ib = ipaaca.InputBuffer('TestIn', ['sensorcategory'])
-		self.ib.register_handler(handle_iu_event)
-		self.ob = ipaaca.OutputBuffer('TestOut')
-		self.sensor_iu = ipaaca.IU('sensorcategory')
-		self.sensor_iu.payload = {'data': 'sensordata'}
-		time.sleep(0.1)
-		self.ob.add(self.sensor_iu)
-		time.sleep(0.1)
-	def tearDown(self):
-		pass
-	def testCommitAndLocalWrite(self):
-		self.sensor_iu.commit()
-		with self.assertRaises(ipaaca.IUCommittedError):
-			self.sensor_iu.payload['data'] = 'updatedData'
-	def testCommitAndRemoteWrite(self):
-		self.sensor_iu.commit()
-		received_iu = self.ib.iu_store[self.sensor_iu.uid]
-		with self.assertRaises(ipaaca.IUCommittedError):
-			received_iu.payload['data'] = 'updatedData'
 
 class IpaacaRemoteWriteTestCase(unittest.TestCase):
 	def setUp(self):
@@ -153,13 +138,13 @@ class IpaacaRemoteWriteTestCase(unittest.TestCase):
 	def tearDown(self):
 		pass
 	def testRemotePayloadChange(self):
-		self.assertIn(self.iu.uid, self.ib.iu_store)
+		hc.assert_that(self.ib.iu_store, hc.has_key(self.iu.uid))
 		received_iu = self.ib.iu_store[self.iu.uid]
 		received_iu.payload['data'] = 'updatedData'
 		time.sleep(0.1)
 		self.assertEqual(self.iu.payload['data'], 'updatedData')
 	def testRemotePayloadReplace(self):
-		self.assertIn(self.iu.uid, self.ib.iu_store)
+		hc.assert_that(self.ib.iu_store, hc.has_key(self.iu.uid))
 		received_iu = self.ib.iu_store[self.iu.uid]
 		received_iu.payload = { 'key1': 'value1', 'key2': 'value2' }
 		time.sleep(0.1)