rename testnewcore.py to testcomponent.py

diff --git a/tests/testcomponent.py b/tests/testcomponent.py
new file mode 100644 (file)
index 0000000..b483a17
--- /dev/null
+++ b/tests/testcomponent.py
@@ -0,0 +1,156 @@
+
+from timeside.component import *
+from sys import stdout
+
+class I1(Interface):
+    pass
+
+class I2(Interface):
+    pass
+
+class I3(Interface):
+    pass
+
+class I4(Interface):
+    pass
+
+class I5(Interface):
+    pass
+
+class I6(I5):
+    pass
+
+class I7(Interface):
+    pass
+
+class I8(Interface):
+    pass
+
+class I9(I8):
+    pass
+
+class I10(Interface):
+    def test(self):
+        """testdoc"""
+
+    @staticmethod        
+    def teststatic(self):
+        """teststaticdoc"""
+
+class I11(Interface):
+    pass
+
+class C1(Component):
+    implements(I1)
+
+class C2(Component):
+    implements(I2, I3)
+
+class C3(Component):
+    implements(I4)
+
+class C4(Component):
+    implements(I4)
+
+class C5(Component):
+    implements(I6)
+
+class C6(Component):
+    implements(I7)
+
+class C7(C6):
+    pass
+
+class C8(Component):
+    implements(I8)
+
+class C9(Component):
+    implements(I8, I9)
+
+class C10(Component):
+    implements(I10)
+
+    @interfacedoc
+    def test(self):
+        pass
+
+    @staticmethod        
+    @interfacedoc
+    def teststatic(self):
+        pass
+
+class C11(Component):
+    abstract()
+    implements(I11)
+
+def list_equals(list1, list2):
+    if len(list1) != len(list2):
+        return False
+
+    for item in list1:
+        if not item in list2:
+            return False
+
+    for item in list2:
+        if not item in list1:
+            return False
+
+    return True            
+
+def test(desc, actual, expected):
+    stdout.write(desc + ": ")
+    equals = False
+    if isinstance(actual, list) and isinstance(expected, list):
+        equals = list_equals(actual, expected)
+    else:
+        equals = (actual == expected)
+
+    if equals:
+        stdout.write("OK\n")
+    else:
+        stdout.write("FAILED\n")
+        stdout.write("actual:   " + str(actual) + "\n")
+        stdout.write("expected: " + str(expected) + "\n")
+    
+
+test("Test a component implementing one interface", implementations(I1), [C1])
+test("Test a component implementing two interfaces (1/2)", implementations(I2), [C2])
+test("Test a component implementing two interfaces (2/2)", implementations(I3), [C2])
+test("Test an interface implemented by two components", implementations(I4), [C3, C4])
+test("Test whether a component implements an interface's parent", implementations(I5), [C5])
+test("Test that a component doesn't implement the interface implemented by its parent", implementations(I7), [C6])
+test("Test implementation redundancy across inheritance", implementations(I8), [C8, C9])
+test("Test abstract implementation 1/2", implementations(I11), [])
+test("Test abstract implementation 2/2", implementations(I11, abstract=True), [C11])
+test("Test @interfacedoc", C10.test.__doc__, "testdoc")
+test("Test @interfacedoc on static method", C10.teststatic.__doc__, "teststaticdoc")
+stdout.write("Test @interfacedoc on static method (decorators reversed): ")
+
+try:
+
+    class BogusDoc1(Component):
+        implements(I10)
+
+        @interfacedoc
+        @staticmethod        
+        def teststatic(self):
+            pass
+
+    stdout.write("FAILED\n")
+
+except ComponentError:
+    stdout.write("OK\n")
+    
+stdout.write("Test @interfacedoc with unexistant method in interface: ")
+try:
+    class BogusDoc2(Component):
+        implements(I10)
+
+        @interfacedoc
+        def nosuchmethod(self):
+            pass
+
+    stdout.write("FAILED\n")
+
+except ComponentError:
+    stdout.write("OK\n")

