1 files changed, 0 insertions, 95 deletions
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
index 5d609a65..7e03b1f6 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/http/server/test/HttpClientTest.java
@@ -63,8 +63,6 @@ public class HttpClientTest {
     private static final String FALSE_STRING = "false";
     private static final String ALPHA123 = "alpha123";
     private static final String PUT_HELLO = "PUT:hello:{myParameter=myValue}";
-    private static final String DOT_GSON = "." + "GSON";
-    private static final String DOT_JACKSON = "." + "JACKSON";
     private static final String DOT_PDP = "." + "PDP";
     private static final String DOT_PAP = "." + "PAP";
 
@@ -143,7 +141,6 @@ public class HttpClientTest {
         HttpClientFactoryInstance.getClientFactory().destroy();
 
         MyGsonProvider.resetSome();
-        MyJacksonProvider.resetSome();
     }
 
     /**
@@ -351,26 +348,6 @@ public class HttpClientTest {
     }
 
     @Test
-    public void testHttpPutAuthClient_JacksonProvider() throws Exception {
-        final HttpClient client = HttpClientFactoryInstance.getClientFactory()
-                        .build(BusTopicParams.builder().clientName(TEST_HTTP_AUTH_CLIENT).useHttps(true)
-                                        .allowSelfSignedCerts(true).hostname(LOCALHOST).port(6667).basePath(JUNIT_ECHO)
-                                        .userName("x").password("y").managed(true)
-                                        .serializationProvider(MyJacksonProvider.class.getName()).build());
-
-        Entity<MyEntity> entity = Entity.entity(new MyEntity(MY_VALUE), MediaType.APPLICATION_JSON);
-        final Response response = client.put(HELLO, entity, Collections.emptyMap());
-        final String body = HttpClient.getBody(response, String.class);
-
-        assertEquals(200, response.getStatus());
-        assertEquals(PUT_HELLO, body);
-
-        assertTrue(MyJacksonProvider.hasWrittenSome());
-
-        assertFalse(MyGsonProvider.hasWrittenSome());
-    }
-
-    @Test
     public void testHttpPutAuthClient_GsonProvider() throws Exception {
         final HttpClient client = HttpClientFactoryInstance.getClientFactory()
                         .build(BusTopicParams.builder().clientName(TEST_HTTP_AUTH_CLIENT).useHttps(true)
@@ -386,8 +363,6 @@ public class HttpClientTest {
         assertEquals(PUT_HELLO, body);
 
         assertTrue(MyGsonProvider.hasWrittenSome());
-
-        assertFalse(MyJacksonProvider.hasWrittenSome());
     }
 
     @Test
@@ -488,7 +463,6 @@ public class HttpClientTest {
         response = clientPdp.get("test");
         assertEquals(500, response.getStatus());
 
-        assertFalse(MyJacksonProvider.hasWrittenSome());
         assertFalse(MyGsonProvider.hasWrittenSome());
 
         // try with empty path
@@ -508,75 +482,6 @@ public class HttpClientTest {
         assertEquals(200, response.getStatus());
     }
 
-    @Test
-    public void testHttpAuthClientProps_MixedProviders() throws Exception {
-        final Properties httpProperties = new Properties();
-
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES, "GSON,JACKSON");
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_HOST_SUFFIX, LOCALHOST);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX, "6666");
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_URL_SUFFIX, JUNIT_ECHO);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_HTTPS_SUFFIX, FALSE_STRING);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                        + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true");
-        httpProperties.setProperty(
-                        PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_GSON
-                                        + PolicyEndPointProperties.PROPERTY_HTTP_SERIALIZATION_PROVIDER,
-                        MyGsonProvider.class.getName());
-
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_HOST_SUFFIX, LOCALHOST);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX, "6666");
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_URL_SUFFIX, JUNIT_ECHO);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                        + PolicyEndPointProperties.PROPERTY_HTTP_HTTPS_SUFFIX, FALSE_STRING);
-        httpProperties.setProperty(PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                        + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "true");
-        httpProperties.setProperty(
-                        PolicyEndPointProperties.PROPERTY_HTTP_CLIENT_SERVICES + DOT_JACKSON
-                                        + PolicyEndPointProperties.PROPERTY_HTTP_SERIALIZATION_PROVIDER,
-                        MyJacksonProvider.class.getName());
-
-        final List<HttpClient> clients = HttpClientFactoryInstance.getClientFactory().build(httpProperties);
-        assertEquals(2, clients.size());
-
-        Entity<MyEntity> entity = Entity.entity(new MyEntity(MY_VALUE), MediaType.APPLICATION_JSON);
-
-        // use gson client
-        MyGsonProvider.resetSome();
-        MyJacksonProvider.resetSome();
-        HttpClient client = HttpClientFactoryInstance.getClientFactory().get("GSON");
-
-        Response response = client.put(HELLO, entity, Collections.emptyMap());
-        String body = HttpClient.getBody(response, String.class);
-
-        assertEquals(200, response.getStatus());
-        assertEquals(PUT_HELLO, body);
-
-        assertTrue(MyGsonProvider.hasWrittenSome());
-        assertFalse(MyJacksonProvider.hasWrittenSome());
-
-        // use jackson client
-        MyGsonProvider.resetSome();
-        MyJacksonProvider.resetSome();
-        client = HttpClientFactoryInstance.getClientFactory().get("JACKSON");
-
-        response = client.put(HELLO, entity, Collections.emptyMap());
-        body = HttpClient.getBody(response, String.class);
-
-        assertEquals(200, response.getStatus());
-        assertEquals(PUT_HELLO, body);
-
-        assertTrue(MyJacksonProvider.hasWrittenSome());
-        assertFalse(MyGsonProvider.hasWrittenSome());
-    }
-
     private HttpClient getAuthHttpClient() throws HttpClientConfigException {
         return HttpClientFactoryInstance.getClientFactory()
                         .build(BusTopicParams.builder().clientName(TEST_HTTP_AUTH_CLIENT).useHttps(true)