Merge pull request #167 from vimeo/java-integration-tests

Using PODAM to run some integration tests on type adapter output
vimeo · Oct 25, 2018 · 64ed936 · 64ed936
2 parents 2650e32 + d3e53be
commit 64ed936
Show file tree

Hide file tree

Showing 84 changed files with 309 additions and 97 deletions.
diff --git a/...-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java b/...-test-android/src/test/java/com/vimeo/integration_test_android/ClassWithMapTypesTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ClassWithMapTypes.class);
     }
 
-}
+}
diff --git a/...oid/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java b/...oid/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassExtendedTest.java
@@ -2,11 +2,13 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 public class ComplexGenericClassExtendedTest {
 
     @Test
     public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ComplexGenericClassExtended.class);
     }
 
-}
+}
diff --git a/...est-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java b/...est-android/src/test/java/com/vimeo/integration_test_android/ComplexGenericClassTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Created by restainoa on 2/2/17.
  */
@@ -12,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ComplexGenericClass.class);
     }
 
-}
+}
diff --git a/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java b/integration-test-android/src/test/java/com/vimeo/integration_test_android/TestModelTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link TestModel}.
  */
@@ -11,4 +13,4 @@ public class TestModelTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(TestModel.class);
     }
-}
+}
diff --git a/...roid/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java b/...roid/src/test/java/com/vimeo/integration_test_android/UnserializablePlatformTypeTest.java
@@ -2,6 +2,8 @@
 
 import org.junit.Test;
 
+import verification.Utils;
+
 /**
  * Unit tests for {@link UnserializablePlatformType}.
  */
@@ -11,4 +13,4 @@ public class UnserializablePlatformTypeTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(UnserializablePlatformType.class);
     }
-}
+}
diff --git a/...vimeo/integration_test_android/Utils.java → ...oid/src/test/java/verification/Utils.java b/...vimeo/integration_test_android/Utils.java → ...oid/src/test/java/verification/Utils.java
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.vimeo.integration_test_android;
+package verification;
 
 import com.google.gson.Gson;
 import com.google.gson.TypeAdapter;

diff --git a/...tion-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java b/...tion-test-java-cross-module/src/test/java/com/vimeo/sample/model/AccessModifiersTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/...on-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java b/...on-test-java-cross-module/src/test/java/com/vimeo/sample/model/AnnotationExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java b/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithArrayTypesTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/...-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java b/...-java-cross-module/src/test/java/com/vimeo/sample/model/ClassWithNestedInterfaceTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -18,4 +18,4 @@ public void typeAdapterWasNotGenerated_AvailabilityIntentDef() throws Exception
     public void typeAdapterWasGenerated_ClassWithNestedInterface() throws Exception {
         Utils.verifyTypeAdapterGeneration(ClassWithNestedInterface.class);
     }
-}
+}
diff --git a/...ration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java b/...ration-test-java-cross-module/src/test/java/com/vimeo/sample/model/ConcreteClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/...ration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java b/...ration-test-java-cross-module/src/test/java/com/vimeo/sample/model/DuplicateNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -13,4 +13,4 @@ public class DuplicateNameTest {
     public void verifyTypeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(DuplicateName.class);
     }
-}
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/EnumExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/...va-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java b/...va-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelDerivedExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 import com.vimeo.sample_java_model.BaseExternalModel;
 
 import org.junit.Test;
@@ -22,4 +22,4 @@ public void verifyNoTypeAdapterWasGenerated_BaseExternalModel() throws Exception
         Utils.verifyNoTypeAdapterGeneration(BaseExternalModel.class);
     }
 
-}
+}
diff --git a/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java b/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample1Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample1.class);
     }
 
-}
+}
diff --git a/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java b/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample2Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample2.class);
     }
 
-}
+}
diff --git a/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java b/...est-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExample3Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample3.class);
     }
 
-}
+}
diff --git a/...test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java b/...test-java-cross-module/src/test/java/com/vimeo/sample/model/ExternalModelExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(ExternalModelExample.class);
     }
 
-}
+}
diff --git a/...est-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java b/...est-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionAllExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionAllExample.class);
     }
 
-}
+}
diff --git a/...st-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java b/...st-java-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionNoneExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionNoneExample.class);
     }
 
-}
+}
diff --git a/...va-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java b/...va-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName2Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName2.class);
     }
 
-}
+}
diff --git a/...va-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java b/...va-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedName3Test.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName3.class);
     }
 
-}
+}
diff --git a/...ava-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java b/...ava-cross-module/src/test/java/com/vimeo/sample/model/FieldOptionsSerializedNameTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(FieldOptionsSerializedName.class);
     }
 
-}
+}
diff --git a/...gration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java b/...gration-test-java-cross-module/src/test/java/com/vimeo/sample/model/GenericClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(GenericClass.class);
     }
 
-}
+}
diff --git a/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java b/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/IdenticalFieldTypesTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(IdenticalFieldTypes.class);
     }
 
-}
+}
diff --git a/...-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java b/...-java-cross-module/src/test/java/com/vimeo/sample/model/KnownTypeAdaptersExampleTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -14,4 +14,4 @@ public void typeAdapterWasGenerated() throws Exception {
         Utils.verifyTypeAdapterGeneration(KnownTypeAdaptersExample.class);
     }
 
-}
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedClassTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 

diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedEnumTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -21,4 +21,4 @@ public void typeAdapterWasGenerated_NestedEnum_NestedWithAnnotation() throws Exc
         Utils.verifyTypeAdapterGeneration(NestedEnum.NestedWithAnnotation.class);
     }
 
-}
+}
diff --git a/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java b/integration-test-java-cross-module/src/test/java/com/vimeo/sample/model/NestedModelTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;
 
@@ -19,4 +19,4 @@ public void typeAdapterWasGenerated_NestedModel_NestedEnum() throws Exception {
         Utils.verifyTypeAdapterGeneration(NestedModel.NestedEnum.class);
     }
 
-}
+}
diff --git a/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java b/...-test-java-cross-module/src/test/java/com/vimeo/sample/model/NoUseStagAnnotationTest.java
@@ -1,6 +1,6 @@
 package com.vimeo.sample.model;
 
-import com.vimeo.sample.Utils;
+import verification.Utils;
 
 import org.junit.Test;