[openrtm-commit:02821] r1041 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC

[openrtm ＠ openrtm.org]

Author: t-katami
Date: 2017-09-13 16:51:06 +0900 (Wed, 13 Sep 2017)
New Revision: 1041

Modified:
   trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/ManagerTest.java
Log:
[incompat,return] Changed it with refs #4186

Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/ManagerTest.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/ManagerTest.java	2017-09-13 04:42:04 UTC (rev 1040)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/ManagerTest.java	2017-09-13 07:51:06 UTC (rev 1041)
@@ -578,10 +578,24 @@
         }
         manager.activateManager();
         manager.m_module.allowAbsolutePath();
-        String str = manager.load("jp.go.aist.rtm.RTC.util.TimeValue", "sign");
+        //String str = manager.load("jp.go.aist.rtm.RTC.util.TimeValue", "sign");
+        ReturnCode_t ret;
+        ret = manager.load("jp.go.aist.rtm.RTC.util.TimeValue", "sign");
+        assertEquals(ret,ReturnCode_t.RTC_OK);
 
+        ret = manager.load("", "sign");
+        assertEquals(ret,ReturnCode_t.BAD_PARAMETER);
+
+        ret = manager.load("jp.go.aist.rtm.RTC.util.TimeValue", "abc");
+        assertEquals(ret,ReturnCode_t.BAD_PARAMETER);
+
+        ret = manager.load("jp.go.aist.rtm.RTC.util.ByteHolder", "stringFrom");
+        assertEquals(ret,ReturnCode_t.BAD_PARAMETER);
+
+
+
+
         manager.unload("jp.go.aist.rtm.RTC.util.TimeValue");
-
         manager.unloadAll();
         Vector<Properties> modules = manager.getLoadedModules();
         assertEquals(0, modules.size());
@@ -826,6 +840,7 @@
         RTObject_impl comp = mgr2.createComponent("DataFlowComponentFactory");
         assertNull(comp);
         m_mgr.terminate();
+        m_mgr.shutdown();
     }
 
     /**
@@ -837,11 +852,16 @@
      * </p>
      */
     public void test_cleanupComponent() throws Exception {
+System.out.println("test_cleanupComponent()");
         java.io.File fileCurrent = new java.io.File(".");
         String rootPath = fileCurrent.getAbsolutePath();
         rootPath = rootPath.substring(0,rootPath.length()-1);
         String testPath = rootPath + "tests/fixtures/Manager/fixture4.conf";
         String param[] = {"-f", testPath };
+        if(m_mgr != null){
+            System.out.println("m_mgr != null");
+            m_mgr.shutdown();
+        }
         m_mgr = Manager.init(param);
         assertNotNull(m_mgr);
         assertNotNull(m_mgr.getORB());