cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2005-01-18 Thread bodewig 
bodewig 2005/01/18 00:37:12

  Modified:docs/manual clonevm.html conceptstypeslist.html
   src/main/org/apache/tools/ant/types CommandlineJava.java
   src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  build.clonevm - ant.build.clonevm
  
  Revision  ChangesPath
  1.3   +4 -4  ant/docs/manual/clonevm.html
  
  Index: clonevm.html
  ===
  RCS file: /home/cvs/ant/docs/manual/clonevm.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- clonevm.html  14 Jan 2005 09:45:54 -  1.2
  +++ clonevm.html  18 Jan 2005 08:37:12 -  1.3
  @@ -2,16 +2,16 @@
   
   head
   meta http-equiv=Content-Language content=en-us
  -titlebuild.clonevm/title
  +titleant.build.clonevm/title
   /head
   
   body
   
  -h2a name=clonevmbuild.clonevm/a/h2
  +h2a name=clonevmant.build.clonevm/a/h2
   
   pemSince Ant 1.7/em/p
   
  -pThe value of the build.clonevm system property controls how Ant
  +pThe value of the ant.build.clonevm system property controls how Ant
   instruments forked Java Virtual Machines.  The a
   href=CoreTasks/java.htmljava/a and a
   href=OptionalTasks/junit.htmljunit/a tasks support clonevm
  @@ -20,7 +20,7 @@
   
   pIf the value of the property is true, then all system properties of
   the forked Java Virtual Machine will be the same as those of the Java
  -VM running Ant.  In addition, if you set build.clonevm to true and a
  +VM running Ant.  In addition, if you set ant.build.clonevm to true and a
   href=sysclasspath.htmlbuild.sysclasspath/a has not been set, the
   bootclasspath of forked Java VMs gets constructed as if
   build.sysclasspath had the value last./p
  
  
  
  1.18  +1 -1  ant/docs/manual/conceptstypeslist.html
  
  Index: conceptstypeslist.html
  ===
  RCS file: /home/cvs/ant/docs/manual/conceptstypeslist.html,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- conceptstypeslist.html6 Apr 2004 14:09:25 -   1.17
  +++ conceptstypeslist.html18 Jan 2005 08:37:12 -  1.18
  @@ -11,7 +11,7 @@
   h2a href=toc.html target=navFrameTable of Contents/a/h2
   
   h3Concepts/h3
  -a href=clonevm.htmlbuild.clonevm/abr
  +a href=clonevm.htmlant.build.clonevm/abr
   a href=sysclasspath.htmlbuild.sysclasspath/abr
   a href=CoreTasks/common.htmlCommon Attributes/abr
   
  
  
  
  1.64  +5 -3  
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- CommandlineJava.java  13 Jan 2005 10:10:05 -  1.63
  +++ CommandlineJava.java  18 Jan 2005 08:37:12 -  1.64
  @@ -640,7 +640,7 @@
   
   /**
* Calculate the bootclasspath based on the bootclasspath
  - * specified, the build.sysclasspath and build.clonevm magic
  + * specified, the build.sysclasspath and ant.build.clonevm magic
* properties as well as the cloneVm attribute.
*
* @since Ant 1.7
  @@ -664,11 +664,13 @@
   }
   
   /**
  - * Has the cloneVm attribute or the magic property build.clonevm been 
set?
  + * Has the cloneVm attribute or the magic property
  + * ant.build.clonevm been set?
*
* @since 1.7
*/
   private boolean isCloneVm() {
  -return cloneVm || true.equals(System.getProperty(build.clonevm));
  +return cloneVm 
  +|| true.equals(System.getProperty(ant.build.clonevm));
   }
   }
  
  
  
  1.27  +4 -4  
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- CommandlineJavaTest.java  7 Dec 2004 09:10:38 -   1.26
  +++ CommandlineJavaTest.java  18 Jan 2005 08:37:12 -  1.27
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2000-2004 The Apache Software Foundation
  + * Copyright  2000-2005 The Apache Software Foundation
