framework : update python examples and utest according to new API

framework/cybertron.sh

@@ -30,7 +30,7 @@ export COVFILE="${CYBERTRON_DIR}/test_cybertron.cov"
 export COVFILE_INC="${CYBERTRON_DIR}/test-inc.cov"
 export PATH=${COV_HOME}/bin:$PATH
 TEST_DIR=${CYBERTRON_DIR}/install/test/cybertron/unit_test/
-TEST_DIR_PY=${CYBERTRON_DIR}/install/lib/python/test/
+TEST_DIR_PY=${CYBERTRON_DIR}/install/test/cybertron/python/test/
 
 RED='\033[0;31m'
 YELLOW='\e[33m'
@@ -175,6 +175,10 @@ function run_test() {
         done
         echo
     done
+    run_test_py
+    failed=0
+    failed=0
+    total=0
     echo
     if [[ ${error} -ne 0 ]]; then
         print_delim
@@ -234,7 +238,7 @@ function run_test_py() {
         done
         print_delim
     fi
-    success "Run ${total} cases, FAILED: ${failed}"
+    success "Run Python ${total} cases, FAILED: ${failed}"
     cd -
 }
 

framework/python/examples/record.py

@@ -20,7 +20,7 @@ import time
 import sys
 
 sys.path.append("../")
-from cybertron import init
+from cybertron import cybertron
 from cybertron import record
 
 TEST_RECORD_FILE = "test02.record"
@@ -71,10 +71,10 @@ def test_record_reader(reader_path):
             count = count + 1
     freader.close()
 
-    init.shutdown()
+    cybertron.shutdown()
 
 if __name__ == '__main__':
-    init.init()
+    cybertron.init()
     test_record_writer(TEST_RECORD_FILE)
     test_record_reader(TEST_RECORD_FILE)
-    init.shutdown()
+    cybertron.shutdown()

framework/python/test/test_init.py

@@ -20,7 +20,7 @@ import sys
 import unittest
 
 sys.path.append("../")
-from cybertron import init
+from cybertron import cybertron
 
 class TestInit(unittest.TestCase):
     """
@@ -28,12 +28,12 @@ class TestInit(unittest.TestCase):
     """
     def test_init(self):
         """
-        test init.
+        test cybertron.
         """
-        self.assertTrue(init.init())
-        self.assertTrue(init.ok())
-        init.shutdown()
-        self.assertTrue(init.is_shutdown())
+        self.assertTrue(cybertron.init())
+        self.assertTrue(cybertron.ok())
+        cybertron.shutdown()
+        self.assertTrue(cybertron.is_shutdown())
 
 if __name__ == '__main__':
     unittest.main()

framework/python/test/test_node.py

@@ -20,8 +20,7 @@ import sys
 import unittest
 
 sys.path.append("../")
-from cybertron import node
-from cybertron import init
+from cybertron import cybertron
 from proto import chatter_pb2
 
 def callback(data):
@@ -39,11 +38,11 @@ class TestNode(unittest.TestCase):
     """
     @classmethod
     def setUpClass(cls):
-        init.init()
+        cybertron.init()
 
     @classmethod
     def tearDownClass(cls):
-        init.shutdown()
+        cybertron.shutdown()
 
     def test_writer(self):
         """
@@ -55,8 +54,8 @@ class TestNode(unittest.TestCase):
         msg.timestamp = 0
         msg.lidar_timestamp = 0
 
-        self.assertTrue(init.ok())
-        test_node = node.Node("node_name1")
+        self.assertTrue(cybertron.ok())
+        test_node = cybertron.Node("node_name1")
         writer = test_node.create_writer("channel/chatter",
                 chatter_pb2.Chatter.DESCRIPTOR.full_name)
         self.assertEqual(writer.name, "channel/chatter")
@@ -67,8 +66,8 @@ class TestNode(unittest.TestCase):
         """
         unit test of reader.
         """
-        self.assertTrue(init.ok())
-        test_node = node.Node("listener")
+        self.assertTrue(cybertron.ok())
+        test_node = cybertron.Node("listener")
         reader = test_node.create_reader("channel/chatter",
                 chatter_pb2.Chatter, callback)
         self.assertEqual(reader.name, "channel/chatter")

framework/python/test/test_record.py

@@ -21,7 +21,7 @@ import sys
 import unittest
 
 sys.path.append("../")
-from cybertron import init
+from cybertron import cybertron
 from cybertron import record
 from proto import record_pb2
 
@@ -41,7 +41,7 @@ class TestRecord(unittest.TestCase):
         """
         unit test of record.
         """
-        self.assertTrue(init.init())
+        self.assertTrue(cybertron.init())
 
         # writer
         fwriter = record.RecordWriter()
@@ -75,7 +75,7 @@ class TestRecord(unittest.TestCase):
         self.assertTrue(fread.endoffile())
         fread.close()
 
-        init.shutdown()
+        cybertron.shutdown()
 
 if __name__ == '__main__':
     unittest.main()