Reverting r499.

gson/src/test/java/com/google/gson/ExposeAnnotationBasedExclusionStrategyTest.java

@@ -54,7 +54,7 @@ public class ExposeAnnotationBasedExclusionStrategyTest extends TestCase {
   @SuppressWarnings("unused")
   private static class MockObject {
     @Expose
-    private final int exposedField = 0;
+    public final int exposedField = 0;
-    private final int hiddenField = 0;
+    public final int hiddenField = 0;
   }
 }

gson/src/test/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicyTest.java

@@ -56,6 +56,6 @@ public class SerializedNameAnnotationInterceptingNamingPolicyTest extends TestCa
   @SuppressWarnings("unused")
   private static class SomeObject {
     @SerializedName(ANNOTATED_FIELD_NAME) public final int fieldWithAnnotation = 1;
-    private final int fieldWithoutAnnotation = 1;
+    public final int fieldWithoutAnnotation = 1;
   }
 }

gson/src/test/java/com/google/gson/TypeInfoFactoryTest.java

@@ -229,25 +229,25 @@ public class TypeInfoFactoryTest extends TestCase {
       TEST_1, TEST_2;
     }
 
-    private String simpleField;
+    public String simpleField;
-    private TestEnum enumField;
+    public TestEnum enumField;
-    private List<String> simpleParameterizedType;
+    public List<String> simpleParameterizedType;
-    private List<List<String>> simpleNestedParameterizedType;
+    public List<List<String>> simpleNestedParameterizedType;
-    private List<String>[] simpleGenericArray;
+    public List<String>[] simpleGenericArray;
 
-    private T typeVariableObj;
+    public T typeVariableObj;
-    private T[] typeVariableArray;
+    public T[] typeVariableArray;
-    private T[][][] mutliDimensionalTypeVariableArray;
+    public T[][][] mutliDimensionalTypeVariableArray;
-    private List<T> listOfTypeVariables;
+    public List<T> listOfTypeVariables;
-    private List<List<T>> listOfListsOfTypeVariables;
+    public List<List<T>> listOfListsOfTypeVariables;
-    private List<T>[] listOfTypeVariablesArray;
+    public List<T>[] listOfTypeVariablesArray;
 
-    private List<?> listWithWildcard;
+    public List<?> listWithWildcard;
-    private List<?>[] arrayOfListWithWildcard;
+    public List<?>[] arrayOfListWithWildcard;
-    private List<? extends String> listWithStringWildcard;
+    public List<? extends String> listWithStringWildcard;
-    private List<? extends String>[] arrayOfListWithStringWildcard;
+    public List<? extends String>[] arrayOfListWithStringWildcard;
 
-    private List<? extends T> listWithTypeVariableWildcard;
+    public List<? extends T> listWithTypeVariableWildcard;
-    private List<? extends T>[] arrayOfListWithTypeVariableWildcard;
+    public List<? extends T>[] arrayOfListWithTypeVariableWildcard;
   }
 }

gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java

@@ -69,6 +69,6 @@ public class VersionExclusionStrategyTest extends TestCase {
 
     @SuppressWarnings("unused")
     @Since(VERSION)
-    private final int someField = 0;
+    public final int someField = 0;
   }
 }

gson/src/test/java/com/google/gson/functional/CollectionTest.java

@@ -285,7 +285,7 @@ public class CollectionTest extends TestCase {
 
     // For use by Gson
     @SuppressWarnings({ "unchecked", "unused" })
-    private ObjectWithWildcardCollection() {
+    public ObjectWithWildcardCollection() {
       this(Collections.EMPTY_LIST);
     }
     

gson/src/test/java/com/google/gson/functional/ConcurrencyTest.java

@@ -123,9 +123,9 @@ public class ConcurrencyTest extends TestCase {
   
   @SuppressWarnings("unused")
   private static class MyObject {
-    private String a;
+    String a;
-    private String b;
+    String b;
-    private int i;
+    int i;
 
     MyObject() {
       this("hello", "world", 42);

gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java

@@ -170,7 +170,7 @@ public class CustomTypeAdaptersTest extends TestCase {
   
   private static class Derived extends Base {
     @SuppressWarnings("unused")
-    private int derivedValue = 3;
+    int derivedValue = 3;
   }
   
   

gson/src/test/java/com/google/gson/functional/JsonTreeTest.java

@@ -76,7 +76,7 @@ public class JsonTreeTest extends TestCase {
   
   private static class SubTypeOfBagOfPrimitives extends BagOfPrimitives {
     @SuppressWarnings("unused")
-    private float f = 1.2F;
+    float f = 1.2F;
     public SubTypeOfBagOfPrimitives(long l, int i, boolean b, String string, float f) {
       super(l, i, b, string);
       this.f = f;

gson/src/test/java/com/google/gson/functional/MapTest.java

@@ -173,7 +173,7 @@ public class MapTest extends TestCase {
     private static final long serialVersionUID = 1L;
 
     @SuppressWarnings("unused")
-    private int foo = 10;
+    int foo = 10;
   }
   
   public void testMapSubclassSerialization() {
@@ -250,7 +250,7 @@ public class MapTest extends TestCase {
     private static final long serialVersionUID = 1L;
 
     @SuppressWarnings("unused")
-    private int foo = 10;
+    int foo = 10;
   }
   
   /**

gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java

@@ -84,8 +84,8 @@ public class NamingPolicyTest extends TestCase {
 
   @SuppressWarnings("unused")
   private static class ClassWithDuplicateFields {
-    private Integer a;
+    public Integer a;
-    @SerializedName("a") private Double b;
+    @SerializedName("a") public Double b;
     
     public ClassWithDuplicateFields(Integer a) {
       this(a, null);

gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java

@@ -153,9 +153,9 @@ public class NullObjectAndFieldTest extends TestCase {
 
   @SuppressWarnings("unused")
   private static class ClassWithMembers {
-    private String str;
+    String str;
-    private int[] array;
+    int[] array;
-    private Collection<String> col;
+    Collection<String> col;
   }
   
   private static class ClassWithObjectsSerializer implements JsonSerializer<ClassWithObjects> {

gson/src/test/java/com/google/gson/functional/ObjectTest.java

@@ -367,7 +367,7 @@ public class ObjectTest extends TestCase {
 
   private static class ClassWithObjectField {
     @SuppressWarnings("unused")
-    private Object member;
+    Object member;
   }
   
   public void testInnerClassSerialization() {    
@@ -393,7 +393,7 @@ public class ObjectTest extends TestCase {
    
   private static class Parent {
     @SuppressWarnings("unused")
-    private int value1 = 1;
+    int value1 = 1;
     private class Child {
       int value2 = 2;
     }

gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java

@@ -466,11 +466,11 @@ public class ParameterizedTypesTest extends TestCase {
   // Begin: tests to reproduce issue 103
   private static class Quantity {
     @SuppressWarnings("unused")
-    private int q = 10;
+    int q = 10;
   }
   private static class MyQuantity extends Quantity {
     @SuppressWarnings("unused")
-    private int q2 = 20;
+    int q2 = 20;
   }
   private interface Measurable<T> {    
   }