organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-6951 Removed code depending on old directory structure in TestUtil.

Browse source 
X-SVN-Rev: 26130
This commit is contained in:
Yoshito Umaoka 2009-06-18 21:37:23 +00:00
parent da0a7c344f
commit 793788bbe0
1 changed files with 7 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
icu4j/main/tests/framework/src/com/ibm/icu/dev/test/TestUtil.java
View file

@ -17,37 +17,7 @@ public final class TestUtil {
/**
* Path to test data in icu4jtest.jar
*/
public static final String LOCAL_DATA_PATH = "/com/ibm/icu/dev/data/";
/**
* Standard path to the test data in the file system.
*/
public static final String DATA_PATH = "/src" + LOCAL_DATA_PATH;
/**
* Property for user-defined data path.
*/
public static final String DATA_PATH_PROPERTY = "ICUDataPath";
/**
* Property for modular build.
*/
public static final String DATA_MODULAR_BUILD_PROPERTY = "ICUModularBuild";
/**
* Compute a full data path using the ICUDataPath, if defined, or the user.dir, if we
* are allowed access to it.
*/
private static final String dataPath(String fileName) {
String s = System.getProperty(DATA_PATH_PROPERTY);
if (s == null) {
// assume user.dir is directly above src directory
// data path must end in '/' or '\', fileName should not start with one
s = System.getProperty("user.dir"); // protected property
s = s + DATA_PATH;
}
return s + fileName;
}
public static final String DATA_PATH = "/com/ibm/icu/dev/data/";
/**
* Return an input stream on the data file at path 'name' rooted at the data path
@ -55,16 +25,12 @@ public final class TestUtil {
public static final InputStream getDataStream(String name) throws IOException {
InputStream is = null;
try {
is = new FileInputStream(dataPath(name));
} catch (Throwable e) {
try {
is = TestUtil.class.getResourceAsStream(LOCAL_DATA_PATH + name);
} catch (Throwable t) {
IOException ex =
new IOException("data resource '" + name + "' not found");
ex.initCause(t);
throw ex;
}
is = TestUtil.class.getResourceAsStream(DATA_PATH + name);
} catch (Throwable t) {
IOException ex =
new IOException("data resource '" + name + "' not found");
ex.initCause(t);
throw ex;
}
return is;
}