Return-Path: Delivered-To: apmail-jakarta-ant-dev-archive@apache.org Received: (qmail 95063 invoked from network); 1 Feb 2002 04:09:28 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 1 Feb 2002 04:09:28 -0000 Received: (qmail 26494 invoked by uid 97); 1 Feb 2002 04:09:34 -0000 Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org Received: (qmail 26478 invoked by uid 97); 1 Feb 2002 04:09:33 -0000 Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list ant-dev@jakarta.apache.org Received: (qmail 26467 invoked from network); 1 Feb 2002 04:09:33 -0000 Subject: Re: [PATCH] patch for SOSTest & [GUMP] Interim Test Failure] From: Jesse Stockall To: Ant Developers List In-Reply-To: <1012535734.13852.29.camel@homer> References: <1012535734.13852.29.camel@homer> Content-Type: multipart/mixed; boundary="=-DltaMRIDCYO7fLs44wic" X-Mailer: Evolution/1.0.1 Date: 31 Jan 2002 23:09:02 -0500 Message-Id: <1012536543.13852.45.camel@homer> Mime-Version: 1.0 X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --=-DltaMRIDCYO7fLs44wic Content-Type: text/plain Content-Transfer-Encoding: 7bit On Thu, 2002-01-31 at 22:55, Jesse Stockall wrote: > This should fix the directory creation errors. > Oops, don't use that one. This one has a better choice of directory names. -- Jesse Stockall | Tel: 1+ 613.599.2441 ext. 243 CRYPTOCard Corporation | Fax: 1+ 613.599.2442 Suite 304, 300 March Rd. | email: jesse@cryptocard.com Ottawa, ON, Canada K2K 2E2 | web: www.cryptocard.com --------------------------------------------------------------------- --=-DltaMRIDCYO7fLs44wic Content-Disposition: attachment; filename=SOSTest.java.patch Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Index: src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.jav= a =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/cvspublic/jakarta-ant/src/testcases/org/apache/tools/ant/ta= skdefs/optional/sos/SOSTest.java,v retrieving revision 1.1 diff -u -r1.1 SOSTest.java --- src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java 3= 1 Jan 2002 19:47:40 -0000 1.1 +++ src/testcases/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java 1= Feb 2002 04:07:38 -0000 @@ -61,6 +61,7 @@ import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.taskdefs.optional.sos.*; +import java.io.File; =20 /** * Basic testcase to ensure that command line generation is ok @@ -75,13 +76,13 @@ private Project project; private Commandline commandline; private FileUtils fileUtils; - =20 + private static final String VSS_SERVER_PATH =3D "\\\\server\\vss\\srcs= afe.ini"; private static final String VSS_PROJECT_PATH =3D "/SourceRoot/Project"= ; private static final String SOS_SERVER_PATH =3D "192.168.0.1:8888"; private static final String SOS_USERNAME =3D "ant"; private static final String SOS_PASSWORD =3D "rocks"; - private static final String LOCAL_PATH =3D "/home/jesse/source/dir"; + private static final String LOCAL_PATH =3D "testdir"; private static final String SRC_FILE =3D "Class1.java"; private static final String SRC_LABEL =3D "label1"; private static final String SRC_COMMENT =3D "I fixed a bug"; @@ -102,6 +103,13 @@ fileUtils =3D FileUtils.newFileUtils(); } =20 + protected void tearDown() throws Exception { + File file =3D new File(project.getBaseDir(), LOCAL_PATH); + if (file.exists()) { + file.delete(); + } + } + /** * Test SOSGetFile flags & commandline generation */ @@ -110,7 +118,8 @@ SRC_FILE, "-revision", "007", "-server", SOS_SERVER_PATH, "-na= me", SOS_USERNAME, "-password", SOS_PASSWORD, "-database", VSS_SERV= ER_PATH, "-project", "$"+VSS_PROJECT_PATH, "-verbose", "-nocompress", - "-nocache", "-workdir", fileUtils.normalize(LOCAL_PATH).getAbs= olutePath() }; + "-nocache", "-workdir", project.getBaseDir().getAbsolutePath() + + File.separator + LOCAL_PATH }; =20 Path path =3D new Path(project, LOCAL_PATH); =20 @@ -265,7 +274,8 @@ SRC_FILE, "-server", SOS_SERVER_PATH, "-name", SOS_USERNAME, "-password", SOS_PASSWORD, "-database", VSS_SERVER_PATH, "-pro= ject", "$"+VSS_PROJECT_PATH, "-verbose", "-nocompress", "-nocache", - "-workdir", fileUtils.normalize(LOCAL_PATH).getAbsolutePath(),= "-log", SRC_COMMENT }; + "-workdir", project.getBaseDir().getAbsolutePath() + File.sepa= rator + + LOCAL_PATH, "-log", SRC_COMMENT }; =20 Path path =3D new Path(project, LOCAL_PATH); =20 @@ -422,7 +432,8 @@ SRC_FILE, "-server", SOS_SERVER_PATH, "-name", SOS_USERNAME, "-password", SOS_PASSWORD, "-database", VSS_SERVER_PATH, "-pro= ject", "$"+VSS_PROJECT_PATH, "-verbose", "-nocompress", "-nocache", - "-workdir", fileUtils.normalize(LOCAL_PATH).getAbsolutePath() = }; + "-workdir", project.getBaseDir().getAbsolutePath() + + File.separator + LOCAL_PATH }; =20 Path path =3D new Path(project, LOCAL_PATH); =20 --=-DltaMRIDCYO7fLs44wic Content-Type: text/plain; charset=us-ascii -- To unsubscribe, e-mail: For additional commands, e-mail: --=-DltaMRIDCYO7fLs44wic--