diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/example_module.cpp | 7 | ||||
| -rw-r--r-- | tests/example_module.py | 2 | ||||
| -rw-r--r-- | tests/factory_test.cpp | 8 | ||||
| -rw-r--r-- | tests/module_loader_test.py | 4 |
4 files changed, 8 insertions, 13 deletions
diff --git a/tests/example_module.cpp b/tests/example_module.cpp index d0316f8..389cf53 100644 --- a/tests/example_module.cpp +++ b/tests/example_module.cpp @@ -26,9 +26,4 @@ struct MyBlock : gras::Block void work(const InputItems &, const OutputItems &){} }; -gras::Block *make_my_block(void) -{ - return new MyBlock(); -} - -GRAS_REGISTER_FACTORY("/tests/my_block0", make_my_block) +GRAS_REGISTER_FACTORY0("/tests/my_block0", MyBlock) diff --git a/tests/example_module.py b/tests/example_module.py index 6c29435..fbf0b45 100644 --- a/tests/example_module.py +++ b/tests/example_module.py @@ -13,4 +13,4 @@ class MyBlock(gras.Block): def get_num(self): return 42 -gras.Factory.register_make("/tests/my_block1", MyBlock) +gras.register_make("/tests/my_block1", MyBlock) diff --git a/tests/factory_test.cpp b/tests/factory_test.cpp index 999e86e..ca8b5ba 100644 --- a/tests/factory_test.cpp +++ b/tests/factory_test.cpp @@ -51,25 +51,25 @@ GRAS_REGISTER_FACTORY("/tests/my_block_args3", make_my_block_args3) BOOST_AUTO_TEST_CASE(test_register_and_make) { - gras::Element *my_block0 = gras::Factory::make("/tests/my_block_args0"); + gras::Element *my_block0 = gras::make("/tests/my_block_args0"); BOOST_CHECK(dynamic_cast<MyBlock *>(my_block0) != NULL); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block0)->a0, 0); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block0)->a1, ""); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block0)->a2, false); - gras::Element *my_block1 = gras::Factory::make("/tests/my_block_args1", 42); + gras::Element *my_block1 = gras::make("/tests/my_block_args1", 42); BOOST_CHECK(dynamic_cast<MyBlock *>(my_block1) != NULL); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block1)->a0, 42); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block1)->a1, ""); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block1)->a2, false); - gras::Element *my_block2 = gras::Factory::make("/tests/my_block_args2", 1, "foo"); + gras::Element *my_block2 = gras::make("/tests/my_block_args2", 1, "foo"); BOOST_CHECK(dynamic_cast<MyBlock *>(my_block2) != NULL); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block2)->a0, 1); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block2)->a1, "foo"); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block2)->a2, false); - gras::Element *my_block3 = gras::Factory::make("/tests/my_block_args3", -2, "bar", true); + gras::Element *my_block3 = gras::make("/tests/my_block_args3", -2, "bar", true); BOOST_CHECK(dynamic_cast<MyBlock *>(my_block3) != NULL); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block3)->a0, -2); BOOST_CHECK_EQUAL(dynamic_cast<MyBlock *>(my_block3)->a1, "bar"); diff --git a/tests/module_loader_test.py b/tests/module_loader_test.py index 4a8d64f..34423fd 100644 --- a/tests/module_loader_test.py +++ b/tests/module_loader_test.py @@ -6,11 +6,11 @@ import gras class ModuleLoaderTest(unittest.TestCase): def test_load_module_cpp(self): - my_block = gras.Factory.make("/tests/my_block0") + my_block = gras.make("/tests/my_block0") self.assertEqual(my_block.get_num(), 42) def test_load_module_py(self): - my_block = gras.Factory.make("/tests/my_block1") + my_block = gras.make("/tests/my_block1") self.assertEqual(my_block.get_num(), 42) if __name__ == '__main__': |