Return a parsed result from the reasoner service client

Johannes Binder Johannes Binder 2014-05-31

changed src/net/timbusproject/dpes/alternative/ReasonerClient/SOAP/DependencyReasonerClient.java
changed test/net/timbusproject/dpes/alternative/ReasonerClient/SOAP/DependencyReasonerClientTest.java
copied src/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseData.java -> src/net/timbusproject/dpes/alternative/ReasonerClient/common/ResponseData.java
copied test/net/timbusproject/dpes/alternative/ReasonerClient/REST/RemovedDataTest.java -> test/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseDataTest.java
src/net/timbusproject/dpes/alternative/ReasonerClient/SOAP/DependencyReasonerClient.java Diff Switch to side-by-side view
Loading...
test/net/timbusproject/dpes/alternative/ReasonerClient/SOAP/DependencyReasonerClientTest.java Diff Switch to side-by-side view
Loading...
src/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseData.java to src/net/timbusproject/dpes/alternative/ReasonerClient/common/ResponseData.java
--- a/src/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseData.java
+++ b/src/net/timbusproject/dpes/alternative/ReasonerClient/common/ResponseData.java
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and limitation under the License.
  */
 
-package net.timbusproject.dpes.alternative.ReasonerClient.REST;
+package net.timbusproject.dpes.alternative.ReasonerClient.common;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -37,7 +37,7 @@
     private List<String> toPackageList(JSONArray jsonArray) {
         List<String> packages = new ArrayList<>();
         for (int i = 0; i < jsonArray.length(); ++i) {
-            packages.add(jsonArray.getJSONObject(i).getString("package"));
+            packages.add(jsonArray.getJSONObject(i).getString("name"));
         }
         return packages;
     }
test/net/timbusproject/dpes/alternative/ReasonerClient/REST/RemovedDataTest.java to test/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseDataTest.java
--- a/test/net/timbusproject/dpes/alternative/ReasonerClient/REST/RemovedDataTest.java
+++ b/test/net/timbusproject/dpes/alternative/ReasonerClient/REST/ResponseDataTest.java
@@ -18,6 +18,7 @@
 
 package net.timbusproject.dpes.alternative.ReasonerClient.REST;
 
+import net.timbusproject.dpes.alternative.ReasonerClient.common.ResponseData;
 import org.json.JSONObject;
 import org.junit.Test;
 
@@ -28,7 +29,7 @@
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertThat;
 
-public class RemovedDataTest {
+public class ResponseDataTest {
 
     @Test
     public void createPI_validRequest_shouldReturnValidJSON() throws IOException {
@@ -42,7 +43,7 @@
                 "   \"dataset\": \"examples_Health\",\n" +
                 "   \"uuid\": \"2df4935a-ba75-11e3-8f8d-b99a36fe516e\",\n" +
                 "   \"result\":\n" +
-                "     {\"installed\":[{\"package\":\"libsm6\",\"version\":\"1448\"},{\"package\":\"libx11-6\",\"version\":\"1456\"},{\"package\":\"libx11-data\",\"version\":\"1456\"}],\"removed\":[]},\n" +
+                "     {\"installed\":[{\"name\":\"libsm6\",\"version\":\"1448\"},{\"name\":\"libx11-6\",\"version\":\"1456\"},{\"name\":\"libx11-data\",\"version\":\"1456\"}],\"removed\":[]},\n" +
                 "   \"*status*\": \"COMPLETED\"\n" +
                 "}\n";
         ResponseData actual = new ResponseData(new JSONObject(result));