MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Javafx: Fix test for deployment Ant task (IDEA-104030)

Browse Source
This commit is contained in:
Pavel Dolgov
2016-04-18 13:31:02 +03:00
parent 0d401dad0e
commit bd23296da3
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java
+5 -8
View File
@@ -279,7 +279,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
"</fx:fileset>\n" +
"<fx:application id=\"jarDeploySigned_id\" name=\"jarDeploySigned\" mainClass=\"Main\">\n" +
"</fx:application>\n" +
"<fx:jar destfile=\"temp" + File.separator + "jarDeploySigned.jar\">\n" +
"<fx:jar destfile=\"temp" + "/" + "jarDeploySigned.jar\">\n" +
"<fx:application refid=\"jarDeploySigned_id\">\n" +
"</fx:application>\n" +
"<fileset dir=\"temp\" excludes=\"**/*.jar\">\n" +
@@ -289,7 +289,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
"</fx:fileset>\n" +
"</fx:resources>\n" +
"</fx:jar>\n" +
"<fx:deploy width=\"800\" height=\"400\" updatemode=\"background\" outdir=\"temp" + File.separator + "deploy\" outfile=\"jarDeploySigned\">\n" +
"<fx:deploy width=\"800\" height=\"400\" updatemode=\"background\" outdir=\"temp" + "/" + "deploy\" outfile=\"jarDeploySigned\">\n" +
"<fx:permissions elevated=\"true\">\n" +
"</fx:permissions>\n" +
"<fx:application refid=\"jarDeploySigned_id\">\n" +
@@ -346,7 +346,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
private void doTest(final String expected, Map<String, String> options) {
final String artifactName = getTestName(true);
final String artifactFileName = artifactName + ".jar";
final MockJavaFxPackager packager = new MockJavaFxPackager(artifactName + File.separator + artifactFileName);
final MockJavaFxPackager packager = new MockJavaFxPackager(artifactName + "/" + artifactFileName);
final String title = options.get(TITLE);
if (title != null) {
@@ -394,15 +394,12 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
}
final List<JavaFxAntGenerator.SimpleTag> temp = JavaFxAntGenerator
.createJarAndDeployTasks(packager, artifactFileName, artifactName, "temp", "temp" + File.separator + "deploy", relativeToBaseDirPath);
.createJarAndDeployTasks(packager, artifactFileName, artifactName, "temp", "temp" + "/" + "deploy", relativeToBaseDirPath);
final StringBuilder buf = new StringBuilder();
for (JavaFxAntGenerator.SimpleTag tag : temp) {
tag.generate(buf);
}
assertEquals(expected
.replaceAll("temp/deploy", "temp\\" + File.separator + "deploy")
.replaceAll("temp/" + artifactFileName, "temp\\" + File.separator + artifactFileName),
buf.toString());
assertEquals(expected, buf.toString());
}
private static class MockJavaFxPackager extends AbstractJavaFxPackager {