shiboken2: Consolidate tests for invisible namespaces

Move the tests for PYSIDE-1074 from samplenamespace.h to
removednamespaces.h. The latter has also a test case for an
invisible namespace under a visible namespace besides the
invisible top level namespace test.

Task-number: PYSIDE-1074
Task-number: PYSIDE-1075
Change-Id: I5d1c6428f6ceadf929063c2c69723a7871173f4e
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/sources/shiboken2/tests/samplebinding/namespace_test.py b/sources/shiboken2/tests/samplebinding/namespace_test.py
index 8171e0e43..807e7bfc9 100644
--- a/sources/shiboken2/tests/samplebinding/namespace_test.py
+++ b/sources/shiboken2/tests/samplebinding/namespace_test.py
@@ -43,20 +43,15 @@ from sample import *
 from shiboken_test_helper import objectFullname
 
 
+# For tests of invisible namespaces, see
+# enumfromremovednamespace_test.py / removednamespaces.h
+
+
 class TestVariablesUnderNamespace(unittest.TestCase):
     def testIt(self):
          self.assertEqual(SampleNamespace.variableInNamespace, 42)
 
 
-class TestEnumUnderNamespace(unittest.TestCase):
-    def testInvisibleNamespace(self):
-        o1 = EnumOnNamespace.Option1
-        self.assertEqual(o1, 1)
-    def testTpNames(self):
-        self.assertEqual(objectFullname(EnumOnNamespace), "sample.EnumOnNamespace")
-        self.assertEqual(str(EnumOnNamespace.Option1),
-            "sample.EnumOnNamespace.Option1")
-
 class TestClassesUnderNamespace(unittest.TestCase):
     def testIt(self):
         c1 = SampleNamespace.SomeClass()
@@ -87,14 +82,7 @@ class TestClassesUnderNamespace(unittest.TestCase):
             "sample.SampleNamespace.InValue")
         self.assertEqual(objectFullname(SampleNamespace.enumAsInt.__signature__.parameters['value'].annotation),
             "sample.SampleNamespace.SomeClass.PublicScopedEnum")
-        self.assertEqual(objectFullname(ObjectOnInvisibleNamespace.toInt.__signature__.parameters['e'].annotation),
-            "sample.EnumOnNamespace")
 
-        # Test if enum on namespace that was marked as not gerenated does not appear on type name
-        self.assertEqual(objectFullname(ObjectOnInvisibleNamespace),
-            "sample.ObjectOnInvisibleNamespace")
-        self.assertEqual(objectFullname(ObjectOnInvisibleNamespace.consume.__signature__.parameters['other'].annotation),
-            "sample.ObjectOnInvisibleNamespace")
 
 if __name__ == '__main__':
     unittest.main()