Skip to content

Commit

Permalink
MONDRIAN: added a system property that references the FoodMart.xml du…
Browse files Browse the repository at this point in the history 
…ring tests

[git-p4: depot-paths = "//open/mondrian/": change = 731]
  • Loading branch information
ebengtso committed Aug 24, 2003
1 parent ec875bc commit 3bb10c4
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 14 deletions.
9 changes: 7 additions & 2 deletions build.xml
View file
Expand Up @@ -299,11 +299,14 @@ copy.properties"/>
description="Runs a few queries using the FoodMart schema.">
<java classpathref="project.classpath" classname="mondrian.test.Main"
fork="yes">
<jvmarg value="-Dmondrian.jdbcDrivers=${mondrian.jdbcDrivers}"/>

<sysproperty key="mondrian.jdbcDrivers" value="${mondrian.jdbcDrivers}"/>
<sysproperty key="mondrian.test.foodmart.catalogURL" value="${mondrian.foodmart.catalogURL}"/>

<!-- mondrian.test.connectString is the mondrian connect-string.
Provider must be 'mondrian'. Jdbc is the Catalog is the -->
<jvmarg value="-Dmondrian.test.connectString=Provider=mondrian;Jdbc='${mondrian.foodmart.jdbcURL}';Catalog='${mondrian.foodmart.catalogURL}';JdbcUser='${mondrian.foodmart.jdbcUser}';JdbcPassword='${mondrian.foodmart.jdbcPassword}'"/>
<sysproperty key="mondrian.test.connectString" value="Provider=mondrian;Jdbc='${mondrian.foodmart.jdbcURL}';Catalog='${mondrian.foodmart.catalogURL}';JdbcUser='${mondrian.foodmart.jdbcUser}';JdbcPassword='${mondrian.foodmart.jdbcPassword}'"/>

</java>
</target>

Expand Down Expand Up @@ -347,6 +350,8 @@ in {mondrian.foodmart.jdbcURL}.">

<sysproperty key="mondrian.jdbcDrivers" value="${mondrian.jdbcDrivers}"/>
<sysproperty key="mondrian.foodmart.jdbcURL" value="${mondrian.foodmart.jdbcURL}"/>
<sysproperty key="mondrian.test.foodmart.catalogURL" value="${mondrian.foodmart.catalogURL}"/>

<sysproperty key="mondrian.test.connectString" value="Provider=mondrian;Jdbc='${mondrian.foodmart.jdbcURL}';Catalog='${mondrian.foodmart.catalogURL}'"/>

</java>
Expand Down
32 changes: 20 additions & 12 deletions src/main/mondrian/xmla/XmlaTest.java
View file
Expand Up @@ -30,8 +30,10 @@
public class XmlaTest extends TestCase {
private static final String nl = System.getProperty("line.separator");
//private static final String dataSource = "Provider=MSOLAP;Data Source=local;";
private static final String dataSource = "Provider=Mondrian;Jdbc=jdbc:odbc:MondrianFoodMart;Catalog=file:/E:/mondrian/demo/FoodMart.xml;JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver;";
private static final String catalogName = "file:/E:/mondrian/demo/FoodMart.xml";
private static final String FOODMART_CATALOG_URL = "mondrian.test.foodmart.catalogURL";
private static String catalogName;
private static String dataSource;

/**
* Usually null, when {@link #getRequests} sets it, {@link #executeRequest}
* writes request strings into it and returns null.
Expand All @@ -40,6 +42,12 @@ public class XmlaTest extends TestCase {

public XmlaTest(String s) {
super(s);
if( System.getProperty(FOODMART_CATALOG_URL) != null )
catalogName = System.getProperty(FOODMART_CATALOG_URL);
else
catalogName = "file:/E:/mondrian/demo/FoodMart.xml";
dataSource = "Provider=Mondrian;Jdbc=jdbc:odbc:MondrianFoodMart;Catalog=" + catalogName + ";JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver;";

}

/**
Expand Down Expand Up @@ -456,7 +464,7 @@ public void testDiscoverMembersRestrictedByHierarchy() {
" <root xmlns=\"urn:schemas-microsoft-com:xml-analysis:rowset\">" + nl +
" <xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"/>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Gender]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -470,7 +478,7 @@ public void testDiscoverMembersRestrictedByHierarchy() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Gender]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -484,7 +492,7 @@ public void testDiscoverMembersRestrictedByHierarchy() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Gender]</DIMENSION_UNIQUE_NAME>" + nl +
Expand Down Expand Up @@ -537,7 +545,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <root xmlns=\"urn:schemas-microsoft-com:xml-analysis:rowset\">" + nl +
" <xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"/>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -551,7 +559,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -565,7 +573,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -579,7 +587,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -593,7 +601,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -607,7 +615,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand All @@ -621,7 +629,7 @@ public void testDiscoverMembersRestrictedByMemberAndTreeop() {
" <TREE_OP/>" + nl +
" </row>" + nl +
" <row>" + nl +
" <CATALOG_NAME>file:/E:/mondrian/demo/FoodMart.xml</CATALOG_NAME>" + nl +
" <CATALOG_NAME>"+catalogName+"</CATALOG_NAME>" + nl +
" <SCHEMA_NAME>FoodMart</SCHEMA_NAME>" + nl +
" <CUBE_NAME>Sales</CUBE_NAME>" + nl +
" <DIMENSION_UNIQUE_NAME>[Time]</DIMENSION_UNIQUE_NAME>" + nl +
Expand Down

0 comments on commit 3bb10c4

Please sign in to comment.