AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5077 Make ICU4J Tests work on JDK 1.3

Browse Source 
X-SVN-Rev: 19240
This commit is contained in:
Ram Viswanadha 2006-02-23 00:35:19 +00:00
parent 1576a34ce3
commit 77f7720c75
20 changed files with 143 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
icu4j/src/com/ibm/icu/dev/test/TestFmwk.java
View File

@ -1,6 +1,7 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -26,7 +27,9 @@ import java.util.Comparator;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Random;
//#ifdef FOUNDATION
//## import com.ibm.icu.impl.Utility;
//#endif
/**
* TestFmwk is a base class for tests that can be run conveniently from the
* command line as well as under the Java test harness.
@ -60,7 +63,11 @@ public class TestFmwk extends AbstractTestLog {
}
}
protected void handleException(Throwable e){
//#ifndef FOUNDATION
Throwable ex = e.getCause();
//#else
//## Throwable ex = null;
//#endif
if(ex==null){
ex = e;
}
@ -1008,7 +1015,12 @@ public class TestFmwk extends AbstractTestLog {
}
public static TestParams create(String arglist, PrintWriter log) {
//#ifndef FOUNDATION
return create(arglist.split("\\s"), log);
//#else
//## return create(Utility.split(arglist, '\u0020'), log);
//#endif
}
/**

22
icu4j/src/com/ibm/icu/dev/test/TestUtil.java
View File

@ -1,6 +1,7 @@
//##header
/**
*******************************************************************************
* Copyright (C) 2001-2004, International Business Machines Corporation and *
* Copyright (C) 2001-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -11,6 +12,7 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.File;
public final class TestUtil {
/**
@ -61,9 +63,13 @@ public final class TestUtil {
} catch (Throwable t) {
IOException ex =
new IOException("data resource '" + name + "' not found");
//#ifndef FOUNDATION
//initCause API was introduced in JDK 1.4
ex.initCause(t);
//t.printStackTrace();
//#else
//## t.printStackTrace();
//#endif
throw ex;
}
}
@ -231,4 +237,16 @@ public final class TestUtil {
lock.go();
}
public static BufferedReader openUTF8Reader(String dir, String filename) throws IOException {
return openReader(dir,filename,"UTF-8");
}
public static BufferedReader openReader(String dir, String filename, String encoding) throws IOException {
File file = new File(dir + filename);
return new BufferedReader(
new InputStreamReader(
new FileInputStream(file),
encoding),
4*1024);
}
}

16
icu4j/src/com/ibm/icu/dev/test/charsetdet/TestCharsetDetector.java
View File

@ -1,3 +1,4 @@
//##header
/**
*******************************************************************************
* Copyright (C) 2005-2006, International Business Machines Corporation and *
@ -16,6 +17,9 @@ import com.ibm.icu.dev.test.TestFmwk;
import com.ibm.icu.impl.UTF32;
import com.ibm.icu.text.*;
import com.ibm.icu.util.VersionInfo;
//#ifdef FOUNDATION
//##import com.ibm.icu.impl.Utility;
//#endif
import javax.xml.parsers.*;
import org.w3c.dom.*;
@ -56,9 +60,13 @@ public class TestCharsetDetector extends TestFmwk
throw new Exception();
}
catch (Exception e) {
//#ifndef FOUNDATION
StackTraceElement failPoint = e.getStackTrace()[1];
msg = "Test failure in file " + failPoint.getFileName() +
" at line " + failPoint.getLineNumber();
//#else
//## msg = "Test failure " + e.getMessage() ;
//#endif
}
errln(msg);
}
@ -117,7 +125,11 @@ public class TestCharsetDetector extends TestFmwk
private void checkEncoding(String testString, String encoding, String id)
{
String enc = null, lang = null;
//#ifndef FOUNDATION
String[] split = encoding.split("/");
//#else
//## String[] split = Utility.split(encoding,'/');
//#endif
enc = split[0];
@ -343,7 +355,11 @@ public class TestCharsetDetector extends TestFmwk
// Process test text with each encoding / language pair.
String testString = testText.toString();
//#ifndef FOUNDATION
String[] encodingList = encodings.split(" ");
//#else
//## String[] encodingList = Utility.split(encodings, ' ');
//#endif
for (int e = 0; e < encodingList.length; e += 1) {
checkEncoding(testString, encodingList[e], id);

5
icu4j/src/com/ibm/icu/dev/test/cldr/TestCLDRVsICU.java
View File

@ -1,11 +1,13 @@
//##header
/*
**********************************************************************
* Copyright (c) 2002-2005, International Business Machines
* Copyright (c) 2002-2006, International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
* Author: Mark Davis
**********************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.cldr;
import java.io.File;
@ -560,3 +562,4 @@ public class TestCLDRVsICU extends TestFmwk {
};
}
//#endif

8
icu4j/src/com/ibm/icu/dev/test/collator/RandomCollator.java
View File

@ -1,11 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2005, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.collator;
@ -292,3 +292,5 @@ public class RandomCollator extends TestFmwk {
};
*/
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/collator/TestAll.java
View File

