diff --git a/php/WebServices/Tests/testWebServer.php b/php/WebServices/Tests/testWebServer.php new file mode 100644 index 0000000..f9a8d2d --- /dev/null +++ b/php/WebServices/Tests/testWebServer.php @@ -0,0 +1,165 @@ +isAlive(); + if (!isset($res) || ($res != true)) + echo "[ERROR] - Error during call of isAlive function".PHP_EOL; + else + echo "[OK] - isAlive".PHP_EOL; + + //Test getTimeTablesList function without userID & password +// $res = $client->getTimeTablesList(); +// if (!isset($res) || !$res->success) +// echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL; +// else +// echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL; + + //Test getTimeTablesList function with userID & password + $res = $client->getTimeTablesList("budnik", "Sacre-Cour"); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getTimeTablesList function - Test 2".PHP_EOL; + else + echo "[OK] - getTimeTablesList - Test 2 - ".$res->TimeTablesList.PHP_EOL; + + //Test getTimeTable function without userID & password +// $res = $client->getTimeTable("sharedtt_0"); +// if (!isset($res) || !$res->success) +// echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL; +// else +// echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL; + + //Test getTimeTable function with userID & password + $res = $client->getTimeTable("tt_0", "budnik", "Sacre-Cour"); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getTimeTable function - Test 2".PHP_EOL; + else + echo "[OK] - getTimeTable - Test 2 - ".$res->ttFileURL.PHP_EOL; + + //Test getParameterList function for impex user +// $res = $client->getParameterList("impex"); +// if (!isset($res) || !$res->success) +// echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL; +// else +// echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL; + + //Test getParameterList function with userID & password + $res = $client->getParameterList("budnik", "Sacre-Cour"); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameterList function - Test 2".PHP_EOL; + else + { + echo "[OK] - getParameterList - Test 2 :".PHP_EOL; + echo " - UserDefinedParameters : ".$res->ParameterList->UserDefinedParameters.PHP_EOL; + echo " - LocalDataBaseParameters : ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL; + } + + //Test getObsDataTree function + $res = $client->getObsDataTree(); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getObsDataTree function".PHP_EOL; + else + echo "[OK] - getObsDataTree - Test 1 - ".$res->WorkSpace->LocalDataBaseParameters.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::ASCII); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 1".PHP_EOL; + else + echo "[OK] - getParameter - Test 1 - ".$res->dataFileURLs.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 3600, "", "", WSOutputFileFormat::ASCII); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 2".PHP_EOL; + else + echo "[OK] - getParameter - Test 2 - ".$res->dataFileURLs.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::VOTABLE); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 3".PHP_EOL; + else + echo "[OK] - getParameter - Test 3 - ".$res->dataFileURLs.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 3600, "", "", WSOutputFileFormat::VOTABLE); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 4".PHP_EOL; + else + echo "[OK] - getParameter - Test 4 - ".$res->dataFileURLs.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::ASCII, WSOutputTimeFormat::TIMESTAMP); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 5".PHP_EOL; + else + echo "[OK] - getParameter - Test 5 - ".$res->dataFileURLs.PHP_EOL; + + //Test getParameter function + $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::VOTABLE, WSOutputTimeFormat::ISO, 1); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getParameter function - Test 6".PHP_EOL; + else + echo "[OK] - getParameter - Test 6 - ".$res->dataFileURLs.PHP_EOL; + + //Test getDataset function + $res = $client->getDataset("2008-01-01T00:00:00", "2008-01-02T00:00:00", "ground:based:asy", 0, "", "", WSOutputFileFormat::ASCII); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getDataset function".PHP_EOL; + else + echo "[OK] - getDataset - ".$res->dataFileURLs.PHP_EOL; + + //Test getOrbites function + $res = $client->getOrbites("2008-01-01T00:00:00", "2008-01-02T00:00:00", WSSpacecraft::VEX, WSCoordinatesSytem::VSO, WSOrbitUnit::RV, + 0, "", "", WSOutputFileFormat::ASCII); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getOrbites function".PHP_EOL; + else + echo "[OK] - getOrbites - ".$res->dataFileURLs.PHP_EOL; + + //Test getPlot function + $res = $client->getPlot("2008-01-01T00:00:00", "2009-01-01T00:00:00", "ACE"); + if (!isset($res) || !$res->success) + echo "[ERROR] - Error during call of getPlot function".PHP_EOL; + else + { + $plotDirectoryURL = $res->plotDirectoryURL; + echo "[OK] - getPlot".PHP_EOL; + while (true) + { + echo " -> getResultPlot".PHP_EOL; + $res = $client->getResultPlot($plotDirectoryURL); + if (!isset($res)) + { + echo "[ERROR] - Error during call of getResultPlot function".PHP_EOL; + break; + } + else if ($res->success) + { + echo " -> plotFileURL : ".$res->plotFileURL.PHP_EOL; + break; + } + echo " -> Result not ready => Wait 5s".PHP_EOL; + sleep(5); + } + } +} + +$clientSOAP = new WSClientSOAP("http://apus.irap.omp.eu/NEWAMDA/public/wsdl/Methods_AMDA.wsdl"); + +echo "==> Suite tests for SOAP client".PHP_EOL; +runSuiteTests($clientSOAP); + +//REST client is obsolete +/*$clientREST = new WSClientREST("http://localhost/NEWAMDA-BENJAMIN/php/rest/"); + +echo "==> Suite tests for REST client".PHP_EOL; +runSuiteTests($clientREST);*/ + + +?> \ No newline at end of file diff --git a/php/testWebServer.php b/php/testWebServer.php deleted file mode 100644 index b05d321..0000000 --- a/php/testWebServer.php +++ /dev/null @@ -1,165 +0,0 @@ -isAlive(); - if (!isset($res) || ($res != true)) - echo "[ERROR] - Error during call of isAlive function".PHP_EOL; - else - echo "[OK] - isAlive".PHP_EOL; - - //Test getTimeTablesList function without userID & password - $res = $client->getTimeTablesList(); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getTimeTablesList function - Test 1".PHP_EOL; - else - echo "[OK] - getTimeTablesList - Test 1 - ".$res->TimeTablesList.PHP_EOL; - - //Test getTimeTablesList function with userID & password - $res = $client->getTimeTablesList("testKernel", "amda"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getTimeTablesList function - Test 2".PHP_EOL; - else - echo "[OK] - getTimeTablesList - Test 2 - ".$res->TimeTablesList.PHP_EOL; - - //Test getTimeTable function without userID & password - $res = $client->getTimeTable("sharedtt_0"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getTimeTable function - Test 1".PHP_EOL; - else - echo "[OK] - getTimeTable - Test 1 - ".$res->ttFileURL.PHP_EOL; - - //Test getTimeTable function with userID & password - $res = $client->getTimeTable("tt_0", "testKernel", "amda"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getTimeTable function - Test 2".PHP_EOL; - else - echo "[OK] - getTimeTable - Test 2 - ".$res->ttFileURL.PHP_EOL; - - //Test getParameterList function for impex user - $res = $client->getParameterList("impex"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameterList function - Test 1".PHP_EOL; - else - echo "[OK] - getParameterList - Test 1 - ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL; - - //Test getParameterList function with userID & password - $res = $client->getParameterList("testKernel", "amda"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameterList function - Test 2".PHP_EOL; - else - { - echo "[OK] - getParameterList - Test 2 :".PHP_EOL; - echo " - UserDefinedParameters : ".$res->ParameterList->UserDefinedParameters.PHP_EOL; - echo " - LocalDataBaseParameters : ".$res->ParameterList->LocalDataBaseParameters.PHP_EOL; - } - - //Test getObsDataTree function - $res = $client->getObsDataTree(); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getObsDataTree function".PHP_EOL; - else - echo "[OK] - getObsDataTree - Test 1 - ".$res->WorkSpace->LocalDataBaseParameters.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::ASCII); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 1".PHP_EOL; - else - echo "[OK] - getParameter - Test 1 - ".$res->dataFileURLs.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 3600, "", "", WSOutputFileFormat::ASCII); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 2".PHP_EOL; - else - echo "[OK] - getParameter - Test 2 - ".$res->dataFileURLs.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::VOTABLE); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 3".PHP_EOL; - else - echo "[OK] - getParameter - Test 3 - ".$res->dataFileURLs.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 3600, "", "", WSOutputFileFormat::VOTABLE); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 4".PHP_EOL; - else - echo "[OK] - getParameter - Test 4 - ".$res->dataFileURLs.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::ASCII, WSOutputTimeFormat::TIMESTAMP); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 5".PHP_EOL; - else - echo "[OK] - getParameter - Test 5 - ".$res->dataFileURLs.PHP_EOL; - - //Test getParameter function - $res = $client->getParameter("2008-01-01T00:00:00", "2008-01-02T00:00:00", "imf", 0, "", "", WSOutputFileFormat::VOTABLE, WSOutputTimeFormat::ISO, 1); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getParameter function - Test 6".PHP_EOL; - else - echo "[OK] - getParameter - Test 6 - ".$res->dataFileURLs.PHP_EOL; - - //Test getDataset function - $res = $client->getDataset("2008-01-01T00:00:00", "2008-01-02T00:00:00", "ground:based:asy", 0, "", "", WSOutputFileFormat::ASCII); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getDataset function".PHP_EOL; - else - echo "[OK] - getDataset - ".$res->dataFileURLs.PHP_EOL; - - //Test getOrbites function - $res = $client->getOrbites("2008-01-01T00:00:00", "2008-01-02T00:00:00", WSSpacecraft::VEX, WSCoordinatesSytem::VSO, WSOrbitUnit::RV, - 0, "", "", WSOutputFileFormat::ASCII); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getOrbites function".PHP_EOL; - else - echo "[OK] - getOrbites - ".$res->dataFileURLs.PHP_EOL; - - //Test getPlot function - $res = $client->getPlot("2008-01-01T00:00:00", "2009-01-01T00:00:00", "ACE"); - if (!isset($res) || !$res->success) - echo "[ERROR] - Error during call of getPlot function".PHP_EOL; - else - { - $plotDirectoryURL = $res->plotDirectoryURL; - echo "[OK] - getPlot".PHP_EOL; - while (true) - { - echo " -> getResultPlot".PHP_EOL; - $res = $client->getResultPlot($plotDirectoryURL); - if (!isset($res)) - { - echo "[ERROR] - Error during call of getResultPlot function".PHP_EOL; - break; - } - else if ($res->success) - { - echo " -> plotFileURL : ".$res->plotFileURL.PHP_EOL; - break; - } - echo " -> Result not ready => Wait 5s".PHP_EOL; - sleep(5); - } - } -} - -$clientSOAP = new WSClientSOAP("http://apus.irap.omp.eu/NEWAMDA/public/wsdl/Methods_AMDA.wsdl"); - -echo "==> Suite tests for SOAP client".PHP_EOL; -runSuiteTests($clientSOAP); - -//REST client is obsolete -/*$clientREST = new WSClientREST("http://localhost/NEWAMDA-BENJAMIN/php/rest/"); - -echo "==> Suite tests for REST client".PHP_EOL; -runSuiteTests($clientREST);*/ - - -?> \ No newline at end of file diff --git a/public/wsdl/Methods_AMDA.wsdl b/public/wsdl/Methods_AMDA.wsdl index a3e3f3e..0b997aa 100644 --- a/public/wsdl/Methods_AMDA.wsdl +++ b/public/wsdl/Methods_AMDA.wsdl @@ -55,9 +55,7 @@ - Url's of AmdaUserTree file which must be generated - after connections. Contents: AMDA local parameters, Remote - Parameters, Shared Predefined Parameters. + Url's of AMDA local parameters @@ -67,15 +65,12 @@ - ID of AMDA user storing in the 3DView. Must TBD. If no - user ID, result is shared Timetables from IMPEX user. - + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user storing in the 3DView. - Must TBD encryption types + Crypt Password of AMDA user @@ -85,8 +80,7 @@ - Url of TimeTables storage file with TimeTables - ID's. + If method is OK success = true, else success = false @@ -102,13 +96,12 @@ - ID of AMDA user + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user storing in the 3DView. - Must TBD encryption types + Crypt Password of AMDA user @@ -118,16 +111,14 @@ - Url of TimeTables storage file with TimeTables - ID's. + If method is OK success = true, else success = false - Url of AmdaUserTree file which must be generated after - the user connections Contents: User groups local parameters, User - remote parameters, user predefined parameters. + Url of UserDefinedParameters, Url of AmdaLocalDataBaseParameters, + Url of RemoteDataBaseParameters ( not implemented ) @@ -685,21 +676,18 @@ of a set of typically orthogonal axes. - ID of AMDA user storing in the 3DView. Must TBD For - public data is optional. + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user storing in the 3DView. - Must TBD encryption types Required for predefined parameters. - + Crypt Password of AMDA user - Choice is possible between the two formats: netCDF, CDF, - ASCII and VOTable. If the format is not specified it will be netCDF + Choice is possible between the four formats: netCDF, CDF, + ASCII and VOTable. If the format is not specified it will be ASCIIF by default @@ -737,8 +725,7 @@ of a set of typically orthogonal axes. - Url of TimeTables storage file with TimeTables - ID's. + If method is OK success = true, else success = false @@ -834,21 +821,18 @@ of a set of typically orthogonal axes. - ID of AMDA user. For - public data is optional. + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user. - Must TBD encryption types Required for predefined parameters. - + Crypt Password of AMDA user - Choice is possible between the 3 formats: netCDF, CDF, - ASCII and VOTable. If the format is not specified it will be netCDF + Choice is possible between the four formats: netCDF, CDF, + ASCII and VOTable. If the format is not specified it will be ASCII by default @@ -893,7 +877,7 @@ of a set of typically orthogonal axes. type="xs:anyURI"> URLs of results data files. If not URLs - not data for - required parameters + required datasets @@ -940,7 +924,7 @@ of a set of typically orthogonal axes. - Password of AMDA + Password of AMDA user @@ -1026,21 +1010,18 @@ of a set of typically orthogonal axes. - ID of AMDA user storing in the 3DView. Must TBD For - public data is optional. + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user storing in the 3DView. - Must TBD encryption types Required for predefined parameters. - + Crypt Password of AMDA user - Choice is possible between the two formats: netCDF, CDF, - ASCII and VOTable. If the format is not specified it will be netCDF + Choice is possible between the four formats: netCDF, CDF, + ASCII and VOTable. If the format is not specified it will be ASCII by default @@ -1111,21 +1092,17 @@ of a set of typically orthogonal axes. - ID of AMDA user storing in the 3DView. Must - TBD + ID of AMDA user. If no user ID, user is IMPEX - Crypt Password of AMDA user storing in the 3DView. - Must TBD encryption types Required for predefined parameters. - + Crypt Password of AMDA user - Id of time tables(TT) defined in - AmdaUserTree.xml + Id of time table @@ -1401,7 +1378,7 @@ of a set of typically orthogonal axes. - + -- libgit2 0.21.2