Browse Source

I made a lot of changes here, to almost every test case in the "testConstructor" test. �Partly this code is system-dependent, but it is also testing that the paths are tokenized or split into individual paths correctly, so that system dependence is probably ok here. �I simply added in a NetWare case everywhere there was a UNIX and Windows(really, "else") case.

Submitted By: Jeff Tulley �(jtulley@novell.com)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269788 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 23 years ago
parent
commit
471322b9ae
1 changed files with 22 additions and 0 deletions
  1. +22
    -0
      src/testcases/org/apache/tools/ant/types/PathTest.java

+ 22
- 0
src/testcases/org/apache/tools/ant/types/PathTest.java View File

@@ -71,6 +71,7 @@ import java.io.File;
public class PathTest extends TestCase { public class PathTest extends TestCase {


public static boolean isUnixStyle = File.pathSeparatorChar == ':'; public static boolean isUnixStyle = File.pathSeparatorChar == ':';
public static boolean isNetWare = (System.getProperty("os.name").toLowerCase().indexOf("netware") > -1);


private Project project; private Project project;


@@ -91,6 +92,9 @@ public class PathTest extends TestCase {
if (isUnixStyle) { if (isUnixStyle) {
assertEquals("/a", l[0]); assertEquals("/a", l[0]);
assertEquals("/b", l[1]); assertEquals("/b", l[1]);
} else if (isNetWare) {
assertEquals("\\a", l[0]);
assertEquals("\\b", l[1]);
} else { } else {
assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\a", l[0].substring(1));
assertEquals(":\\b", l[1].substring(1)); assertEquals(":\\b", l[1].substring(1));
@@ -102,6 +106,9 @@ public class PathTest extends TestCase {
if (isUnixStyle) { if (isUnixStyle) {
assertEquals("/a", l[0]); assertEquals("/a", l[0]);
assertEquals("/b", l[1]); assertEquals("/b", l[1]);
} else if (isNetWare) {
assertEquals("\\a", l[0]);
assertEquals("\\b", l[1]);
} else { } else {
assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\a", l[0].substring(1));
assertEquals(":\\b", l[1].substring(1)); assertEquals(":\\b", l[1].substring(1));
@@ -114,6 +121,10 @@ public class PathTest extends TestCase {
assertEquals("/a", l[0]); assertEquals("/a", l[0]);
assertEquals("/b", l[1]); assertEquals("/b", l[1]);
assertEquals("/c", l[2]); assertEquals("/c", l[2]);
} else if (isNetWare) {
assertEquals("\\a", l[0]);
assertEquals("\\b", l[1]);
assertEquals("\\c", l[2]);
} else { } else {
assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\a", l[0].substring(1));
assertEquals(":\\b", l[1].substring(1)); assertEquals(":\\b", l[1].substring(1));
@@ -127,6 +138,9 @@ public class PathTest extends TestCase {
assert("c resolved relative to project\'s basedir", assert("c resolved relative to project\'s basedir",
l[0].endsWith("/c")); l[0].endsWith("/c"));
assertEquals("/test", l[1]); assertEquals("/test", l[1]);
} else if (isNetWare) {
assertEquals("volumes on NetWare", 1, l.length);
assertEquals("c:\\test", l[0].toLowerCase());
} else { } else {
assertEquals("drives on DOS", 1, l.length); assertEquals("drives on DOS", 1, l.length);
assertEquals("c:\\test", l[0].toLowerCase()); assertEquals("c:\\test", l[0].toLowerCase());
@@ -139,6 +153,9 @@ public class PathTest extends TestCase {
assert("c resolved relative to project\'s basedir", assert("c resolved relative to project\'s basedir",
l[0].endsWith("/c")); l[0].endsWith("/c"));
assertEquals("/test", l[1]); assertEquals("/test", l[1]);
} else if (isNetWare) {
assertEquals("volumes on NetWare", 1, l.length);
assertEquals("c:\\test", l[0].toLowerCase());
} else { } else {
assertEquals("drives on DOS", 1, l.length); assertEquals("drives on DOS", 1, l.length);
assertEquals("c:\\test", l[0].toLowerCase()); assertEquals("c:\\test", l[0].toLowerCase());
@@ -152,6 +169,9 @@ public class PathTest extends TestCase {
if (isUnixStyle) { if (isUnixStyle) {
assertEquals(1, l.length); assertEquals(1, l.length);
assertEquals("/a", l[0]); assertEquals("/a", l[0]);
} else if (isNetWare) {
assertEquals(1, l.length);
assertEquals("\\a", l[0]);
} else { } else {
assertEquals(1, l.length); assertEquals(1, l.length);
assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\a", l[0].substring(1));
@@ -313,6 +333,8 @@ public class PathTest extends TestCase {
1, l.length); 1, l.length);
if (isUnixStyle) { if (isUnixStyle) {
assertEquals("/a", l[0]); assertEquals("/a", l[0]);
} else if (isNetWare) {
assertEquals("\\a", l[0]);
} else { } else {
assertEquals(":\\a", l[0].substring(1)); assertEquals(":\\a", l[0].substring(1));
} }


Loading…
Cancel
Save