diff --git a/tests/testnewcore.py b/tests/testnewcore.py
deleted file mode 100644 (file)
index b483a17..0000000
--- a/tests/testnewcore.py
+++ /dev/null
@@ -1,156 +0,0 @@
-
-from timeside.component import *
-from sys import stdout
-
-class I1(Interface):
-    pass
-
-class I2(Interface):
-    pass
-
-class I3(Interface):
-    pass
-
-class I4(Interface):
-    pass
-
-class I5(Interface):
-    pass
-
-class I6(I5):
-    pass
-
-class I7(Interface):
-    pass
-
-class I8(Interface):
-    pass
-
-class I9(I8):
-    pass
-
-class I10(Interface):
-    def test(self):
-        """testdoc"""
-
-    @staticmethod        
-    def teststatic(self):
-        """teststaticdoc"""
-
-class I11(Interface):
-    pass
-
-class C1(Component):
-    implements(I1)
-
-class C2(Component):
-    implements(I2, I3)
-
-class C3(Component):
-    implements(I4)
-
-class C4(Component):
-    implements(I4)
-
-class C5(Component):
-    implements(I6)
-
-class C6(Component):
-    implements(I7)
-
-class C7(C6):
-    pass
-
-class C8(Component):
-    implements(I8)
-
-class C9(Component):
-    implements(I8, I9)
-
-class C10(Component):
-    implements(I10)
-
-    @interfacedoc
-    def test(self):
-        pass
-
-    @staticmethod        
-    @interfacedoc
-    def teststatic(self):
-        pass
-
-class C11(Component):
-    abstract()
-    implements(I11)
-
-def list_equals(list1, list2):
-    if len(list1) != len(list2):
-        return False
-
-    for item in list1:
-        if not item in list2:
-            return False
-
-    for item in list2:
-        if not item in list1:
-            return False
-
-    return True            
-
-def test(desc, actual, expected):
-    stdout.write(desc + ": ")
-    equals = False
-    if isinstance(actual, list) and isinstance(expected, list):
-        equals = list_equals(actual, expected)
-    else:
-        equals = (actual == expected)
-
-    if equals:
-        stdout.write("OK\n")
-    else:
-        stdout.write("FAILED\n")
-        stdout.write("actual:   " + str(actual) + "\n")
-        stdout.write("expected: " + str(expected) + "\n")
-    
-
-test("Test a component implementing one interface", implementations(I1), [C1])
-test("Test a component implementing two interfaces (1/2)", implementations(I2), [C2])
-test("Test a component implementing two interfaces (2/2)", implementations(I3), [C2])
-test("Test an interface implemented by two components", implementations(I4), [C3, C4])
-test("Test whether a component implements an interface's parent", implementations(I5), [C5])
-test("Test that a component doesn't implement the interface implemented by its parent", implementations(I7), [C6])
-test("Test implementation redundancy across inheritance", implementations(I8), [C8, C9])
-test("Test abstract implementation 1/2", implementations(I11), [])
-test("Test abstract implementation 2/2", implementations(I11, abstract=True), [C11])
-test("Test @interfacedoc", C10.test.__doc__, "testdoc")
-test("Test @interfacedoc on static method", C10.teststatic.__doc__, "teststaticdoc")
-stdout.write("Test @interfacedoc on static method (decorators reversed): ")
-
-try:
-
-    class BogusDoc1(Component):
-        implements(I10)
-
-        @interfacedoc
-        @staticmethod        
-        def teststatic(self):
-            pass
-
-    stdout.write("FAILED\n")
-
-except ComponentError:
-    stdout.write("OK\n")
-    
-stdout.write("Test @interfacedoc with unexistant method in interface: ")
-try:
-    class BogusDoc2(Component):
-        implements(I10)
-
-        @interfacedoc
-        def nosuchmethod(self):
-            pass
-
-    stdout.write("FAILED\n")
-
-except ComponentError:
-    stdout.write("OK\n")