diff --git a/jsonschema2pojo-integration-tests/pom.xml b/jsonschema2pojo-integration-tests/pom.xml index 32f7c963d..5854007d0 100644 --- a/jsonschema2pojo-integration-tests/pom.xml +++ b/jsonschema2pojo-integration-tests/pom.xml @@ -208,4 +208,26 @@ + + + ignore-android + + [1.9,) + + + + + + maven-surefire-plugin + + + org.jsonschema2pojo.integration.config.ParcelableIT + + + + + + + + diff --git a/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java b/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java index 0839e5080..3d69eec32 100644 --- a/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java +++ b/jsonschema2pojo-integration-tests/src/test/java/org/jsonschema2pojo/integration/config/ParcelableIT.java @@ -20,7 +20,6 @@ import static org.hamcrest.Matchers.*; import static org.jsonschema2pojo.integration.util.CodeGenerationHelper.*; import static org.jsonschema2pojo.integration.util.ParcelUtils.*; -import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.IOException; @@ -45,13 +44,10 @@ @Config(manifest=Config.NONE, sdk=23) public class ParcelableIT { - private static final boolean JAVA_8_OR_EARLIER = System.getProperty("java.specification.version").compareTo("1.9") < 0; - @Rule public Jsonschema2PojoRule schemaRule = new Jsonschema2PojoRule(); @Test public void parcelableTreeIsParcelable() throws ClassNotFoundException, IOException { - assumeTrue(JAVA_8_OR_EARLIER); Class parcelableType = schemaRule.generateAndCompile("/schema/parcelable/parcelable-schema.json", "com.example", config("parcelable", true)) .loadClass("com.example.ParcelableSchema"); @@ -66,7 +62,6 @@ public void parcelableTreeIsParcelable() throws ClassNotFoundException, IOExcept @Test public void parcelableTypeDoesNotHaveAnyDuplicateImports() throws ClassNotFoundException, IOException { - assumeTrue(JAVA_8_OR_EARLIER); schemaRule.generate("/schema/parcelable/parcelable-schema.json", "com.example", config("parcelable", true)); File generated = schemaRule.generated("com/example/ParcelableSchema.java"); String content = FileUtils.readFileToString(generated); @@ -80,7 +75,6 @@ public void parcelableTypeDoesNotHaveAnyDuplicateImports() throws ClassNotFoundE @Test public void parcelableSuperclassIsUnparceled() throws ClassNotFoundException, IOException { - assumeTrue(JAVA_8_OR_EARLIER); // Explicitly set includeConstructors to false if default value changes in the future Class parcelableType = schemaRule.generateAndCompile("/schema/parcelable/parcelable-superclass-schema.json", "com.example", config("parcelable", true, "includeConstructors", false)) @@ -95,7 +89,6 @@ public void parcelableSuperclassIsUnparceled() throws ClassNotFoundException, IO @Test public void parcelableDefaultConstructorDoesNotConflict() throws ClassNotFoundException, IOException { - assumeTrue(JAVA_8_OR_EARLIER); Class parcelableType = schemaRule.generateAndCompile("/schema/parcelable/parcelable-superclass-schema.json", "com.example", config("parcelable", true, "includeConstructors", true)) .loadClass("com.example.ParcelableSuperclassSchema"); diff --git a/pom.xml b/pom.xml index cf81568ca..97a3b07b5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 @@ -311,6 +312,20 @@ 3.26.0 + + + + + maven-surefire-plugin + + + org.jsonschema2pojo.integration.config.ParcelableIT + + + + + + jdk11 @@ -548,10 +563,10 @@ test - org.robolectric - robolectric - ${robolectric.version} - test + org.robolectric + robolectric + ${robolectric.version} + test org.skyscreamer