Repository: cayenne Updated Branches: refs/heads/master 35f3de0d9 -> c1334ad16
CAY-2301 Cayenne Gradle Plugin Fix tests: correct decoding for file names in resources Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c1334ad1 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c1334ad1 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c1334ad1 Branch: refs/heads/master Commit: c1334ad16757c4dc40c582fe62b134541de3fdf0 Parents: 35f3de0 Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue May 30 13:22:27 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue May 30 13:22:27 2017 +0300 ---------------------------------------------------------------------- cayenne-gradle-plugin/pom.xml | 1 - .../src/test/java/org/apache/cayenne/tools/BaseTaskIT.java | 5 ++--- .../src/test/java/org/apache/cayenne/tools/CgenTaskIT.java | 5 +++-- .../test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java | 5 +++-- .../src/test/java/org/apache/cayenne/tools/DbImportIT.java | 4 +++- .../src/test/java/org/apache/cayenne/tools/GradlePluginIT.java | 3 ++- 6 files changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml index 66163f5..e4d5b99 100644 --- a/cayenne-gradle-plugin/pom.xml +++ b/cayenne-gradle-plugin/pom.xml @@ -82,7 +82,6 @@ <argument>clean</argument> <argument>${gradle.task}</argument> <argument>-PprojectVersion=${project.version}</argument> - <argument>--info</argument> </arguments> </configuration> <goals> http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java index 758f8f8..d73f4f0 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/BaseTaskIT.java @@ -21,6 +21,7 @@ package org.apache.cayenne.tools; import java.io.File; import java.io.IOException; +import java.net.URLDecoder; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; @@ -55,17 +56,15 @@ public class BaseTaskIT { List<String> gradleArguments = new ArrayList<>(); gradleArguments.addAll(Arrays.asList(args)); gradleArguments.add("--stacktrace"); - gradleArguments.add("--info"); return GradleRunner.create() - .forwardOutput() .withProjectDir(projectDir) .withPluginClasspath() .withArguments(gradleArguments); } private void prepareBuildScript(String name) throws IOException { - String projectFileSrc = getClass().getResource(name + ".gradle").getFile(); + String projectFileSrc = URLDecoder.decode(getClass().getResource(name + ".gradle").getFile(), "UTF-8"); Path src = FileSystems.getDefault().getPath(projectFileSrc); Path dst = FileSystems.getDefault().getPath(projectDir.getAbsolutePath(), "build.gradle"); Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING); http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java index 0210c3a..132320c 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskIT.java @@ -26,6 +26,7 @@ import org.junit.Test; import java.io.File; +import java.net.URLDecoder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -41,7 +42,7 @@ public class CgenTaskIT extends BaseTaskIT { GradleRunner runner = createRunner( "cgen_default_config", "cgen", - "-PdataMap=" + getClass().getResource("test_datamap.map.xml").getFile() + "-PdataMap=" + URLDecoder.decode(getClass().getResource("test_datamap.map.xml").getFile(), "UTF-8") ); BuildResult result = runner.forwardOutput().build(); @@ -64,7 +65,7 @@ public class CgenTaskIT extends BaseTaskIT { GradleRunner runner = createRunner( "cgen_custom_config", "cgen", - "-PdataMap=" + getClass().getResource("test_datamap.map.xml").getFile() + "-PdataMap=" + URLDecoder.decode(getClass().getResource("test_datamap.map.xml").getFile(), "UTF-8") ); BuildResult result = runner.build(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java index da00470..daae050 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbGenerateTaskIT.java @@ -20,6 +20,7 @@ package org.apache.cayenne.tools; import java.io.IOException; +import java.net.URLDecoder; import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; @@ -57,7 +58,7 @@ public class DbGenerateTaskIT extends BaseTaskIT { "cdbgen_simple", "cdbgen", "-PdbUrl=" + dbUrl, - "-PdataMap=" + getClass().getResource("test_datamap.map.xml").getFile(), + "-PdataMap=" + URLDecoder.decode(getClass().getResource("test_datamap.map.xml").getFile(), "UTF-8"), "--info" ); @@ -83,7 +84,7 @@ public class DbGenerateTaskIT extends BaseTaskIT { GradleRunner runner = createRunner( "cdbgen_custom", "customCdbgen", - "-PdataMap=" + getClass().getResource("test_datamap.map.xml").getFile(), + "-PdataMap=" + URLDecoder.decode(getClass().getResource("test_datamap.map.xml").getFile(), "UTF-8"), "--info" ); http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java index 69f8813..efb12da 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/DbImportIT.java @@ -71,6 +71,9 @@ public class DbImportIT extends BaseTaskIT { @Test public void simpleDbTaskSuccess() throws Exception { String dbUrl = prepareDerbyDatabase("test_map_db"); + File dataMap = new File(projectDir.getAbsolutePath() + "/datamap.map.xml"); + assertFalse(dataMap.exists()); + GradleRunner runner = createRunner("dbimport_simple_db", "cdbimport", "--info", "-PdbUrl=" + dbUrl); BuildResult result = runner.build(); @@ -78,7 +81,6 @@ public class DbImportIT extends BaseTaskIT { assertNotNull(result.task(":cdbimport")); assertEquals(TaskOutcome.SUCCESS, result.task(":cdbimport").getOutcome()); - File dataMap = new File(projectDir.getAbsolutePath() + "/datamap.map.xml"); assertTrue(dataMap.exists()); // Check few lines from reverse engineering output http://git-wip-us.apache.org/repos/asf/cayenne/blob/c1334ad1/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java ---------------------------------------------------------------------- diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java index e6d78a5..ee24e8e 100644 --- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java +++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/GradlePluginIT.java @@ -22,6 +22,7 @@ package org.apache.cayenne.tools; import org.gradle.testkit.runner.GradleRunner; import org.junit.Test; +import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; @@ -41,7 +42,7 @@ public class GradlePluginIT extends BaseTaskIT { GradleRunner runner = createRunner( "cgen_default_config", "cgen", - "-PdataMap=" + getClass().getResource("test_datamap.map.xml").getFile() + "-PdataMap=" + URLDecoder.decode(getClass().getResource("test_datamap.map.xml").getFile(), "UTF-8") ); runner.withGradleVersion(version); runner.build();