*
*  Licensed under the Apache License, Version 2.0 (the License);
*  you may not use this file except in compliance with the License.
  @@ -39,15 +39,15 @@
   project = new Project();
   project.setBasedir(System.getProperty(root));
   project.setProperty(build.sysclasspath, ignore);
  -cloneVm = System.getProperty(build.clonevm);
  +cloneVm = System.getProperty(ant.build.clonevm);
   if (cloneVm !=

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2004-10-07 Thread stevel 
stevel  2004/10/07 03:59:45

  Modified:src/main/org/apache/tools/ant/types CommandlineJava.java
   src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  Dont ask me why jikes decided to go all fussy on me. It has, and these are 
the corrections.
  
  Revision  ChangesPath
  1.56  +12 -10
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- CommandlineJava.java  20 Apr 2004 06:24:25 -  1.55
  +++ CommandlineJava.java  7 Oct 2004 10:59:45 -   1.56
  @@ -17,17 +17,17 @@
   
   package org.apache.tools.ant.types;
   
  -import java.util.Enumeration;
  -import java.util.Properties;
  -import java.util.Vector;
  -import java.util.List;
  -import java.util.LinkedList;
  -import java.util.ListIterator;
  -
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
  +import java.util.Enumeration;
  +import java.util.LinkedList;
  +import java.util.List;
  +import java.util.ListIterator;
  +import java.util.Properties;
  +import java.util.Vector;
  +
   /**
* A representation of a Java command line that is
* a composite of 2 ttCommandline/tt. One is used for the
  @@ -74,7 +74,7 @@
* Specialized Environment class for System properties
*/
   public static class SysProperties extends Environment implements 
Cloneable {
  -Properties sys = null;
  +private Properties sys = null;
   private Vector propertySets = new Vector();
   
   /**
  @@ -170,7 +170,7 @@
*  deep clone
* @return a cloned instance of SysProperties
*/
  -public Object clone() {
  +public Object clone() throws CloneNotSupportedException {
   try {
   SysProperties c = (SysProperties) super.clone();
   c.variables = (Vector) variables.clone();
  @@ -566,8 +566,10 @@
   /**
* clone the object; clone of all fields in the class
* @return a CommandlineJava object
  + * @throws BuildException if anything went wrong.
  + * @throws CloneNotSupportedException never
*/
  -public Object clone() {
  +public Object clone() throws CloneNotSupportedException {
   try {
   CommandlineJava c = (CommandlineJava) super.clone();
   c.vmCommand = (Commandline) vmCommand.clone();
  
  
  
  1.25  +3 -7  
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- CommandlineJavaTest.java  20 Apr 2004 06:24:25 -  1.24
  +++ CommandlineJavaTest.java  7 Oct 2004 10:59:45 -   1.25
  @@ -17,14 +17,10 @@
   
   package org.apache.tools.ant.types;
   
  +import junit.framework.TestCase;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.util.JavaEnvUtils;
   
  -import junit.framework.TestCase;
  -import junit.framework.AssertionFailedError;
  -
  -import java.io.File;
  -
   /**
* JUnit 3 testcases for org.apache.tools.ant.CommandlineJava
*
  @@ -55,7 +51,7 @@
   }
   }
   
  -public void testGetCommandline() {
  +public void testGetCommandline() throws Exception {
   CommandlineJava c = new CommandlineJava();
   
c.createArgument().setValue(org.apache.tools.ant.CommandlineJavaTest);
   c.setClassname(junit.textui.TestRunner);
  @@ -143,7 +139,7 @@
   assertNull(System.getProperty(key2));
   }
   
  -public void testAssertions() {
  +public void testAssertions() throws Exception {
   if (JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_2)
   || JavaEnvUtils.isJavaVersion(JavaEnvUtils.JAVA_1_3)) {
   return;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2004-04-20 Thread bodewig 
bodewig 2004/04/19 23:24:25

  Modified:.WHATSNEW
   src/main/org/apache/tools/ant/types Assertions.java
CommandlineJava.java
   src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  assertions inside java or junit didn't work, PR: 27218
  
  Revision  ChangesPath
  1.589 +2 -2  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.588
  retrieving revision 1.589
  diff -u -r1.588 -r1.589
  --- WHATSNEW  16 Apr 2004 09:35:21 -  1.588
  +++ WHATSNEW  20 Apr 2004 06:24:24 -  1.589
  @@ -21,8 +21,6 @@
   
   * AntLikeTasksAtTopLevelTest failed on cygwin.
   
  -* junit and assertions are working together. Bugzilla report 27218
  -
   * I/O-intensive processes hung when executed via exec spawn=true.
 Bugzilla reports 23893/26852.
   
  @@ -118,6 +116,8 @@
   
   * zip and friends would delete the original file when trying to update
 a read-only archive.  Bugzilla Report 28419.
  +
  +* junit and assertions are working together. Bugzilla report 27218
   
   Other changes:
   --
  
  
  
  1.15  +29 -1 ant/src/main/org/apache/tools/ant/types/Assertions.java
  
  Index: Assertions.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Assertions.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Assertions.java   14 Apr 2004 15:42:08 -  1.14
  +++ Assertions.java   20 Apr 2004 06:24:25 -  1.15
  @@ -20,9 +20,10 @@
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Project;
   
  -import java.util.List;
   import java.util.ArrayList;
   import java.util.Iterator;
  +import java.util.List;
  +import java.util.ListIterator;
   
   /**
* The assertion datatype. This type describes
  @@ -199,6 +200,33 @@
   BaseAssertion assertion = (BaseAssertion) it.next();
   String arg = assertion.toCommand();
   addVmArgument(command, arg);
  +}
  +}
  +
  +/**
  + * add the assertions to a list in a format suitable
  + * for adding to a command line
  + * @param commandList
  + */
  +public void applyAssertions(final ListIterator commandIterator) {
  +getProject().log(Applying assertions, Project.MSG_DEBUG);
  +Assertions clause = getFinalReference();
  +//do the system assertions
  +if (Boolean.TRUE.equals(clause.enableSystemAssertions)) {
  +getProject().log(Enabling system assertions, 
Project.MSG_DEBUG);
  +commandIterator.add(-enablesystemassertions);
  +} else if (Boolean.FALSE.equals(clause.enableSystemAssertions)) {
  +getProject().log(disabling system assertions, 
Project.MSG_DEBUG);
  +commandIterator.add(-disablesystemassertions);
  +}
  +
  +//now any inner assertions
  +Iterator it = clause.assertionList.iterator();
  +while (it.hasNext()) {
  +BaseAssertion assertion = (BaseAssertion) it.next();
  +String arg = assertion.toCommand();
  +getProject().log(adding assertion +arg, Project.MSG_DEBUG);
  +commandIterator.add(arg);
   }
   }
   
  
  
  
  1.55  +1 -1  
ant/src/main/org/apache/tools/ant/types/CommandlineJava.java
  
  Index: CommandlineJava.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/types/CommandlineJava.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- CommandlineJava.java  14 Apr 2004 15:42:08 -  1.54
  +++ CommandlineJava.java  20 Apr 2004 06:24:25 -  1.55
  @@ -401,7 +401,7 @@
   
   //now any assertions are added
   if (getAssertions() != null) {
  -getAssertions().applyAssertions(this);
  +getAssertions().applyAssertions(listIterator);
   }
   
   // JDK usage command line says that -jar must be the first option, 
as there is
  
  
  
  1.24  +42 -0 
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- CommandlineJavaTest.java  9 Mar 2004 16:49:05 -   1.23
  +++ CommandlineJavaTest.java  20 Apr 2004 06:24:25 -  1.24
  @@ -18,6 +18,7 @@
   package org.apache.tools.ant.types;
   
   import org.apache.tools.ant.Project;
  +import org.apache.tools.ant.util.JavaEnvUtils;
   
   import

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2004-04-20 Thread bodewig 
bodewig 2004/04/19 23:53:30

  Modified:.Tag: ANT_16_BRANCH WHATSNEW
   src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Java.java
   src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTask.java
   src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
Assertions.java CommandlineJava.java
   src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH
CommandlineJavaTest.java
  Log:
  merge
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.503.2.72 +2 -0  ant/WHATSNEW
  
  Index: WHATSNEW
  ===
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.71
  retrieving revision 1.503.2.72
  diff -u -r1.503.2.71 -r1.503.2.72
  --- WHATSNEW  16 Apr 2004 09:35:59 -  1.503.2.71
  +++ WHATSNEW  20 Apr 2004 06:53:29 -  1.503.2.72
  @@ -49,6 +49,8 @@
   * zip and friends would delete the original file when trying to update
 a read-only archive.  Bugzilla Report 28419.
   
  +* junit and assertions are working together. Bugzilla report 27218
  +
   Other changes:
   --
   
  
  
  
  No   revision
  No   revision
  1.77.2.9  +2 -2  ant/src/main/org/apache/tools/ant/taskdefs/Java.java
  
  Index: Java.java
  ===
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Java.java,v
  retrieving revision 1.77.2.8
  retrieving revision 1.77.2.9
  diff -u -r1.77.2.8 -r1.77.2.9
  --- Java.java 15 Mar 2004 11:29:13 -  1.77.2.8
  +++ Java.java 20 Apr 2004 06:53:29 -  1.77.2.9
  @@ -388,7 +388,7 @@
*/
   public void setFailonerror(boolean fail) {
   failOnError = fail;
  -incompatibleWithSpawn = true;
  +incompatibleWithSpawn |= fail;
   }
   
   /**
  @@ -545,7 +545,7 @@
*/
   public void setTimeout(Long value) {
   timeout = value;
  -incompatibleWithSpawn = true;
  +incompatibleWithSpawn |= timeout != null;
   }
   
   /**
  
  
  
  No   revision
  No   revision
  1.83.2.11 +76 -19
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  
  Index: JUnitTask.java
  ===
  RCS file: 
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
  retrieving revision 1.83.2.10
  retrieving revision 1.83.2.11
  diff -u -r1.83.2.10 -r1.83.2.11
  --- JUnitTask.java16 Apr 2004 07:05:32 -  1.83.2.10
  +++ JUnitTask.java20 Apr 2004 06:53:29 -  1.83.2.11
  @@ -277,7 +277,7 @@
   }
   
   /**
  - * Set the bahvior when [EMAIL PROTECTED] #setFork fork} fork has been 
enabled.
  + * Set the behavior when [EMAIL PROTECTED] #setFork fork} fork has been 
enabled.
*
* pPossible values are once, perTest and perBatch.  If
* set to once, only a single Java VM will be forked for all
  @@ -595,6 +595,12 @@
* @since Ant 1.6
*/
   public void setTempdir(File tmpDir) {
  +if (tmpDir!=null) {
  +if (!tmpDir.exists() || !tmpDir.isDirectory()) {
  +throw new BuildException(tmpDir.toString()
  + + is not a valid temp directory);
  +}
  +}
   this.tmpDir = tmpDir;
   }
   
  @@ -686,11 +692,7 @@
   JUnitTest test = null;
   // Create a temporary file to pass the test cases to run to 
   // the runner (one test case per line)
  -File casesFile = 
  -FileUtils.newFileUtils().createTempFile(junittestcases, 
  -.properties,
  -
getProject().getBaseDir());
  -casesFile.deleteOnExit();
  +File casesFile = createTempPropertiesFile(junittestcases);
   PrintWriter writer = null;
   try {
   writer = 
  @@ -821,12 +823,8 @@
   }
   }
   
  -// Create a temporary file to pass the Ant properties to the
  -// forked test
  -File propsFile =
  -FileUtils.newFileUtils().createTempFile(junit, .properties,
  -tmpDir != null ? tmpDir : getProject().getBaseDir());
  -propsFile.deleteOnExit();
  +
  +File propsFile = createTempPropertiesFile(junit);
   cmd.createArgument().setValue(propsfile=
 + propsFile.getAbsolutePath());
   Hashtable p = getProject().getProperties();
  @@ -885,6 +883,22 @@
   return retVal;
   }
   
  +/**
  + * Create a

Re: cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2004-04-20 Thread Steve Loughran 
[EMAIL PROTECTED] wrote:
bodewig 2004/04/19 23:24:25
  Modified:.WHATSNEW
   src/main/org/apache/tools/ant/types Assertions.java
CommandlineJava.java
   src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  assertions inside java or junit didn't work, PR: 27218
Ahh, well fixed Stefan.
-Steve
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2004-03-03 Thread bodewig 
bodewig 2004/03/03 06:18:49

  Modified:src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  Make test pass in Gumpy - at least I hope it does
  
  Revision  ChangesPath
  1.22  +12 -0 
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- CommandlineJavaTest.java  9 Feb 2004 21:05:45 -   1.21
  +++ CommandlineJavaTest.java  3 Mar 2004 14:18:49 -   1.22
  @@ -31,6 +31,8 @@
*/
   public class CommandlineJavaTest extends TestCase {
   
  +private String cloneVm;
  +
   public CommandlineJavaTest(String name) {
   super(name);
   }
  @@ -41,6 +43,16 @@
   project = new Project();
   project.setBasedir(.);
   project.setProperty(build.sysclasspath, ignore);
  +cloneVm = System.getProperty(build.clonevm);
  +if (cloneVm != null) {
  +System.setProperty(build.clonevm, false);
  +}
  +}
  +
  +public void tearDown() {
  +if (cloneVm != null) {
  +System.setProperty(build.clonevm, cloneVm);
  +}
   }
   
   public void testGetCommandline() {
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2003-10-14 Thread bodewig 
bodewig 2003/10/14 07:56:38

  Modified:src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  Make CommandlineJavaTest independent of lib/optional/junit.jar, PR 17402
  
  Revision  ChangesPath
  1.18  +4 -4  
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- CommandlineJavaTest.java  8 Sep 2003 14:05:51 -   1.17
  +++ CommandlineJavaTest.java  14 Oct 2003 14:56:37 -  1.18
  @@ -105,7 +105,7 @@
   fail(cloning should work without classpath specified);
   }
   
  -
c.createClasspath(project).setLocation(project.resolveFile(lib/optional/junit.jar));
  +
c.createClasspath(project).setLocation(project.resolveFile(build.xml));
   c.createClasspath(project).setLocation(project.resolveFile(
   System.getProperty(ant.home)+/lib/ant.jar));
   s = c.getCommandline();
  @@ -113,8 +113,8 @@
   //assertEquals(with classpath, java, s[0]);
   assertEquals(with classpath, -Djava.compiler=NONE, s[1]);
   assertEquals(with classpath, -classpath, s[2]);
  -assertTrue(junit.jar contained,
  -   s[3].indexOf(junit.jar+java.io.File.pathSeparator) = 0);
  +assertTrue(build.xml contained,
  +   s[3].indexOf(build.xml+java.io.File.pathSeparator) = 0);
   assertTrue(ant.jar contained, s[3].endsWith(ant.jar));
   assertEquals(with classpath, junit.textui.TestRunner, s[4]);
   assertEquals(with classpath,
  @@ -168,4 +168,4 @@
   assertNull(System.getProperty(key2));
   }
   
  -}
  \ No newline at end of file
  +}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2003-10-14 Thread bodewig 
bodewig 2003/10/14 07:56:47

  Modified:src/testcases/org/apache/tools/ant/types Tag: ANT_16_BRANCH
CommandlineJavaTest.java
  Log:
  Merge from HEAD
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.17.2.1  +4 -4  
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- CommandlineJavaTest.java  8 Sep 2003 14:05:51 -   1.17
  +++ CommandlineJavaTest.java  14 Oct 2003 14:56:47 -  1.17.2.1
  @@ -105,7 +105,7 @@
   fail(cloning should work without classpath specified);
   }
   
  -
c.createClasspath(project).setLocation(project.resolveFile(lib/optional/junit.jar));
  +
c.createClasspath(project).setLocation(project.resolveFile(build.xml));
   c.createClasspath(project).setLocation(project.resolveFile(
   System.getProperty(ant.home)+/lib/ant.jar));
   s = c.getCommandline();
  @@ -113,8 +113,8 @@
   //assertEquals(with classpath, java, s[0]);
   assertEquals(with classpath, -Djava.compiler=NONE, s[1]);
   assertEquals(with classpath, -classpath, s[2]);
  -assertTrue(junit.jar contained,
  -   s[3].indexOf(junit.jar+java.io.File.pathSeparator) = 0);
  +assertTrue(build.xml contained,
  +   s[3].indexOf(build.xml+java.io.File.pathSeparator) = 0);
   assertTrue(ant.jar contained, s[3].endsWith(ant.jar));
   assertEquals(with classpath, junit.textui.TestRunner, s[4]);
   assertEquals(with classpath,
  @@ -168,4 +168,4 @@
   assertNull(System.getProperty(key2));
   }
   
  -}
  \ No newline at end of file
  +}
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: ant/src/testcases/org/apache/tools/ant/types CommandlineJavaTest.java

2003-09-08 Thread jhm 
jhm 2003/09/08 07:05:51

  Modified:src/testcases/org/apache/tools/ant/types
CommandlineJavaTest.java
  Log:
  Remove dependency to bootstap version.
  
  Revision  ChangesPath
  1.17  +3 -2  
ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java
  
  Index: CommandlineJavaTest.java
  ===
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/types/CommandlineJavaTest.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CommandlineJavaTest.java  12 May 2003 14:00:10 -  1.16
  +++ CommandlineJavaTest.java  8 Sep 2003 14:05:51 -   1.17
  @@ -106,7 +106,8 @@
   }
   
   
c.createClasspath(project).setLocation(project.resolveFile(lib/optional/junit.jar));
  -
c.createClasspath(project).setLocation(project.resolveFile(bootstrap/lib/ant.jar));
  +c.createClasspath(project).setLocation(project.resolveFile(
  +System.getProperty(ant.home)+/lib/ant.jar));
   s = c.getCommandline();
   assertEquals(with classpath, 6, s.length);
   //assertEquals(with classpath, java, s[0]);
  @@ -167,4 +168,4 @@
   assertNull(System.getProperty(key2));
   }
   
  -}
  +}
  \ No newline at end of file
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]