From 4e17f2620f10677e09b9cb93c7ba8efa703b158b Mon Sep 17 00:00:00 2001 From: Hugo Parente Lima Date: Fri, 16 Sep 2011 14:29:25 -0300 Subject: Revert "Implements PSEP-0106 and fixes bug 902 - "Expose Shiboken functionality through a Python module"." This reverts commit bc8448d7fb91733ff08c2a6a3a878702c14a24e0. The PSEP didn't reach the final version yet, so this commit can't be released. --- tests/CMakeLists.txt | 12 +++--- tests/libsample/objecttype.cpp | 6 --- tests/libsample/objecttype.h | 1 - tests/samplebinding/typesystem_sample.xml | 6 --- tests/shibokenmodule/module_test.py | 70 ------------------------------- 5 files changed, 6 insertions(+), 89 deletions(-) delete mode 100644 tests/shibokenmodule/module_test.py (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1c728dd98..6d8e41489 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,8 +23,7 @@ if(DEFINED MINIMAL_TESTS) else() file(GLOB TEST_FILES minimalbinding/*_test.py samplebinding/*_test.py - otherbinding/*_test.py - shibokenmodule/*_test.py) + otherbinding/*_test.py) endif() list(SORT TEST_FILES) @@ -39,7 +38,7 @@ if(CMAKE_VERSION VERSION_LESS 2.8) message("CMake version greater than 2.8 necessary to run tests") else() if(WIN32) - set(TEST_PYTHONPATH "${minimal_BINARY_DIR};${sample_BINARY_DIR};${other_BINARY_DIR};${shibokenmodule_BINARY_DIR}") + set(TEST_PYTHONPATH "${minimal_BINARY_DIR};${sample_BINARY_DIR};${other_BINARY_DIR}") set(TEST_LIBRARY_PATH "$ENV{PATH};${libminimal_BINARY_DIR};${libsample_BINARY_DIR};${libother_BINARY_DIR};${libshiboken_BINARY_DIR}") set(LIBRARY_PATH_VAR "PATH") string(REPLACE "\\" "/" TEST_PYTHONPATH "${TEST_PYTHONPATH}") @@ -47,13 +46,14 @@ else() string(REPLACE ";" "\\;" TEST_PYTHONPATH "${TEST_PYTHONPATH}") string(REPLACE ";" "\\;" TEST_LIBRARY_PATH "${TEST_LIBRARY_PATH}") else() - set(TEST_PYTHONPATH "${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}:${shibokenmodule_BINARY_DIR}") + set(TEST_PYTHONPATH "${minimal_BINARY_DIR}:${sample_BINARY_DIR}:${other_BINARY_DIR}") set(TEST_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${libminimal_BINARY_DIR}:${libsample_BINARY_DIR}:${libother_BINARY_DIR}:${libshiboken_BINARY_DIR}") set(LIBRARY_PATH_VAR "LD_LIBRARY_PATH") endif() + foreach(test_file ${TEST_FILES}) - string(REGEX MATCH "/([^/]+)(binding|module)/([^/]+)_test.py" tmp ${test_file}) - set(test_name "${CMAKE_MATCH_1}_${CMAKE_MATCH_3}") + string(REGEX MATCH "/([^/]+)binding/([^/]+)_test.py" tmp ${test_file}) + set(test_name "${CMAKE_MATCH_1}_${CMAKE_MATCH_2}") list(FIND test_blacklist ${test_name} expect_fail) add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) set_tests_properties(${test_name} PROPERTIES ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH}") diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp index c253c610f..e4fce71e3 100644 --- a/tests/libsample/objecttype.cpp +++ b/tests/libsample/objecttype.cpp @@ -283,9 +283,3 @@ ObjectType* ObjectType::createChild(ObjectType* parent) { return new ObjectType(parent); } - -std::size_t ObjectType::createObjectType() -{ - void* addr = new ObjectType(); - return (std::size_t) addr; -} diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h index 84812a8d6..f032a09f8 100644 --- a/tests/libsample/objecttype.h +++ b/tests/libsample/objecttype.h @@ -106,7 +106,6 @@ public: virtual bool isPython() { return false; } void callVirtualCreateChild(); virtual ObjectType* createChild(ObjectType* parent); - static std::size_t createObjectType(); //return a parent from C++ ObjectType* getCppParent() { diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 09de7b948..2fef355fc 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -16,7 +16,6 @@ - @@ -304,11 +303,6 @@ - - - - - diff --git a/tests/shibokenmodule/module_test.py b/tests/shibokenmodule/module_test.py deleted file mode 100644 index 565e985aa..000000000 --- a/tests/shibokenmodule/module_test.py +++ /dev/null @@ -1,70 +0,0 @@ -import shiboken -import unittest -from sample import * - -class MultipleInherited (ObjectType, Point): - def __init__(self): - ObjectType.__init__(self) - Point.__init__(self) - -class TestShiboken(unittest.TestCase): - def testIsValid(self): - self.assertTrue(shiboken.isValid(object())) - self.assertTrue(shiboken.isValid(None)) - - bb = BlackBox() - item = ObjectType() - ticket = bb.keepObjectType(item) - bb.disposeObjectType(ticket) - self.assertFalse(shiboken.isValid(item)) - - def testWrapInstance(self): - addr = ObjectType.createObjectType() - obj = shiboken.wrapInstance(addr, ObjectType) - self.assertFalse(shiboken.wasCreatedByPython(obj)) - obj.setObjectName("obj") - self.assertEqual(obj.objectName(), "obj") - self.assertEqual(addr, obj.identifier()) - self.assertFalse(shiboken.wasCreatedByPython(obj)) - - # avoid mem leak =] - bb = BlackBox() - self.assertTrue(shiboken.wasCreatedByPython(bb)) - bb.disposeObjectType(bb.keepObjectType(obj)) - - def testIsOwnedByPython(self): - obj = ObjectType() - self.assertTrue(shiboken.isOwnedByPython(obj)) - p = ObjectType() - obj.setParent(p) - self.assertFalse(shiboken.isOwnedByPython(obj)) - - def testDump(self): - """Just check if dump doesn't crash on certain use cases""" - p = ObjectType() - obj = ObjectType(p) - obj2 = ObjectType(obj) - obj3 = ObjectType(obj) - self.assertEqual(shiboken.dump(None), "Ordinary Python type.") - shiboken.dump(obj) - - model = ObjectModel(p) - v = ObjectView(model, p) - shiboken.dump(v) - - m = MultipleInherited() - shiboken.dump(m) - self.assertEqual(len(shiboken.getCppPointer(m)), 2) - - def testDelete(self): - obj = ObjectType() - child = ObjectType(obj) - self.assertTrue(shiboken.isValid(obj)) - self.assertTrue(shiboken.isValid(child)) - # Note: this test doesn't assure that the object dtor was really called - shiboken.delete(obj) - self.assertFalse(shiboken.isValid(obj)) - self.assertFalse(shiboken.isValid(child)) - -if __name__ == '__main__': - unittest.main() -- cgit v1.2.3