http: Move api.client.testing.json to avoid package collision

googleapis · Apr 22, 2013 · 0ec278c · 0ec278c
1 parent 0bfcee1
commit 0ec278c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 8 deletions.
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
@@ -8,8 +8,8 @@
   <!-- Don't check Base64.java because it was copied from anther project. -->
   <suppress checks="." files="Base64.java"/>
 
-  <!-- Don't check JavaDoc on tests in com.google.api.testing.json. -->
-  <suppress checks="JavadocType" files="com/google/api/client/testing/json/.*Test.java"/>
+  <!-- Don't check JavaDoc on tests in com.google.api.test.json. -->
+  <suppress checks="JavadocType" files="com/google/api/client/test/json/.*Test.java"/>
 
   <!-- Don't check JavaDoc on package-info. -->
   <suppress checks="JavadocStyleCheck" files="package-info.java"/>

diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
@@ -122,4 +122,8 @@
     <differenceType>8001</differenceType>
     <className>com/google/api/client/http/MultipartRelatedContent</className>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/api/client/testing/json/**</className>
+  </difference>
 </differences>
diff --git a/...t/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java b/...t/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java
@@ -14,7 +14,7 @@
 package com.google.api.client.extensions.android.json;
 
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.testing.json.AbstractJsonFactoryTest;
+import com.google.api.client.test.json.AbstractJsonFactoryTest;
 
 import java.util.ArrayList;
 

diff --git a/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java b/google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.testing.json.AbstractJsonFactoryTest;
+import com.google.api.client.test.json.AbstractJsonFactoryTest;
 import com.google.common.base.Charsets;
 
 import java.io.ByteArrayInputStream;

diff --git a/...p-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java b/...p-client-jackson/src/test/java/com/google/api/client/json/jackson/JacksonFactoryTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.testing.json.AbstractJsonFactoryTest;
+import com.google.api.client.test.json.AbstractJsonFactoryTest;
 import com.google.api.client.util.StringUtils;
 import com.google.common.base.Charsets;
 

diff --git a/...client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java b/...client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.testing.json.AbstractJsonFactoryTest;
+import com.google.api.client.test.json.AbstractJsonFactoryTest;
 import com.google.api.client.util.StringUtils;
 import com.google.common.base.Charsets;
 

diff --git a/...testing/json/AbstractJsonFactoryTest.java → ...nt/test/json/AbstractJsonFactoryTest.java b/...testing/json/AbstractJsonFactoryTest.java → ...nt/test/json/AbstractJsonFactoryTest.java
@@ -12,7 +12,7 @@
  * the License.
  */
 
-package com.google.api.client.testing.json;
+package com.google.api.client.test.json;
 
 import com.google.api.client.http.json.JsonHttpContent;
 import com.google.api.client.json.GenericJson;

diff --git a/...api/client/testing/json/package-info.java → ...le/api/client/test/json/package-info.java b/...api/client/testing/json/package-info.java → ...le/api/client/test/json/package-info.java
@@ -18,5 +18,5 @@
  * @author Ravi Mistry
  */
 
-package com.google.api.client.testing.json;
+package com.google.api.client.test.json;