Merge branch 'reg-inttest-fix-ibm' into 'master'

updated test

See merge request !484

testing/register-test-ibm/src/test/java/org/opengroup/osdu/register/ddms/TestQueryDdmsByType.java

@@ -17,12 +17,20 @@
 package org.opengroup.osdu.register.ddms;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
+import com.google.gson.Gson;
 import org.junit.After;
 import org.junit.Before;
+import org.opengroup.osdu.register.model.Ddms;
 import org.opengroup.osdu.register.util.IBMTestUtils;
 
 import com.sun.jersey.api.client.ClientResponse;
+import org.opengroup.osdu.register.util.RestDescriptor;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class TestQueryDdmsByType extends QueryDdmsByTypeTest {
 
@@ -37,7 +45,14 @@ public class TestQueryDdmsByType extends QueryDdmsByTypeTest {
     public void tearDown() {
         this.testUtils = null;
     }
-    
+
+    private String id = "createtest" + 1715160736171L;
+
+    @Override
+    protected String getId() {
+        return id;
+    }
+
 	@Override
 	public void should_return400_when_makingHttpRequestWithoutToken() throws Exception {
 		ClientResponse response = descriptor.run(getId(), "");
@@ -48,4 +63,37 @@ public class TestQueryDdmsByType extends QueryDdmsByTypeTest {
         ClientResponse response = descriptor.runOnCustomerTenant(getId(), testUtils.getNoDataAccessToken());
         assertEquals(error(response.getEntity(String.class)), 401, response.getStatus());
     }
+
+    @Override
+    public void should_return20XResponseCode_when_makingValidHttpsRequest() throws Exception {
+        createResource();
+        ClientResponse response = descriptor.run("wellbore", testUtils.getOpsAccessToken());
+        assertEquals(error(""), expectedOkResponseCode(), response.getStatus());
+        validate20XResponse(response, descriptor);
+
+        response = descriptor.run("wellb", testUtils.getOpsAccessToken());
+        assertEquals(error(""), expectedOkResponseCode(), response.getStatus());
+        String body = response.getEntity(String.class);
+        Ddms[] ddmsArr = new Gson().fromJson(body, Ddms[].class);
+        List<Ddms> allDms = Arrays.asList(ddmsArr);
+        assertEquals(0, allDms.size());
+
+        deleteResource();
+    }
+
+    @Override
+    protected void validate20XResponse(ClientResponse response, RestDescriptor descriptor) {
+        String body = response.getEntity(String.class);
+        Ddms[] ddmsArr = new Gson().fromJson(body, Ddms[].class);
+        List<Ddms> allDms = Arrays.asList(ddmsArr);
+        assertTrue(allDms.size() >= 1);
+
+        List<Ddms> ddms = allDms.stream().filter(f -> f.id.equalsIgnoreCase(getId())).collect(Collectors.toList());
+        assertEquals(1, ddms.size());
+        assertEquals("My test ddms.", ddms.get(0).description);
+        assertTrue(ddms.get(0).contactEmail, ddms.get(0).contactEmail.equals("test@test.com"));
+        assertEquals("logDDMS", ddms.get(0).name);
+        assertEquals(1, ddms.get(0).interfaces.size());
+        assertEquals("wellbore", ddms.get(0).interfaces.iterator().next().entityType);
+    }
 }