2 files changed, 1 insertions, 80 deletions
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/http/configuration/CloudHttpClientTest.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/http/configuration/CloudHttpClientTest.java
deleted file mode 100644
index e3e7a1d3..00000000
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/http/configuration/CloudHttpClientTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * DCAEGEN2-SERVICES-SDK
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.http.configuration;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSyntaxException;
-import org.junit.jupiter.api.Test;
-import org.springframework.web.reactive.function.client.WebClient;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-/**
- * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 11/16/18
- */
-class CloudHttpClientTest {
-
-    private static final String SOMEURL = "http://someurl";
-    private static final String DATA = "{}";
-    private Gson gson = new Gson();
-    private WebClient webClient = mock(WebClient.class);
-    private WebClient.RequestHeadersUriSpec requestBodyUriSpec = mock(WebClient.RequestBodyUriSpec.class);
-    private WebClient.ResponseSpec responseSpec = mock(WebClient.ResponseSpec.class);
-
-    @Test
-    void shouldReturnJsonObjectOnGetCall() {
-        //given
-        mockWebClientDependantObject();
-        CloudHttpClient httpGetClient = new CloudHttpClient(webClient);
-        when(responseSpec.bodyToMono(String.class)).thenReturn(Mono.just(DATA));
-
-        //when/then
-        StepVerifier.create(httpGetClient.callHttpGet(SOMEURL, JsonObject.class)).expectSubscription()
-            .expectNext(gson.fromJson(DATA, JsonObject.class)).verifyComplete();
-    }
-
-    @Test
-    void shouldReturnMonoErrorOnGetCall() {
-        //given
-        mockWebClientDependantObject();
-        CloudHttpClient httpGetClient = new CloudHttpClient(webClient);
-        when(responseSpec.bodyToMono(String.class)).thenReturn(Mono.just("some wrong data"));
-
-        //when/then
-        StepVerifier.create(httpGetClient.callHttpGet(SOMEURL, JsonObject.class)).expectSubscription()
-            .expectError(JsonSyntaxException.class).verify();
-    }
-
-
-    private void mockWebClientDependantObject() {
-        doReturn(requestBodyUriSpec).when(webClient).get();
-        when(requestBodyUriSpec.uri(SOMEURL)).thenReturn(requestBodyUriSpec);
-        doReturn(responseSpec).when(requestBodyUriSpec).retrieve();
-        doReturn(responseSpec).when(responseSpec).onStatus(any(), any());
-        doReturn(responseSpec).when(responseSpec).onStatus(any(), any());
-    }
-}
-\ No newline at end of file
diff --git a/rest-services/cbs-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/rest-services/cbs-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 00000000..ca6ee9ce
--- /dev/null
+++ b/rest-services/cbs-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
+\ No newline at end of file