modify test interface

unknown · unknown · commit 6647d04083f6 · 2016-07-11T10:07:21.000+08:00
diff --git a/web/tests/controllers/getConfigTest.php b/web/tests/controllers/getConfigTest.php
@@ -29,7 +29,7 @@ public function tearDown() {
     public function testGetConfig() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_config/ok.json';
         ob_start();
-        $this->CI->getOnlineConfiguration();
+        $this->CI->pushpolicyquery();
         $output = ob_get_clean();
         $this -> assertEquals(
         '{"reply":{"fileSize":1,"flag":1,"msg":"ok","autoGetLocation":"1","updateOnlyWifi":"1","sessionMillis":"3000","intervalTime":5,"reportPolicy":"1","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -41,7 +41,7 @@ public function testGetConfig() {
     public function testGetConfig1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->getOnlineConfiguration();
+        $this->CI->pushpolicyquery();
         $output = ob_get_clean();
         $this -> assertEquals(
         '{"reply":{"fileSize":1,"flag":-3,"msg":"Invalid content from php:\/\/input.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -53,7 +53,7 @@ public function testGetConfig1() {
     public function testGetConfig2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->getOnlineConfiguration();
+        $this->CI->pushpolicyquery();
         $output = ob_get_clean();
         $this -> assertEquals(
         '{"reply":{"fileSize":1,"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -65,7 +65,7 @@ public function testGetConfig2() {
     public function testGetConfig3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_config/noappkey.json';
         ob_start();
-        $this->CI->getOnlineConfiguration();
+        $this->CI->pushpolicyquery();
         $output = ob_get_clean();
         $this -> assertEquals(
         '{"reply":{"fileSize":1,"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}', 
@@ -76,7 +76,7 @@ public function testGetConfig3() {
     public function testGetConfig4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_config/errorappkey.json';
         ob_start();
-        $this->CI->getOnlineConfiguration();
+        $this->CI->pushpolicyquery();
         $output = ob_get_clean();
         $this -> assertEquals(
         '{"reply":{"fileSize":1,"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
diff --git a/web/tests/controllers/getUpdateTest.php b/web/tests/controllers/getUpdateTest.php
@@ -34,7 +34,7 @@ public function testUpdate()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_update/ok.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals(
         '{"reply":{"flag":1,"msg":"ok","fileUrl":"http:\/\/localhost","forceupdate":"0","description":"android","time":"2016-05-01 21:45:22","versionName":"3","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -46,7 +46,7 @@ public function testUpdate_noupdate()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/update_noupdate.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals(//'{"reply":{"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}', 
         '{"reply":{"flag":-1,"msg":"Invalid appkey:49d0b54ea086922f0dd5459269d338ce","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -57,7 +57,7 @@ public function testUpdate1()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals(//'{"reply":{"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}', 
         '{"reply":{"flag":-3,"msg":"Invalid content from php:\/\/input.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
@@ -68,7 +68,7 @@ public function testUpdate2()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals('{"reply":{"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}', 
         $output);
@@ -78,7 +78,7 @@ public function testUpdate3()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_update/noappkey.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals('{"reply":{"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}',
          $output);
@@ -88,7 +88,7 @@ public function testUpdate4()
     {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/invalidappkey.json';
         ob_start();
-        $this->CI->getApplicationUpdate();
+        $this->CI->appupdate();
         $output = ob_get_clean();
         $this->assertEquals('{"reply":{"flag":-5,"msg":"Appkey is not in json.","returnCode":{"domain":"","type":"S","code":"AAAAAA"}}}', 
         $output);
diff --git a/web/tests/controllers/postclientdataTest.php b/web/tests/controllers/postclientdataTest.php
@@ -26,7 +26,7 @@ public function tearDown() {
     public function testPostClientdata() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_client/ok.json';
         ob_start();
-        $this->CI->postClientdata();
+        $this->CI->clientdata();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":1,"msg":"ok"}', 
@@ -37,7 +37,7 @@ public function testPostClientdata() {
     public function testPostClientdata1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->postClientdata();
+        $this->CI->clientdata();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-3,"msg":"Invalid content from php:\/\/input."}', 
@@ -48,7 +48,7 @@ public function testPostClientdata1() {
     public function testPostClientdata2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->postClientdata();
+        $this->CI->clientdata();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-4,"msg":"Parse json data failed."}', 
@@ -59,7 +59,7 @@ public function testPostClientdata2() {
     public function testPostClientdata3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_client/noappkey.json';
         ob_start();
-        $this->CI->postClientdata();
+        $this->CI->clientdata();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-5,"msg":"Appkey is not set in json."}', 
@@ -70,7 +70,7 @@ public function testPostClientdata3() {
     public function testPostClientdata4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_client/errorappkey.json';
         ob_start();
-        $this->CI->postClientdata();
+        $this->CI->clientdata();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-1,"msg":"Invalid appkey:invalid_appkey_00000"}', 
diff --git a/web/tests/controllers/posterrorTest.php b/web/tests/controllers/posterrorTest.php
@@ -26,7 +26,7 @@ public function tearDown() {
     public function testPostError() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_error/ok.json';
         ob_start();
-        $this->CI->postErrorLog();
+        $this->CI->errorlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":1,"msg":"ok"}', 
@@ -37,7 +37,7 @@ public function testPostError() {
     public function testPostError1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->postErrorLog();
+        $this->CI->errorlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-3,"msg":"Invalid content from php:\/\/input."}', 
@@ -48,7 +48,7 @@ public function testPostError1() {
     public function testPostError2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->postErrorLog();
+        $this->CI->errorlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-4,"msg":"Parse json data failed."}', 
@@ -59,7 +59,7 @@ public function testPostError2() {
     public function testPostError3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_error/noappkey.json';
         ob_start();
-        $this->CI->postErrorLog();
+        $this->CI->errorlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-5,"msg":"Appkey is not set in json."}', 
@@ -70,7 +70,7 @@ public function testPostError3() {
     public function testPostError4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_error/errorappkey.json';
         ob_start();
-        $this->CI->postErrorLog();
+        $this->CI->errorlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-1,"msg":"Invalid appkey:invalid_appkey_00000"}', 
diff --git a/web/tests/controllers/posteventTest.php b/web/tests/controllers/posteventTest.php
@@ -28,7 +28,7 @@ public function tearDown() {
     public function testPostEvent() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_event/ok.json';
         ob_start();
-        $this->CI->postEvent();
+        $this->CI->eventlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":1,"msg":"ok"}', 
@@ -39,7 +39,7 @@ public function testPostEvent() {
     public function testPostEvent1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->postEvent();
+        $this->CI->eventlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-3,"msg":"Invalid content from php:\/\/input."}', 
@@ -50,7 +50,7 @@ public function testPostEvent1() {
     public function testPostEvent2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->postEvent();
+        $this->CI->eventlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-4,"msg":"Parse json data failed."}', 
@@ -61,7 +61,7 @@ public function testPostEvent2() {
     public function testPostEvent3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_event/noappkey.json';
         ob_start();
-        $this->CI->postEvent();
+        $this->CI->eventlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-5,"msg":"Appkey is not set in json."}', 
@@ -72,7 +72,7 @@ public function testPostEvent3() {
     public function testPostEvent4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_event/errorappkey.json';
         ob_start();
-        $this->CI->postEvent();
+        $this->CI->eventlog();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-1,"msg":"Invalid appkey:invalid_appkey_00000"}', 
diff --git a/web/tests/controllers/posttagTest.php b/web/tests/controllers/posttagTest.php
@@ -26,7 +26,7 @@ public function tearDown() {
     public function testPostTag() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_tag/ok.json';
         ob_start();
-        $this->CI->postTag();
+        $this->CI->tag();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":1,"msg":"ok"}', 
@@ -37,7 +37,7 @@ public function testPostTag() {
     public function testPostTag1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->postTag();
+        $this->CI->tag();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-3,"msg":"Invalid content from php:\/\/input."}', 
@@ -48,7 +48,7 @@ public function testPostTag1() {
     public function testPostTag2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->postTag();
+        $this->CI->tag();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-4,"msg":"Parse json data failed."}', 
@@ -59,7 +59,7 @@ public function testPostTag2() {
     public function testPostTag3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_tag/noappkey.json';
         ob_start();
-        $this->CI->postTag();
+        $this->CI->tag();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-5,"msg":"Appkey is not set in json."}', 
@@ -70,7 +70,7 @@ public function testPostTag3() {
     public function testPostTag4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_tag/errorappkey.json';
         ob_start();
-        $this->CI->postTag();
+        $this->CI->tag();
         $output = ob_get_clean();
         $this -> assertEquals(
             '{"flag":-1,"msg":"Invalid appkey:invalid_appkey_00000"}', 
diff --git a/web/tests/controllers/postusinglogTest.php b/web/tests/controllers/postusinglogTest.php
@@ -26,39 +26,39 @@ public function tearDown() {
     public function testPostUsinglog() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_usinglog/ok.json';
         ob_start();
-        $this->CI->postActivityLog();
+        $this->CI->usinglog();
         $output = ob_get_clean();
         $this -> assertEquals('{"flag":1,"msg":"ok"}', $output);
     }
 
     public function testPostUsinglog1() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/empty.json';
         ob_start();
-        $this->CI->postActivityLog();
+        $this->CI->usinglog();
         $output = ob_get_clean();
         $this -> assertEquals('{"flag":-3,"msg":"Invalid content from php:\/\/input."}', $output);
     }
     
     public function testPostUsinglog2() {
         $this->CI->rawdata = dirname(__FILE__) . '/testjson/partly.json';
         ob_start();
-        $this->CI->postActivityLog();
+        $this->CI->usinglog();
         $output = ob_get_clean();
         $this -> assertEquals('{"flag":-4,"msg":"Parse json data failed."}', $output);
     }
     
     public function testPostUsinglog3() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_usinglog/noappkey.json';
         ob_start();
-        $this->CI->postActivityLog();
+        $this->CI->usinglog();
         $output = ob_get_clean();
         $this -> assertEquals('{"flag":-5,"msg":"Appkey is not set in json."}', $output);
     }
     
     public function testPostUsinglog4() {
         $this->CI->rawdata = dirname(__FILE__) . '/testdata_usinglog/errorappkey.json';
         ob_start();
-        $this->CI->postActivityLog();
+        $this->CI->usinglog();
         $output = ob_get_clean();
         $this -> assertEquals('{"flag":-1,"msg":"Invalid appkey:invalid_appkey_00000"}', $output);
     }
