Merge "Improve the UT of key flows of the SO"

3 files changed, 197 insertions, 11 deletions

diff --git a/openstack-client/pom.xml b/openstack-client/pom.xml
index 1574a4a..671f257 100644
--- a/openstack-client/pom.xml
+++ b/openstack-client/pom.xml
@@ -1,12 +1,47 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.openecomp.so.libs</groupId>
-		<artifactId>openstack-java-sdk</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
-	<groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
-	<artifactId>openstack-client</artifactId>
-	<name>OpenStack Client</name>
-	<description>OpenStack Client</description>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.openecomp.so.libs</groupId>
+        <artifactId>openstack-java-sdk</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.openecomp.so.libs.openstack-java-sdk</groupId>
+    <artifactId>openstack-client</artifactId>
+    <name>OpenStack Client</name>
+    <description>OpenStack Client</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>test-jar</id>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
\ No newline at end of file
diff --git a/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientMockUtils.java b/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientMockUtils.java
new file mode 100644
index 0000000..8ff2634
--- /dev/null
+++ b/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientMockUtils.java
@@ -0,0 +1,83 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * 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 com.woorea.openstack.base.client;
+
+import org.mockito.MockSettings;
+import org.mockito.Mockito;
+
+public class OpenStackClientMockUtils {
+
+    private static final OpenStackClientMockUtils utils = new OpenStackClientMockUtils();
+
+    private OpenStackClientConnector connector = null;
+
+    public OpenStackClientMockUtils() {
+        connector = Mockito.mock(OpenStackClientConnector.class, Mockito.RETURNS_DEEP_STUBS);
+        mockRequestResponse(String.class, "SUCCESS");
+        mockRequestError(String.class, "SUCCESS");
+    }
+
+    public static OpenStackClientMockUtils getInstance() {
+        return utils;
+    }
+
+    public <T extends OpenStackRequest, R> OpenStackClientMockUtils mockRequestResponse(T request, R response) {
+        Mockito.when(connector.request(Mockito.eq(request)).getEntity(Mockito.eq(request.returnType())))
+                .thenReturn(response);
+
+        return this;
+    }
+
+    public <T> OpenStackClientMockUtils mockRequestResponse(Class<T> returnType, T response) {
+        Mockito.when(connector.request(Mockito.any(OpenStackRequest.class)).getEntity(Mockito.eq(returnType)))
+                .thenReturn(response);
+
+        return this;
+    }
+
+    public <T extends OpenStackRequest, R> OpenStackClientMockUtils mockRequestError(T request, R error) {
+        Mockito.when(connector.request(Mockito.eq(request)).getErrorEntity(Mockito.eq(request.returnType())))
+                .thenReturn(error);
+
+        return this;
+    }
+
+    public <T> OpenStackClientMockUtils mockRequestError(Class<T> returnType, T error) {
+        Mockito.when(connector.request(Mockito.any(OpenStackRequest.class)).getErrorEntity(Mockito.eq(returnType)))
+                .thenReturn(error);
+
+        return this;
+    }
+
+    public <T extends OpenStackRequest> OpenStackClientMockUtils mockRequestThrow(T request, String message, int status) {
+        Mockito.when(connector.request(Mockito.eq(request)))
+                .thenThrow(new OpenStackResponseException(message, status));
+
+        return this;
+    }
+
+    public <T> OpenStackClientMockUtils mockRequestThrow(Class<T> returnType, String message, int status) {
+        Mockito.when(connector.request(Mockito.any(OpenStackRequest.class)).getEntity(Mockito.eq(returnType)))
+                .thenThrow(new OpenStackResponseException(message, status));
+
+        return this;
+    }
+
+    public OpenStackClientConnector getConnector() {
+        return connector;
+    }
+}
diff --git a/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientTest.java b/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientTest.java
new file mode 100644
index 0000000..c4f2941
--- /dev/null
+++ b/openstack-client/src/test/java/com/woorea/openstack/base/client/OpenStackClientTest.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * 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 com.woorea.openstack.base.client;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class OpenStackClientTest {
+
+    private static final String CLIENT_ENDPOINT = "endpoint";
+    private static final String OS_REQUEST_PATH = "openstack_request_path";
+    private static final String SUCCESS = "Success";
+    private static final String TOKEN = "token";
+
+    private OpenStackClient client = null;
+    private OpenStackRequest<String> conflictRequest = new OpenStackRequest<>();
+    private OpenStackRequest<String> notAuthorizedRequest = new OpenStackRequest<>();
+
+    @Before
+    public void setUp() throws Exception {
+        final OpenStackClientConnector clientConnector = mockClientConnector();
+        client = new OpenStackClient(CLIENT_ENDPOINT, clientConnector);
+    }
+
+    private OpenStackClientConnector mockClientConnector() {
+        return OpenStackClientMockUtils.getInstance()
+                .mockRequestResponse(Entity.class, Entity.json(SUCCESS))
+                .mockRequestThrow(notAuthorizedRequest, "Not Authorized", OpenStackResponseStatus.NOT_AUTHORIZED)
+                .mockRequestThrow(conflictRequest, "Conflict", OpenStackResponseStatus.CONFLICT)
+                .getConnector();
+
+    }
+
+    @Test
+    public void execute() {
+        final OpenStackRequest<Entity> request = client.get(OS_REQUEST_PATH, Entity.class);
+        final Entity<String> resp = client.execute(request);
+
+        Assert.assertEquals(SUCCESS, resp.getEntity());
+    }
+
+    @Test(expected = OpenStackResponseException.class)
+    public void executeNotAuthorized() {
+        client.token(TOKEN);
+        client.execute(notAuthorizedRequest);
+    }
+
+    @Test(expected = OpenStackResponseException.class)
+    public void executeConflict() {
+        client.execute(conflictRequest);
+    }
+}
\ No newline at end of file