Move JSON tests to the right package

Author: shs96c

Rakefile

@@ -208,6 +208,7 @@ task :test_remote_server => [
    '//java/server/test/org/openqa/selenium/remote/server/log:test:run',
 ]
 task :test_remote => [
+  '//java/client/test/org/openqa/selenium/json:small-tests:run',
   '//java/client/test/org/openqa/selenium/remote:common-tests:run',
   '//java/client/test/org/openqa/selenium/remote:client-tests:run',
   '//java/client/test/org/openqa/selenium/remote:remote-driver-tests:run',
@@ -256,6 +257,7 @@ task :test_java => [
 
 task :test_java_small_tests => [
   "//java/client/test/org/openqa/selenium:small-tests:run",
+  "//java/client/test/org/openqa/selenium/json:small-tests:run",
   "//java/client/test/org/openqa/selenium/support:small-tests:run",
   "//java/client/test/org/openqa/selenium/remote:common-tests:run",
   "//java/client/test/org/openqa/selenium/remote:client-tests:run",

java/client/test/org/openqa/selenium/json/BUCK

@@ -0,0 +1,15 @@
+java_test(name = 'small-tests',
+  srcs = [
+    'BeanToJsonConverterTest.java',
+    'JsonToBeanConverterTest.java',
+  ],
+  deps = [
+    '//java/client/src/org/openqa/selenium:selenium',
+    '//java/client/src/org/openqa/selenium/remote:remote',
+    '//third_party/java/gson:gson',
+    '//third_party/java/guava:guava',
+    '//third_party/java/hamcrest:hamcrest-library',
+    '//third_party/java/httpcomponents:httpclient',
+    '//third_party/java/junit:junit',
+  ],
+)

java/client/test/org/openqa/selenium/remote/BeanToJsonConverterTest.java renamed to java/client/test/org/openqa/selenium/json/BeanToJsonConverterTest.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote;
+package org.openqa.selenium.json;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
@@ -52,6 +52,11 @@
 import org.openqa.selenium.logging.LogEntry;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.LoggingPreferences;
+import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.Command;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.DriverCommand;
+import org.openqa.selenium.remote.SessionId;
 
 import java.awt.*;
 import java.io.StringReader;
@@ -151,7 +156,8 @@ public void testShouldConvertEnumsWithMethods() throws Exception {
 
   @Test
   public void testNullAndAnEmptyStringAreEncodedDifferently() throws Exception {
-    BeanToJsonConverter converter = new BeanToJsonConverter();
+    BeanToJsonConverter
+        converter = new BeanToJsonConverter();
 
     String nullValue = converter.convert(null);
     String emptyString = converter.convert("");

java/client/test/org/openqa/selenium/remote/JsonToBeanConverterTest.java renamed to java/client/test/org/openqa/selenium/json/JsonToBeanConverterTest.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote;
+package org.openqa.selenium.json;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
@@ -34,6 +34,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -44,6 +45,13 @@
 import org.openqa.selenium.Proxy;
 import org.openqa.selenium.logging.LogType;
 import org.openqa.selenium.logging.LoggingPreferences;
+import org.openqa.selenium.remote.CapabilityType;
+import org.openqa.selenium.remote.Command;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.remote.DriverCommand;
+import org.openqa.selenium.remote.ErrorCodes;
+import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.SessionId;
 
 import java.util.Collections;
 import java.util.Date;
@@ -140,7 +148,7 @@ public void testShouldProperlyFillInACapabilitiesObject() throws Exception {
     capabilities.setJavascriptEnabled(true);
     String text = new BeanToJsonConverter().convert(capabilities);
 
-    DesiredCapabilities readCapabilities =
+    Capabilities readCapabilities =
         new JsonToBeanConverter().convert(DesiredCapabilities.class, text);
 
     assertEquals(capabilities, readCapabilities);
@@ -165,16 +173,18 @@ public void testShouldUseAMapToRepresentComplexObjects() throws Exception {
     toModel.addProperty("thing", "hairy");
     toModel.addProperty("hairy", "true");
 
-    Map<?,?> modelled = (Map<?,?>) new JsonToBeanConverter().convert(Object.class,
-                                                                     toModel.toString());
+    Map<?,?> modelled = (Map<?,?>) new JsonToBeanConverter().convert(
+        Object.class,
+        toModel.toString());
     assertEquals(2, modelled.size());
   }
 
   @Test
   public void testShouldConvertAResponseWithAnElementInIt() throws Exception {
     String json =
         "{\"value\":{\"value\":\"\",\"text\":\"\",\"selected\":false,\"enabled\":true,\"id\":\"three\"},\"context\":\"con\",\"sessionId\":\"sess\"}";
-    Response converted = new JsonToBeanConverter().convert(Response.class, json);
+    Response
+        converted = new JsonToBeanConverter().convert(Response.class, json);
 
     Map<?,?> value = (Map<?,?>) converted.getValue();
     assertEquals("three", value.get("id"));
@@ -277,7 +287,7 @@ public void testShouldBeAbleToReconsituteASessionId() throws Exception {
   public void testShouldBeAbleToConvertACommand() throws Exception {
     SessionId sessionId = new SessionId("session id");
     Command original = new Command(sessionId, DriverCommand.NEW_SESSION,
-        new HashMap<String, String>() {
+                                   new HashMap<String, String>() {
           {
             put("food", "cheese");
           }
@@ -387,7 +397,7 @@ public void testShouldRecognizeNumericStatus() {
       .convert(Response.class, "{\"status\":0,\"value\":\"cheese\"}");
 
     assertEquals(0, response.getStatus().intValue());
-    assertEquals(new ErrorCodes().toState(0), response.getState());
+    Assert.assertEquals(new ErrorCodes().toState(0), response.getState());
     String value = (String) response.getValue();
     assertEquals("cheese", value);
   }

java/client/test/org/openqa/selenium/remote/RemoteCommonTests.java

@@ -19,15 +19,15 @@
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.openqa.selenium.json.BeanToJsonConverterTest;
+import org.openqa.selenium.json.JsonToBeanConverterTest;
 import org.openqa.selenium.remote.http.JsonHttpCommandCodecTest;
 import org.openqa.selenium.remote.http.JsonHttpResponseCodecTest;
 import org.openqa.selenium.remote.http.W3CHttpResponseCodecTest;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    BeanToJsonConverterTest.class,
     DesiredCapabilitiesTest.class,
-    JsonToBeanConverterTest.class,
     JsonHttpCommandCodecTest.class,
     JsonHttpResponseCodecTest.class,
     W3CHttpResponseCodecTest.class