Skip to content

Commit

Permalink
MONDRIAN: remove some leftover file refs from XmlaBasicTest
Browse files Browse the repository at this point in the history
[git-p4: depot-paths = "//open/mondrian/": change = 8806]
  • Loading branch information
jsichi committed Mar 1, 2007
1 parent 7058409 commit 8a4f45c
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions testsrc/main/mondrian/xmla/XmlaBasicTest.java
Expand Up @@ -77,12 +77,8 @@ public class XmlaBasicTest extends XmlaBaseTestCase {
public static final String CONTENT_SCHEMADATA =
Enumeration.Content.SchemaData.name();

private static final String XMLA_DIRECTORY = "testsrc/main/mondrian/xmla/";

private static final boolean DEBUG = false;

protected final File testDir = new File(XMLA_DIRECTORY, "basic");

protected String[][] catalogNameUrls = null;

public XmlaBasicTest() {
Expand All @@ -104,17 +100,11 @@ protected DiffRepository getDiffRepos() {

protected Document fileToDocument(String filename)
throws IOException , SAXException {
Document doc;
if (filename.startsWith("$")) {
String s = getDiffRepos().expand(null, filename);
if (s.equals(filename)) {
s = "<?xml version='1.0'?><Empty/>";
}
doc = XmlUtil.parse(new ByteArrayInputStream(s.getBytes()));
} else {
File file = new File(testDir, filename);
doc = XmlUtil.parse(file);
String s = getDiffRepos().expand(null, filename);
if (s.equals(filename)) {
s = "<?xml version='1.0'?><Empty/>";
}
Document doc = XmlUtil.parse(new ByteArrayInputStream(s.getBytes()));
return doc;
}

Expand Down

0 comments on commit 8a4f45c

Please sign in to comment.