python2 reduction: Merge remaining compat code into common

[samba.git] / python / samba / tests / dcerpc / misc.py

diff --git a/python/samba/tests/dcerpc/misc.py b/python/samba/tests/dcerpc/misc.py
index 11e14aadfa729191d3e0a8d3d11ad7f4e4b0a3c2..6b58e9451c8a675ea515cd85a5cfc37e67e70080 100644 (file)
--- a/python/samba/tests/dcerpc/misc.py
+++ b/python/samba/tests/dcerpc/misc.py
@@ -19,44 +19,83 @@
 
 from samba.dcerpc import misc
 import samba.tests
+from samba.common import cmp
 
 text1 = "76f53846-a7c2-476a-ae2c-20e2b80d7b34"
 text2 = "344edffa-330a-4b39-b96e-2c34da52e8b1"
+text3 = "00112233-4455-6677-8899-aabbccddeeff"
+
 
 class GUIDTests(samba.tests.TestCase):
 
     def test_str(self):
         guid = misc.GUID(text1)
-        self.assertEquals(text1, str(guid))
+        self.assertEqual(text1, str(guid))
 
     def test_repr(self):
         guid = misc.GUID(text1)
-        self.assertEquals("GUID('%s')" % text1, repr(guid))
+        self.assertEqual("GUID('%s')" % text1, repr(guid))
 
     def test_compare_different(self):
         guid1 = misc.GUID(text1)
         guid2 = misc.GUID(text2)
+        self.assertFalse(guid1 == guid2)
+        self.assertGreater(guid1, guid2)
         self.assertTrue(cmp(guid1, guid2) > 0)
 
     def test_compare_same(self):
         guid1 = misc.GUID(text1)
         guid2 = misc.GUID(text1)
-        self.assertEquals(0, cmp(guid1, guid2))
-        self.assertEquals(guid1, guid2)
+        self.assertTrue(guid1 == guid2)
+        self.assertEqual(guid1, guid2)
+        self.assertEqual(0, cmp(guid1, guid2))
+
+    def test_valid_formats(self):
+        fmts = [
+            "00112233-4455-6677-8899-aabbccddeeff",  # 36
+            b"00112233-4455-6677-8899-aabbccddeeff",  # 36 as bytes
+            "{00112233-4455-6677-8899-aabbccddeeff}",  # 38
+
+            "33221100554477668899aabbccddeeff",  # 32
+            b"33221100554477668899aabbccddeeff",  # 32 as bytes
+
+            # 16 as hex bytes
+            b"\x33\x22\x11\x00\x55\x44\x77\x66\x88\x99\xaa\xbb\xcc\xdd\xee\xff"
+        ]
+        for fmt in fmts:
+            guid = misc.GUID(fmt)
+            self.assertEqual(text3, str(guid))
+
+    def test_invalid_formats(self):
+        fmts = [
+            "00112233-4455-6677-8899-aabbccddee",  # 34
+            "{33221100554477668899aabbccddeeff}",
+            "33221100554477668899aabbccddee",  # 30
+            "\\x33\\x22\\x11\\x00\\x55\\x44\\x77\\x66\\x88\\x99\\xaa\\xbb\\xcc\\xdd\\xee\\xff",
+            r"\x33\x22\x11\x00\x55\x44\x77\x66\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+        ]
+        for fmt in fmts:
+            try:
+                misc.GUID(fmt)
+            except samba.NTSTATUSError:
+                # invalid formats should get this error
+                continue
+            else:
+                # otherwise, test fail
+                self.fail()
 
 
 class PolicyHandleTests(samba.tests.TestCase):
 
     def test_init(self):
         x = misc.policy_handle(text1, 1)
-        self.assertEquals(1, x.handle_type)
-        self.assertEquals(text1, str(x.uuid))
+        self.assertEqual(1, x.handle_type)
+        self.assertEqual(text1, str(x.uuid))
 
     def test_repr(self):
         x = misc.policy_handle(text1, 42)
-        self.assertEquals("policy_handle(%d, '%s')" % (42, text1), repr(x))
+        self.assertEqual("policy_handle(%d, '%s')" % (42, text1), repr(x))
 
     def test_str(self):
         x = misc.policy_handle(text1, 42)
-        self.assertEquals("%d, %s" % (42, text1), str(x))
-
+        self.assertEqual("%d, %s" % (42, text1), str(x))