initial functional test of wilma-mock API (#46)

+ tuning on localhost blocking func test
epam · Jul 18, 2015 · e8ca160 · e8ca160
1 parent 918096a
commit e8ca160
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/wilma-functionaltest/build.gradle b/wilma-functionaltest/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     compile "com.epam.gepard:gepard-core:4.0.35"
     compile 'commons-httpclient:commons-httpclient:3.1'
     compile 'org.custommonkey.xmlunit:com.springsource.org.custommonkey.xmlunit:1.2.0'
-    compile 'org.apache.commons:commons-io:1.3.2'
+    compile 'commons-io:commons-io:2.4'
     compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
     compile 'com.sun.xml.fastinfoset:FastInfoset:1.2.13'
     compile "com.epam.wilma:wilma-mock:$version"

diff --git a/...tionaltest/src/main/java/com/epam/wilma/gepard/test/localhost/BlockLocalhostUsageTest.txt b/...tionaltest/src/main/java/com/epam/wilma/gepard/test/localhost/BlockLocalhostUsageTest.txt
@@ -1,2 +1,2 @@
 localhost blocking on && proxy mode and localhost request%http://127.0.0.1:1234/config/public/version%on%proxy%404
-localhost blocking on && proxy mode and non-localhost request%http://192.168.1.22:1234/config/public/version%on%proxy%200
+localhost blocking on && proxy mode and non-localhost request%http://127.0.1.1:1234/config/public/version%on%proxy%200
diff --git a/wilma-functionaltest/src/main/java/com/epam/wilma/gepard/test/mock/WilmaMockTest.java b/wilma-functionaltest/src/main/java/com/epam/wilma/gepard/test/mock/WilmaMockTest.java
@@ -26,18 +26,18 @@ public void prepareWilmaMockInstance() {
     }
 
     @Test
-    public void getWilmaVersionViaMock() {
+    public void getWilmaVersionViaAPI() {
         JSONObject o = wilmaMock.getVersionInformation();
         Assert.assertNotNull(o);
         String version = o.getString("wilmaVersion");
         logComment("Wilma version detected: " + version);
     }
 
     @Test
-    public void getWilmaLoadInformationViaMock() {
+    public void getWilmaLoadInformationViaAPI() {
         JSONObject o = wilmaMock.getActualLoadInformation();
         Assert.assertNotNull(o);
-        String loggerQueueSize = o.getString("loggerQueueSize");
+        Integer loggerQueueSize = (Integer) o.get("loggerQueueSize");
         logComment("Wilma Logger Queue size is: " + loggerQueueSize);
     }
 

diff --git a/wilma-mock/src/main/java/com/epam/wilma/mock/http/WilmaHttpClient.java b/wilma-mock/src/main/java/com/epam/wilma/mock/http/WilmaHttpClient.java
@@ -21,6 +21,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
@@ -30,6 +31,7 @@
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
 import org.apache.commons.httpclient.methods.multipart.Part;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -62,7 +64,8 @@ public Optional<String> sendGetterRequest(String url) {
         try {
             int statusCode = httpclient.executeMethod(method);
             if (HttpStatus.SC_OK == statusCode) {
-                response = method.getResponseBodyAsString();
+                InputStream inputResponse = method.getResponseBodyAsStream();
+                response = IOUtils.toString(inputResponse, "UTF-8");
             }
         } catch (HttpException e) {
             LOG.error("Protocol exception occurred when called: " + url, e);