Changeset 6605 for trunk

Timestamp:

Jan 15, 2009, 8:53:37 PM (16 years ago)

Author:

roland

Message:

Working on better tests.

File:

• trunk/exodus/tests.py (modified) (4 diffs)

trunk/exodus/tests.py

@@ -1 +1 @@
 import unittest
 
-class AddTest(unittest.TestCase):
+class ExodusTestCase(unittest.TestCase):
     def setUp(self):
-        #Set up the client
         from django.test.client import Client
-        self.client = Client()
-        
-        #Set up a inmemory database
+        self.client = Client()        
         from exodus import settings
         self.olddbname = settings.DATABASE_NAME
         from django.db import connection
         self.dbname = connection.creation.create_test_db(0)
-        
+
+        #create four locations
         from exodus.models import Location
-
-        self.location = Location(description = 'Hooigracht', \
-            longitude = '45.675433', latitude = '56.543332')
-        self.location.save()
+        loc1 = Location.objects.create(description = 'ASW', 
+                latitude = '15.12345',
+                longitude = '16.12345')
+        loc2 = Location.objects.create(description = 'Rapenburg', 
+                latitude = '27.12345',
+                longitude = '28.12345')
+        loc3 = Location.objects.create(description = 'Lepelenburg', 
+                latitude = '37.12345',
+                longitude = '48.12345')
+        loc4 = Location.objects.create(description = 'Neude', 
+                latitude = '57.12345',
+                longitude = '58.12345')
+        import pdb; pdb.set_trace() ;
 
     def tearDown(self):
@@ -23 +30 @@
         connection.creation.destroy_test_db(self.olddbname, 0)
 
-
-class IPCalcTest(unittest.TestCase):
-    def setUp(self):
-        #Set up the client
-        from django.test.client import Client
-        self.client = Client()
-        
-        #Set up a inmemory database
-        from exodus import settings
-        self.olddbname = settings.DATABASE_NAME
-        from django.db import connection
-        self.dbname = connection.creation.create_test_db(0)
-    
+class LocationTest(ExodusTestCase):
+    pass
+
+
+class IPCalcTest(ExodusTestCase):
+
+    def ipcalc(a): 
         from exodus.models import Node  
-        self.node = Node.objects.get(pk=1)
-        
+        node = Node.objects.get(pk=1)
         from exodus.wlipcalc import IPCalc
-        self.ipcalc = lambda a: IPCalc(self.node, a)
-        self.IPCalc = IPCalc
+        return IPCalc(node, a)
 
     def test_ipcalc_ip_size(self):
@@ -108 +107 @@
         self.failUnlessEqual(ipcalc.ips, ip_list)
 
-    def tearDown(self):
-        from django.db import connection
-        connection.creation.destroy_test_db(self.olddbname, 0)
-    
-
-
-class wllogic(unittest.TestCase):
-    def setUp(self):
-        #Set up the client
-        from django.test.client import Client
-        self.client = Client()
-        
-        #Set up the database
-        from django.db import connection
-        from exodus import settings
-        self.olddbname = settings.DATABASE_NAME
-        self.dbname = connection.creation.create_test_db(0)
-
-    def tearDown(self):
-        from django.db import connection
-        connection.creation.destroy_test_db(self.olddbname, 0)
+class wllogic(ExodusTestCase):
 
     def test_new_ssid(self):
@@ -303 +282 @@
 def suite():
     s = unittest.TestSuite()
-    s.addTest(unittest.makeSuite(AddTest))
     s.addTest(unittest.makeSuite(wllogic))
     s.addTest(unittest.makeSuite(IPCalcTest))