You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by mb...@apache.org on 2022/02/09 19:07:06 UTC
[ant] 01/07: fully migrate pathconvert tests to antunit
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
commit 6fdb34e7351e5fb3090717600e682b82e2553835
Author: Matt Benson <mb...@apache.org>
AuthorDate: Tue Feb 8 18:28:05 2022 -0600
fully migrate pathconvert tests to antunit
---
src/etc/testcases/taskdefs/pathconvert.xml | 60 ------------------
src/tests/antunit/taskdefs/pathconvert-test.xml | 45 +++++++++++++
.../apache/tools/ant/taskdefs/PathConvertTest.java | 74 ----------------------
3 files changed, 45 insertions(+), 134 deletions(-)
diff --git a/src/etc/testcases/taskdefs/pathconvert.xml b/src/etc/testcases/taskdefs/pathconvert.xml
deleted file mode 100644
index 3ca3102..0000000
--- a/src/etc/testcases/taskdefs/pathconvert.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- https://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project name="pathconvert">
-
- <import file="../buildfiletest-base.xml"/>
-
- <path id="testpath">
- <pathelement path="${ant.file}" />
- </path>
-
- <target name="testmap">
- <pathconvert property="result" dirsep="#">
- <path refid="testpath" />
- <map from="${basedir}" to="test" />
- </pathconvert>
- </target>
-
- <target name="testmapper">
- <pathconvert property="result" dirsep="#">
- <path refid="testpath" />
- <mapper type="glob" from="${basedir}*" to="test*" />
- </pathconvert>
- </target>
-
- <target name="testnotargetos">
- <pathconvert property="result" refid="testpath" />
- </target>
-
- <target name="test-nonmatching-mapper" description="test for bug fix bz-62076">
- <mkdir dir="${output}/mapper-source-dir"/>
- <!-- create 2 files, one of which will be matched/included by the globmapper
- later in this target -->
- <touch file="${output}/mapper-source-dir/file1.txt"/>
- <touch file="${output}/mapper-source-dir/file2.log"/>
-
- <pathconvert property="pc">
- <mappedresources>
- <fileset dir="${output}/mapper-source-dir"/>
- <!-- we intentionally exclude one of the files -->
- <globmapper from="*.log" to="*.txt"/>
- </mappedresources>
- </pathconvert>
- </target>
-
-</project>
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml b/src/tests/antunit/taskdefs/pathconvert-test.xml
index 936e257..7277a05 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-test.xml
@@ -28,4 +28,49 @@
</au:assertTrue>
</target>
+ <path id="testpath">
+ <pathelement path="${ant.file}" />
+ </path>
+
+ <basename property="basename" file="${ant.file}" />
+
+ <target name="testmap">
+ <pathconvert property="result" dirsep="#">
+ <path refid="testpath" />
+ <map from="${basedir}" to="test" />
+ </pathconvert>
+ <au:assertPropertyEquals name="result" value="test#${basename}" />
+ </target>
+
+ <target name="testmapper">
+ <pathconvert property="result" dirsep="#">
+ <path refid="testpath" />
+ <mapper type="glob" from="${basedir}*" to="test*" />
+ </pathconvert>
+ <au:assertPropertyEquals name="result" value="test#${basename}" />
+ </target>
+
+ <target name="testnotargetos">
+ <pathconvert property="result" refid="testpath" />
+ <au:assertPropertyEquals name="result" value="${ant.file}" />
+ </target>
+
+ <target name="test-nonmatching-mapper" description="test for bug fix bz-62076">
+ <mkdir dir="${output}/mapper-source-dir"/>
+ <!-- create 2 files, one of which will be matched/included by the globmapper
+ later in this target -->
+ <touch file="${output}/mapper-source-dir/file1.txt"/>
+ <touch file="${output}/mapper-source-dir/file2.log"/>
+
+ <pathconvert property="pc">
+ <mappedresources>
+ <fileset dir="${output}/mapper-source-dir"/>
+ <!-- we intentionally exclude one of the files -->
+ <globmapper from="*.log" to="*.txt"/>
+ </mappedresources>
+ </pathconvert>
+
+ <au:assertPropertyEquals name="pc" value="file2.txt" />
+ </target>
+
</project>
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
deleted file mode 100644
index cf9bb5d..0000000
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/PathConvertTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.tools.ant.taskdefs;
-
-import org.apache.tools.ant.BuildFileRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Unit test for the <pathconvert> task.
- */
-public class PathConvertTest {
-
- @Rule
- public final BuildFileRule buildRule = new BuildFileRule();
-
- private static final String BUILD_FILENAME = "pathconvert.xml";
-
- @Before
- public void setUp() {
- buildRule.configureProject("src/etc/testcases/taskdefs/" + BUILD_FILENAME);
- }
-
- @Test
- public void testMap() {
- test("testmap");
- }
-
- @Test
- public void testMapper() {
- test("testmapper");
- }
-
- @Test
- public void testNoTargetOs() {
- buildRule.executeTarget("testnotargetos");
- }
-
- /**
- * Tests that if a {@code mappedresource}, that excludes certain resources, is used in a {@code pathconvert},
- * then it doesn't lead to a {@link NullPointerException}.
- *
- * @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62076">bz-62076</a> for more details
- */
- @Test
- public void testNonMatchingMapper() {
- buildRule.executeTarget("test-nonmatching-mapper");
- }
-
- private void test(String target) {
- buildRule.executeTarget(target);
- assertEquals("test#" + BUILD_FILENAME, buildRule.getProject().getProperty("result"));
- }
-
-}