From 1fa4c5fe1b08d6e3bdc6e3b77e7f9d3218e14736 Mon Sep 17 00:00:00 2001 From: acolyer Date: Mon, 26 Apr 2004 14:59:01 +0000 Subject: [PATCH] change test cases to use File.pathSeparator rather than ";" --- .../org/aspectj/ajdt/ajc/BuildArgParserTestCase.java | 6 +++--- .../internal/compiler/batch/BinaryFormsTestCase.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java index 3cefb1e2c..dba440679 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/ajc/BuildArgParserTestCase.java @@ -43,7 +43,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testDefaultClasspathAndTargetCombo() throws InvalidInputException { - String ENTRY = "1.jar;2.jar"; + String ENTRY = "1.jar" + File.pathSeparator + "2.jar"; final String classpath = System.getProperty("java.class.path"); try { System.setProperty("java.class.path", ENTRY); // see finally below @@ -223,7 +223,7 @@ public class BuildArgParserTestCase extends TestCase { public void testBadSourceRootDir() throws InvalidInputException { AjBuildConfig config = genBuildConfig(new String[] { "-sourceroots", - AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist;" + AjdtAjcTests.TESTDATA_PATH + "/mumbleDoesNotExist" + File.pathSeparator + AjdtAjcTests.TESTDATA_PATH + "/ajc" }, messageWriter); @@ -327,7 +327,7 @@ public class BuildArgParserTestCase extends TestCase { } public void testClasspathSetting() throws InvalidInputException { - String ENTRY = "1.jar;2.jar"; + String ENTRY = "1.jar" + File.pathSeparator + "2.jar"; AjBuildConfig config = genBuildConfig(new String[] { "-classpath", ENTRY }, messageWriter); assertTrue( diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java index d6f8ea31c..ed5dca880 100644 --- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java +++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BinaryFormsTestCase.java @@ -61,8 +61,8 @@ public class BinaryFormsTestCase extends CommandTestCase { CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); - TestUtil.runMain("out;out/lib.jar", "client.Client"); - TestUtil.runMain("out;out/lib.jar", "client.Client1"); + TestUtil.runMain("out" + File.pathSeparator + "out/lib.jar", "client.Client"); + TestUtil.runMain("out" + File.pathSeparator + "out/lib.jar", "client.Client1"); args = new ArrayList(); args.add("-aspectpath"); @@ -80,7 +80,7 @@ public class BinaryFormsTestCase extends CommandTestCase { CommandTestCase.runCompiler(args, CommandTestCase.NO_ERRORS); - TestUtil.runMain("out;out/lib.jar", "client.Client1"); + TestUtil.runMain("out" + File.pathSeparator + "out/lib.jar", "client.Client1"); args = new ArrayList(); args.add("-aspectpath"); @@ -100,7 +100,7 @@ public class BinaryFormsTestCase extends CommandTestCase { args = new ArrayList(); args.add("-classpath"); - args.add("../runtime/bin;out/lib.jar" + args.add("../runtime/bin" + File.pathSeparator + "out/lib.jar" + File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-d"); @@ -112,7 +112,7 @@ public class BinaryFormsTestCase extends CommandTestCase { args = new ArrayList(); args.add("-classpath"); - args.add("../runtime/bin;out/lib.jar" + + args.add("../runtime/bin" + File.pathSeparator + "out/lib.jar" + File.pathSeparator + System.getProperty("aspectjrt.path")); args.add("-Xlint:error"); -- 2.39.5