Changeset 6359 for trunk

Timestamp:

Nov 3, 2008, 1:36:43 PM (16 years ago)

Author:

roland

Message:

Fixed some really awfull bugs in AddTest.
All posts silently failed with errors. The tests only checked if there
was a response from the webserver.

Location:

trunk/exodus

Files:

• tests.py (modified) (1 diff)
• views.py (modified) (1 diff)

trunk/exodus/tests.py

@@ -1 +1 @@
 import unittest
-from django.test.client import Client
-from django.db import connection
-
-from exodus import settings
 
 class AddTest(unittest.TestCase):
     def setUp(self):
         #Set up the client
+        from django.test.client import Client
         self.client = Client()
         
         #Set up the database
+        from exodus import settings
+        self.olddbname = settings.DATABASE_NAME
+        from django.db import connection
+        self.dbname = connection.creation.create_test_db(0)
+        
+        from exodus.models import Location
+
+        self.location = Location(description = 'Hooigracht', \
+            longitude = '45.675433', latitude = '56.543332')
+        self.location.save()
+
+    def tearDown(self):
+        from django.db import connection
+        connection.creation.destroy_test_db(self.olddbname, 0)
+
+    def test_addlocation(self):
+        post_data = {'description': 'JohnLaan2', 'longitude': '34.55', \
+            'latitude' : '44.55', 'proceed': 'OK, proceed'}
+        response = self.client.post('/add/location/new/', post_data) 
+
+        self.failUnlessEqual(response.status_code, 302)
+        self.failUnlessEqual(response['Location'], \
+                'http://testserver/add/node/new/?location=2')
+
+        from exodus.models import Location
+    
+        try: 
+            l = Location.objects.get(description = 'JohnLaan2')
+        except Location.DoesNotExist:
+            self.fail("Location wasn't get added.")
+        self.failUnless(str(l.longitude), '34.55')
+        self.failUnless(str(l.latitude), '44.55')
+
+    def test_addnode(self):
+        post_data = {'name' : 'Tabitha', 'location' : 1, \
+            'status' : 'up', 'network' : 1, 'proceed': 'OK, proceed'}
+        response = self.client.post('/add/node/new/', post_data) 
+
+        self.failUnlessEqual(response.status_code, 302)
+        self.failUnlessEqual(response['Location'], \
+                'http://testserver/view/node/Tabitha/')
+
+        from exodus.models import Node
+    
+        try:
+             n = Node.objects.get(name = 'Tabitha')
+        except Node.DoesNotExist: 
+            self.fail("Node wasn't added.")
+
+        node = n 
+        self.failUnlessEqual(n.location.id, 1)
+        self.failUnlessEqual(n.status, 'up')
+        self.failUnlessEqual(n.network.id, 1) 
+
+        c = {}
+
+        for i in n.as_list():
+           c[i[0]] = i[1] 
+
+        self.failUnless(c.has_key('masterip'))
+
+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):
-        connection.creation.destroy_test_db(self.olddbname, 0)
-
-    def test_addlocation(self):
-        post_data = {'description': 'JohnLaan2', 'longitude': '34.55', \
-            'latitude' : '44.55', 'pro/ceed': 'OK, proceed'}
-        response = self.client.post('/add/location/new/', post_data) 
-
-        self.failUnlessEqual(response.status_code, 200)
-
-    def test_addnode(self):
-        post_data = {'name' : 'Tabitha', 'location' : 1, \
-            'status' : 'up', 'network' : 1, 'proceed': 'OK, proceed'}
-
-        response = self.client.post('/add/node/new/', post_data) 
-
-        self.failUnlessEqual(response.status_code,200)
-
-class wllogic(unittest.TestCase):
-    def setUp(self):
-        #Set up the client
-        self.client = Client()
-        
-        #Set up the database
-        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)
 

trunk/exodus/views.py

@@ -245 +245 @@
                 # input a valid master ip into new_data
                 _instance  = self.form.save(commit=False)
-                import pdb; pdb.set_trace() ;
                 _instance.masterip = freeMasterIP(_instance.network)
                 _instance.save()