Changeset 1025

Timestamp:

09/02/07 17:10:56 (15 months ago)

Author:

wichert

Message:

100% test coverage for dictionary.py

Files:

• trunk/pyrad/tests/testDictionary.py (modified) (7 diffs)

trunk/pyrad/tests/testDictionary.py

@@ -110 +110 @@
             self.dict.ReadDictionary(StringIO("ATTRIBUTE Oops-Too-Few-Columns"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("attribute" in str(e), True)
 
@@ -120 +119 @@
             self.dict.ReadDictionary(StringIO("ATTRIBUTE Test-Type 1 dummy"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("dummy" in str(e), True)
 
@@ -130 +128 @@
             self.dict.ReadDictionary(StringIO("ATTRIBUTE Test-Type 1 Simplon"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("Simplon" in str(e), True)
 
@@ -140 +137 @@
             self.dict.ReadDictionary(StringIO("VALUE Oops-Too-Few-Columns"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("value" in str(e), True)
 
@@ -150 +146 @@
             self.dict.ReadDictionary(StringIO("VALUE Test-Attribute Test-Text 1"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("unknown attribute" in str(e), True)
 
@@ -178 +173 @@
             self.dict.ReadDictionary(StringIO("VENDOR Simplon"))
         except ParseError, e:
-            self.assertEqual(e.linenumber, 1)
             self.assertEqual("vendor" in str(e), True)
 
 
-    def testVenderParsing(self):
+    def testVendorParsing(self):
         self.assertRaises(ParseError, self.dict.ReadDictionary,
                 StringIO("ATTRIBUTE Test-Type 1 integer Simplon"))
@@ -191 +185 @@
         self.assertEquals(self.dict.attrindex["Test-Type"], (42, 1))
 
+
+    def testBeginVendorTooFewColumns(self):
+        self.assertRaises(ParseError, self.dict.ReadDictionary,
+                StringIO("BEGIN-VENDOR"))
+        try:
+            self.dict.ReadDictionary(StringIO("BEGIN-VENDOR"))
+        except ParseError, e:
+            self.assertEqual("begin-vendor" in str(e), True)
+
+
+    def testBeginVendorUnknownVendor(self):
+        self.assertRaises(ParseError, self.dict.ReadDictionary,
+                StringIO("BEGIN-VENDOR Simplon"))
+        try:
+            self.dict.ReadDictionary(StringIO("BEGIN-VENDOR Simplon"))
+        except ParseError, e:
+            self.assertEqual("Simplon" in str(e), True)
+
+
+    def testBeginVendorParsing(self):
+        self.dict.ReadDictionary(StringIO(
+                        "VENDOR Simplon 42\n"
+                        "BEGIN-VENDOR Simplon\n"
+                        "ATTRIBUTE Test-Type 1 integer"))
+        self.assertEquals(self.dict.attrindex["Test-Type"], (42, 1))
+
+
+    def testEndVendorUnknownVendor(self):
+        self.assertRaises(ParseError, self.dict.ReadDictionary,
+                StringIO("END-VENDOR"))
+        try:
+            self.dict.ReadDictionary(StringIO("END-VENDOR"))
+        except ParseError, e:
+            self.assertEqual("end-vendor" in str(e), True)
+
+    def testEndVendorUnbalanced(self):
+        try:
+            self.dict.ReadDictionary(StringIO(
+                            "VENDOR Simplon 42\n"
+                            "BEGIN-VENDOR Simplon\n"
+                            "END-VENDOR Oops\n"))
+        except ParseError, e:
+            self.assertEqual("Oops" in str(e), True)
+        else:
+            self.fail()
+
+
+    def testEndVendorParsing(self):
+        self.dict.ReadDictionary(StringIO(
+                        "VENDOR Simplon 42\n"
+                        "BEGIN-VENDOR Simplon\n"
+                        "END-VENDOR Simplon\n"
+                        "ATTRIBUTE Test-Type 1 integer"))
+        self.assertEquals(self.dict.attrindex["Test-Type"], 1)