[Csp-commits] APPLICATIONS/SimData/SimData/Tests ArchiveTests.py,1.2,1.3 TypeTests.py,1.1,1.2

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests
In directory sc8-pr-cvs1:/tmp/cvs-serv29162/SimData/Tests

Modified Files:
	ArchiveTests.py TypeTests.py 
Log Message:


Index: ArchiveTests.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/ArchiveTests.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ArchiveTests.py	19 Oct 2003 23:53:56 -0000	1.2
--- ArchiveTests.py	21 Oct 2003 16:23:34 -0000	1.3
***************
*** 10,14 ****
  class ArchiveTest(TestCase):
  	def setUp(self):
! 		self.f = open('__test__.dar', 'wb')
  		self.archive = SimData.Packer(self.f)
  	def setRead(self):
--- 10,14 ----
  class ArchiveTest(TestCase):
  	def setUp(self):
! 		self.f = SimData.PackFile('__test__.dar', 'wb') #open('__test__.dar', 'wb')
  		self.archive = SimData.Packer(self.f)
  	def setRead(self):

Index: TypeTests.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SimData/Tests/TypeTests.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TypeTests.py	21 Oct 2003 04:34:04 -0000	1.1
--- TypeTests.py	21 Oct 2003 16:23:34 -0000	1.2
***************
*** 10,15 ****
  class KeyTest(TestCase):
  	"""Test functionality Key"""
- 	def setUp(self):
- 		pass
  	def testComparisons(self):
  		"""Test Key comparisons"""
--- 10,13 ----
***************
*** 26,33 ****
  		self.assertEqual(key_foo.typeString(), "type::Key")
  
  
  
! KeySuite = makeSuite(KeyTest, 'test')
  
! suites = [KeySuite]
  
--- 24,70 ----
  		self.assertEqual(key_foo.typeString(), "type::Key")
  
+ KeySuite = makeSuite(KeyTest, 'test')
  
  
! class DateTest(TestCase):
! 	"""Test functionality SimDate and related classes"""
! 	def testRepr(self):
! 		"""Test string and type representations"""
! 		d = SimData.SimDate(2003, 10, 31, 22, 51, 7)
! 		self.assertEqual(str(d), "2003/10/31 22:51:07z")
! 		d = SimData.SimDate(1903, 1, 9, 5, 6, 7)
! 		self.assertEqual(str(d), "1903/01/09 05:06:07z")
! 		self.assertEqual(d.typeString(), "type::SimDate")
! 	def testErrors(self):
! 		def catch(code, err=1):
! 			caught = 0
! 			try:
! 				eval(code)
! 			except RuntimeError:
! 				caught = 1
! 			if caught != err:
! 				if err:
! 					msg = "invalid"
! 				else:
! 					msg = "valid"
! 				self.assertEqual(code, msg)
! 		catch("SimData.SimDate(2003, 0, 31, 22, 51, 7)")
! 		catch("SimData.SimDate(2003, 13, 31, 22, 51, 7)")
! 		catch("SimData.SimDate(2003, 2, 29, 22, 51, 7)")
! 		catch("SimData.SimDate(2100, 2, 29, 22, 51, 7)")
! 		catch("SimData.SimDate(2004, 2, 29, 22, 51, 7)",0)
! 		catch("SimData.SimDate(2000, 2, 29, 22, 51, 7)",0)
! 		catch("SimData.SimDate(2003, 2, 0, 22, 51, 7)")
! 		catch("SimData.SimDate(2003, 10, 32, 22, 51, 7)")
! 	def testRollover(self):
! 		sd = SimData.SimDate
! 		test = self.assertEqual
! 		test(sd(2003, 3, 1, -1, -1, -1), sd(2003, 2, 28, 22, 58, 59))
! 		test(sd(1999, 12, 31, 24, 0, 1), sd(2000, 1, 1, 0, 0, 1))
! 		test(sd(1999, 12, 31, 24, 0, 61), sd(2000, 1, 1, 0, 1, 1))
! 		
! DateSuite = makeSuite(DateTest, 'test')
  
! 
! suites = [KeySuite, DateSuite]