Changeset 4640

Timestamp:

04/30/09 02:33:39 (4 years ago)

Author:

getxsick

Message:

Fix for #318. Now value passed to constructor is validate by calling set() method.

Location:

branch/UMPA

Files:

• tests/unit/test_protocols/test__fields.py (modified) (6 diffs)
• tests/unit/test_protocols/test_payload.py (modified) (1 diff)
• umpa/protocols/_fields.py (modified) (1 diff)

branch/UMPA/tests/unit/test_protocols/test__fields.py

@@ -66 +66 @@
     cls_field = IntField
 
-    def test_raw_value(self):
-        f = self.cls_field('foobar', 10)
-        assert f._raw_value() == 10
+    def test_get(self):
+        f = self.cls_field('foobar', 10, 8)
+        assert f.get() == 10
+        
+        f = self.cls_field('foobar')
+        assert f.get() is None
 
     def test_set(self): #_is_valid() tests included
@@ -85 +88 @@
         py.test.raises(UMPAAttributeException, f.set, 10)
 
+    def test_clear(self):
+        f = self.cls_field('foobar', 10, 8)
+        f.clear()
+        assert f.get() is None
+
+    def test_raw_value(self):
+        f = self.cls_field('foobar', 10, 8)
+        assert f._raw_value() == 10
+
     def test_fillout(self):
         f = self.cls_field('foobar')
         py.test.raises(UMPAException, f.fillout)
 
-        f = self.cls_field('foobar', 10)
+        f = self.cls_field('foobar', 10, 8)
         assert f.fillout() == 10
 
@@ -146 +158 @@
 class TestIPAddrField(TestAddrField):
     cls_field = IPAddrField
+
+    def test_get(self):
+        self.cls_field.pieces_amount = 4
+        self.cls_field.separator = "."
+        self.cls_field.piece_size = 8
+        self.cls_field.base = 10
+
+        f = self.cls_field('foobar', "127.0.0.1")
+        assert f.get() == "127.0.0.1"
+        
+        f = self.cls_field('foobar')
+        assert f.get() is None
+
+        self.cls_field.separator = ""
+        self.cls_field.base = 0
+        self.cls_field.piece_size = 0
+        self.cls_field.pieces_amount = 0
+        self.cls_field.bits = 0
 
     def test_set(self):
@@ -202 +232 @@
         py.test.raises(UMPAAttributeException, f.set, "0xG.0xFF.0xFF.0xFF")
 
+    def test_clear(self):
+        self.cls_field.pieces_amount = 4
+        self.cls_field.separator = "."
+        self.cls_field.piece_size = 8
+        self.cls_field.base = 10
+
+        f = self.cls_field('foobar', "127.0.0.1")
+        assert f.get() == "127.0.0.1"
+        f.clear()
+        assert f.get() is None
+
+        self.cls_field.separator = ""
+        self.cls_field.base = 0
+        self.cls_field.piece_size = 0
+        self.cls_field.pieces_amount = 0
+        self.cls_field.bits = 0
+
     def test_raw_value(self):
         f = self.cls_field('foobar')
@@ -234 +281 @@
 class TestIPv4AddrField(TestIPAddrField):
     cls_field = IPv4AddrField
+
+    def setup_method(self, method):
+        self.cls_field.pieces_amount = 4
+        self.cls_field.separator = "."
+        self.cls_field.piece_size = 8
+        self.cls_field.base = 10
 
     def test_set(self):
@@ -264 +317 @@
 class TestIPv6AddrField(TestIPAddrField):
     cls_field = IPv6AddrField
+
+    def setup_method(self, method):
+        self.cls_field.pieces_amount = 8
+        self.cls_field.separator = ":"
+        self.cls_field.piece_size = 16
+        self.cls_field.base = 16
 
     def test_set(self):

branch/UMPA/tests/unit/test_protocols/test_payload.py

@@ -36 +36 @@
         assert f.get() == 'xxx'
 
+    def test_get(self):
         f = self.cls_field('foobar', 10)
         assert f.get() == '10'
+        
+        f = self.cls_field('foobar')
+        assert f.get() is None
 
     def test_set(self):

branch/UMPA/umpa/protocols/_fields.py

@@ -74 +74 @@
         if bits is not None:
             self.bits = bits
-        self._value = value
+        if value is None:
+            self._value = None
+        # XXX hack for unitttests, normally Field is only super-class for others
+        elif self.__class__ is Field:
+            self._value = value
+        else:
+            self.set(value)
 
     def __str__(self):