Fix a few plugin tests
git-svn-id: https://svn.apache.org/repos/asf/ant/easyant/plugins/trunk@1559950 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/abstract-test/module.ivy b/abstract-test/module.ivy
index 8eee7ab..0f11d53 100644
--- a/abstract-test/module.ivy
+++ b/abstract-test/module.ivy
@@ -37,7 +37,7 @@
<artifact type="ant" />
</publications>
<dependencies>
- <dependency org="org.apache.ant" name="ant-junit" rev="1.9.1" conf="default->master"/>
- <dependency org="org.apache.ant" name="ant-junit4" rev="1.9.1" conf="default->master"/>
+ <dependency org="org.apache.ant" name="ant-junit" rev="1.9.3" conf="default->master"/>
+ <dependency org="org.apache.ant" name="ant-junit4" rev="1.9.3" conf="default->master"/>
</dependencies>
</ivy-module>
diff --git a/default-version-strategy/src/test/antunit/default-version-strategy-test.xml b/default-version-strategy/src/test/antunit/default-version-strategy-test.xml
index 7d80122..75b222f 100644
--- a/default-version-strategy/src/test/antunit/default-version-strategy-test.xml
+++ b/default-version-strategy/src/test/antunit/default-version-strategy-test.xml
@@ -18,7 +18,7 @@
xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
<!-- Import your plugin -->
- <property name="target" value="target/test-antunit" />
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
@@ -36,8 +36,10 @@
<target name="tearDown" depends="clean" />
<target name="configure-ivy-project">
+ <property name="ivy.local.default.root" value="${target}/local-repo" />
+ <property name="ivy.shared.default.root" value="${target}/shared-repo" />
<property name="project.ivy.file" value="sample-module.ivy" />
- <ivy:settings id="project.ivy.instance" />
+ <ivy:configure settingsId="project.ivy.instance" url="${ivy.default.settings.dir}/ivysettings.xml"/>
<ivy:info file="sample-module.ivy" settingsRef="project.ivy.instance" />
</target>
<target name="test-default-version-strategy:init" depends="default-version-strategy:init">
@@ -62,4 +64,4 @@
<target name="test-default-version-strategy:release" depends="default-version-strategy:release">
<au:assertPropertyEquals name="version" value="${ivy.revision}" />
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant b/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
index 184df7a..665c524 100644
--- a/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
+++ b/easyant-plugin-publication/src/main/resources/easyant-plugin-publication.ant
@@ -30,9 +30,9 @@
-->
<target name="easyant-plugin-publication:before-test" depends="abstract-provisioning:provisioning"
extensionOf="abstract-test:test-ready" if="publish.plugin.before.test">
- <ea:configure-build-scoped-repository buildScopedRepositoryName="build"
+ <ea:configure-build-scoped-repository name="build"
settingsRef="easyant.ivy.instance" />
<ivy:publish artifactspattern="${target.artifacts}/[artifact](-[classifier]).[ext]" resolver="build"
forcedeliver="true" overwrite="true" settingsRef="easyant.ivy.instance" />
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml b/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml
index 346233f..b51725b 100644
--- a/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml
+++ b/ivy-repo-management/src/test/antunit/ivy-repo-management-test.xml
@@ -35,7 +35,7 @@
<target name="setUp" depends="clean">
<property name="ivy.local.default.root" value="${target}/local-repo" />
<property name="ivy.shared.default.root" value="${target}/shared-repo" />
- <ivy:settings id="project.ivy.instance" />
+ <ivy:configure settingsId="project.ivy.instance" url="${ivy.default.settings.dir}/ivysettings.xml"/>
<property name="install.interactive.mode" value="false" />
</target>
<target name="tearDown" depends="clean" />
@@ -89,4 +89,4 @@
<au:assertLogContains text=":: publishing :: org.foobar#foobar-core" />
<au:assertLogContains text="publish commited" />
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/skeleton/src/test/antunit/skeleton-test.xml b/skeleton/src/test/antunit/skeleton-test.xml
index 85d253b..786dd00 100644
--- a/skeleton/src/test/antunit/skeleton-test.xml
+++ b/skeleton/src/test/antunit/skeleton-test.xml
@@ -35,11 +35,16 @@
<target name="setUp" depends="clean" />
<target name="tearDown" depends="clean" />
- <target name="test-skeleton:init">
- <au:assertPropertyEquals name="target.main.classes" value="target/test-antunit/main/classes" />
- <au:assertPropertyEquals name="target.test.classes" value="target/test-antunit/test/classes" />
- <au:assertPropertyEquals name="target.test.integration.classes" value="target/test-antunit/integration-test/classes" />
- <au:assertReferenceSet refid="compile.main.classpath" />
- <au:assertReferenceSet refid="compile.test.classpath" />
+ <target name="test-skeleton:init" depends="skeleton:init">
+ <au:assertPropertyEquals name="skeleton.default.basedir" value="${basedir}" />
+ <au:assertPropertyEquals name="skeleton.default.excludes.pattern" value="target/**" />
+ <au:assertPropertyEquals name="skeleton.default.includes.pattern" value="" />
+ <au:assertPropertyEquals name="skeleton.default.type" value="zip" />
+ <au:assertPropertyEquals name="skeleton.default.to.resolver" value="easyant-shared-modules" />
+ <au:assertPropertyEquals name="skeleton.default.revision" value="0.1" />
+ <au:assertPropertyEquals name="skeleton.default.organisation" value="org.apache.easyant.skeletons" />
+ <au:assertPropertyEquals name="project.default.organisation" value=""/>
+ <au:assertPropertyEquals name="skeleton.interactive.mode" value="true"/>
+ <au:assertPropertyEquals name="skeleton.is.interactive" value="true"/>
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/webstart/src/test/antunit/webstart-test.xml b/webstart/src/test/antunit/webstart-test.xml
index 4f5b57c..05760e9 100644
--- a/webstart/src/test/antunit/webstart-test.xml
+++ b/webstart/src/test/antunit/webstart-test.xml
@@ -17,7 +17,7 @@
<project name="org.apache.easyant.plugins;webstart-test" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ea="antlib:org.apache.easyant">
<!-- Import your plugin -->
- <property name="target" value="target/test-antunit" />
+ <property name="target" value="${basedir}/target/test-antunit" />
<!-- configure easyant in current project -->
<ea:configure-easyant-ivy-instance />
<!-- import our local plugin -->
@@ -40,7 +40,7 @@
<property name="webstart.storepass" value="mypass" />
<mkdir dir="${target}/artifacts" />
- <jar destfile="${target.main.artifact}" />
+ <jar destfile="${target.main.artifact}"/>
<mkdir dir="lib/main" />
<echo file="${webstart.jnlp.file}" />
</target>
@@ -82,4 +82,4 @@
<target name="test-webstart:run" depends="webstart:run">
<!-- TODO: Don't know how to test it yet :) -->
</target>
-</project>
\ No newline at end of file
+</project>
