svn commit: r1353811 - in /ant/core/trunk/src: main/org/apache/tools/ant/taskdefs/defaults.properties tests/antunit/taskdefs/commandlauncher/ tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml

[bo...@apache.org]

Author: bodewig
Date: Tue Jun 26 04:14:07 2012
New Revision: 1353811

URL: http://svn.apache.org/viewvc?rev=1353811&view=rev
Log:
AntUnit test for commandlauncher and a typo fix by Vimil Saju

Added:
    ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/
    ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml   (with props)
Modified:
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties?rev=1353811&r1=1353810&r2=1353811&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/defaults.properties Tue Jun 26 04:14:07 2012
@@ -30,7 +30,7 @@ bzip2=org.apache.tools.ant.taskdefs.BZip
 checksum=org.apache.tools.ant.taskdefs.Checksum
 chmod=org.apache.tools.ant.taskdefs.Chmod
 classloader=org.apache.tools.ant.taskdefs.Classloader
-commandlaucher=org.apache.tools.ant.taskdefs.CommandLauncherTask
+commandlauncher=org.apache.tools.ant.taskdefs.CommandLauncherTask
 componentdef=org.apache.tools.ant.taskdefs.Componentdef
 concat=org.apache.tools.ant.taskdefs.Concat
 condition=org.apache.tools.ant.taskdefs.ConditionTask

Added: ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml?rev=1353811&view=auto
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml (added)
+++ ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml Tue Jun 26 04:14:07 2012
@@ -0,0 +1,87 @@
+<?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
+
+      http://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 xmlns:au="antlib:org.apache.ant.antunit" default="antunit">
+   <import file="../../antunit-base.xml" />
+
+  <target name="testCommandLauncherTask">
+   <echo message="${input}"/>
+    <mkdir dir="${input}"/>
+    <mkdir dir="${output}"/>
+    <echo file="${input}/MyCommandLauncher.java">
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Execute;
+import org.apache.tools.ant.taskdefs.launcher.Java13CommandLauncher;
+
+public class MyCommandLauncher extends Java13CommandLauncher {
+        public MyCommandLauncher() throws NoSuchMethodException {
+                super();
+        }
+
+
+
+        @Override
+        public Process exec(Project project, String[] cmd, String[] env, File workingDir) throws IOException {
+                Process p = super.exec(project, cmd, env, workingDir);
+                System.out.println("Hello World From CommandLauncher");
+                return p;
+        }
+
+}
+
+    </echo>
+    <echo file="${input}/MyJavaExecutable.java">
+public class MyJavaExecutable {
+        public static void main(String[] args) {
+
+        }
+}
+
+    </echo>
+    <javac destdir="${output}"
+           srcdir="${input}"/>
+    <typedef
+       name="my-command-launcher"
+       classname="MyCommandLauncher" classpath="${output}"/> 
+
+    <commandlauncher vmlauncher="true">
+        <my-command-launcher/>
+    </commandlauncher>
+
+    <condition property="java"
+               value="${java.home}/bin/java.exe"
+               else="${java.home}/bin/java">
+        <os family="dos"/>
+    </condition>
+
+    <exec executable="${java}" failonerror="true">
+        <arg value="-cp"/>
+        <arg value="${output}"/>
+        <arg value="MyJavaExecutable"/>
+    </exec>
+
+
+    <au:assertLogContains text="Hello World From CommandLauncher"/>
+  </target>
+
+ 
+</project>

Propchange: ant/core/trunk/src/tests/antunit/taskdefs/commandlauncher/commandlauncher-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native