refactor: Delete and rearrange files as necessary

Author: lpatino10

src/test/java/com/ibm/cloud/sdk/core/test/WatsonServiceUnitTest.java renamed to src/test/java/com/ibm/cloud/sdk/core/test/BaseServiceUnitTest.java

@@ -1,35 +1,18 @@
-/**
- * Copyright 2017 IBM Corp. 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.
- */
-package com.ibm.cloud.sdk.core.test;
-
-import java.io.IOException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.junit.After;
+package com.ibm.cloud.sdk.core.test.service;
 
 import com.google.gson.Gson;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
-
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
 
-/**
- * Utility class to Mock the Watson Services.
- *
- */
-public abstract class WatsonServiceUnitTest extends WatsonServiceTest {
+import java.io.IOException;
 
+import static com.ibm.cloud.sdk.core.http.HttpHeaders.CONTENT_TYPE;
+
+public class BaseServiceUnitTest {
   /** The Constant DELETE. */
   protected static final String DELETE = "DELETE";
 
@@ -86,5 +69,4 @@ protected String getMockWebServerUrl() {
   protected static MockResponse jsonResponse(Object body) {
     return new MockResponse().addHeader(CONTENT_TYPE, HttpMediaType.APPLICATION_JSON).setBody(GSON.toJson(body));
   }
-
 }

src/test/java/com/ibm/cloud/sdk/core/test/TestUtils.java

@@ -0,0 +1,94 @@
+/**
+ * Copyright 2017 IBM Corp. 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.
+ */
+package com.ibm.cloud.sdk.core.test.util;
+
+import com.ibm.cloud.sdk.core.util.GsonSingleton;
+import org.junit.Ignore;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+/**
+ * The Class TestUtils.
+ */
+@Ignore
+public final class TestUtils {
+  /** The Constant DELETE. */
+  protected static final String DELETE = "DELETE";
+
+  /** The Constant GET. */
+  protected static final String GET = "GET";
+
+  /** The Constant POST. */
+  protected static final String POST = "POST";
+
+  /** The Constant PUT. */
+  protected static final String PUT = "PUT";
+
+  /**
+   * Private constructor.
+   */
+  private TestUtils() { }
+
+  /**
+   * Gets the string from input stream.
+   *
+   * @param is the input stream
+   * @return the string from input stream
+   */
+  static String getStringFromInputStream(InputStream is) {
+    BufferedReader br = null;
+    final StringBuilder sb = new StringBuilder();
+
+    String line;
+    try {
+
+      br = new BufferedReader(new InputStreamReader(is));
+      while ((line = br.readLine()) != null) {
+        sb.append(line);
+      }
+
+    } catch (final IOException e) {
+      e.printStackTrace();
+    } finally {
+      if (br != null) {
+        try {
+          br.close();
+        } catch (final IOException e) {
+          e.printStackTrace();
+        }
+      }
+    }
+
+    return sb.toString();
+
+  }
+
+  /**
+   * Loads fixture.
+   *
+   * @param <T> the return type
+   * @param filename the file name
+   * @param returnType the return type
+   * @return the t
+   * @throws FileNotFoundException the file not found exception
+   */
+  public static <T> T loadFixture(String filename, Class<T> returnType) throws FileNotFoundException {
+    String jsonString = getStringFromInputStream(new FileInputStream(filename));
+    return GsonSingleton.getGsonWithoutPrettyPrinting().fromJson(jsonString, returnType);
+  }
+}