@ -1,6 +1,7 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -40,7 +41,9 @@ public class TestAll extends TestGroup {
"CollationMiscTest",
"CollationChineseTest",
"CollationServiceTest",
//#ifndef FOUNDATION
"RandomCollator",
//#endif
"UCAConformanceTest",
// don't test Search API twice!
//"com.ibm.icu.dev.test.search.SearchTest"

3
icu4j/src/com/ibm/icu/dev/test/format/GlobalizationPreferencesTest.java
View File

@ -1,7 +1,7 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2004-2005, International Business Machines Corporation and *
* Copyright (C) 2004-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -14,7 +14,6 @@ import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Date;
import com.ibm.icu.dev.test.util.BagFormatter;
import com.ibm.icu.text.DateFormat;
import com.ibm.icu.text.DateFormatSymbols;
import com.ibm.icu.text.SimpleDateFormat;

6
icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneAliasTest.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2004, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.timezone;
import java.util.ArrayList;
@ -416,3 +418,5 @@ public class TimeZoneAliasTest extends TestFmwk {
}
}
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/BNF.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2005, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.util.ArrayList;
@ -320,3 +322,4 @@ public class BNF {
return result;
}
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/BagFormatter.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2005, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.io.BufferedReader;
@ -1083,3 +1085,4 @@ public class BagFormatter {
this.fixName = fixName;
}
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/CollectionUtilities.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.util.Collection;
@ -503,3 +505,4 @@ public final class CollectionUtilities {
}
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/DataInputCompressor.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.io.DataInput;
@ -230,3 +232,4 @@ public final class DataInputCompressor implements ObjectInput {
return valuesList;
}
}
//#endif

6
icu4j/src/com/ibm/icu/dev/test/util/DataOutputCompressor.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.io.DataOutput;
@ -209,3 +211,5 @@ public final class DataOutputCompressor implements ObjectOutput {
}
}
}
//#endif

9
icu4j/src/com/ibm/icu/dev/test/util/FileUtilities.java
View File

@ -1,10 +1,14 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2005, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
package com.ibm.icu.dev.test.util;import java.io.BufferedReader;
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.PrintWriter;
@ -72,3 +76,4 @@ public class FileUtilities {
return source.toLowerCase(Locale.ENGLISH).replaceAll("\\P{L}", "_");
}
}
//#endif

6
icu4j/src/com/ibm/icu/dev/test/util/ICUPropertyFactory.java
View File

@ -1,10 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2004, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.util.ArrayList;
@ -413,3 +414,4 @@ public class ICUPropertyFactory extends UnicodeProperty.Factory {
}
}
}
//#endif

6
icu4j/src/com/ibm/icu/dev/test/util/TestBNF.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2004, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.util.Random;
@ -238,3 +240,5 @@ public class TestBNF {
}
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/TestBagFormatter.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2004, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
// TODO integrate this into the test framework
@ -241,3 +243,4 @@ public class TestBagFormatter {
}
*/
}
//#endif

5
icu4j/src/com/ibm/icu/dev/test/util/TestUtilities.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 1996-2005, International Business Machines Corporation and *
* Copyright (C) 1996-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.text.NumberFormat;
@ -465,3 +467,4 @@ public class TestUtilities extends TestFmwk {
}
}
//#endif

6
icu4j/src/com/ibm/icu/dev/test/util/Tokenizer.java
View File

@ -1,9 +1,11 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2004, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
//#ifndef FOUNDATION
package com.ibm.icu.dev.test.util;
import java.text.ParsePosition;
@ -316,3 +318,5 @@ public class Tokenizer {
}
}
//#endif

14
icu4j/src/com/ibm/icu/dev/test/util/TransliteratorUtilities.java
View File

@ -1,6 +1,7 @@
//##header
/*
*******************************************************************************
* Copyright (C) 2002-2005, International Business Machines Corporation and *
* Copyright (C) 2002-2006, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@ -11,6 +12,8 @@ import java.io.IOException;
import com.ibm.icu.text.Transliterator;
import com.ibm.icu.dev.test.TestUtil;
public class TransliteratorUtilities {
public static boolean DEBUG = false;
@ -42,7 +45,11 @@ public class TransliteratorUtilities {
Transliterator.registerInstance(t);
if (DEBUG) System.out.println("Registered new Transliterator: " + id + ", " + rid);
} catch (IOException e) {
//#ifndef FOUNDATION
throw (IllegalArgumentException) new IllegalArgumentException("Can't open " + dir + ", " + id).initCause(e);
//#else
//## throw (IllegalArgumentException) new IllegalArgumentException("Can't open " + dir + ", " + id+" "+ e.getMessage());
//#endif
}
}
@ -50,7 +57,11 @@ public class TransliteratorUtilities {
*
*/
public static String getFileContents(String dir, String filename) throws IOException {
//#ifndef FOUNDATION
BufferedReader br = BagFormatter.openUTF8Reader(dir, filename);
//#else
//## BufferedReader br = TestUtil.openUTF8Reader(dir, filename);
//#endif
StringBuffer buffer = new StringBuffer();
while (true) {
String line = br.readLine();
@ -60,6 +71,7 @@ public class TransliteratorUtilities {
}
br.close();
return buffer.toString();
}
private static final String BASE_RULES =