From 9c590aac4c4b7c44ae0fb717d9df14ec05f9482b Mon Sep 17 00:00:00 2001 From: Julian Hyde Date: Tue, 4 Nov 2008 20:24:50 +0000 Subject: [PATCH] Fix a few typos in javadoc. Add testcase for bug 1868075. Include README in release, and convert to DOS format. git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@134 c6a108a4-781c-0410-a6c6-c2d559e19af0 --- build.xml | 3 ++ src/org/olap4j/query/package.html | 4 +- src/org/olap4j/transform/package.html | 2 +- src/org/olap4j/type/package.html | 2 +- testsrc/org/olap4j/ConnectionTest.java | 63 ++++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 5b4039a..3536203 100644 --- a/build.xml +++ b/build.xml @@ -187,6 +187,8 @@ ${jar-jdk14.file}"/> + + @@ -205,6 +207,7 @@ build.xml, build.properties, test.properties.example, LICENSE.html, +CHANGES.txt, README.txt, VERSION.txt" excludes=" diff --git a/src/org/olap4j/query/package.html b/src/org/olap4j/query/package.html index 8ecb872..87ae6b5 100755 --- a/src/org/olap4j/query/package.html +++ b/src/org/olap4j/query/package.html @@ -1,6 +1,8 @@ -Provides an object model for building OLAP queries programmatically. +Provides an object model for building OLAP queries programmatically (experimental). + +

NOTE: This package is experimental. Classes may be renamed or removed in a future release of olap4j. diff --git a/src/org/olap4j/transform/package.html b/src/org/olap4j/transform/package.html index 52ba0c5..08ea091 100755 --- a/src/org/olap4j/transform/package.html +++ b/src/org/olap4j/transform/package.html @@ -1,6 +1,6 @@ -Provides services to transform MDX parse trees. +Provides services to transform MDX parse trees (experimental).

NOTE: This package is experimental. Classes may be renamed or removed in a future release of olap4j. diff --git a/src/org/olap4j/type/package.html b/src/org/olap4j/type/package.html index a008aa5..9a47bfe 100755 --- a/src/org/olap4j/type/package.html +++ b/src/org/olap4j/type/package.html @@ -1,6 +1,6 @@ -Type system for MDX expessions. +Type system for MDX expressions. diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java index 7cf99f6..027671b 100644 --- a/testsrc/org/olap4j/ConnectionTest.java +++ b/testsrc/org/olap4j/ConnectionTest.java @@ -1553,6 +1553,69 @@ public void testMetadata() throws Exception { measureNameSet); } + /** + * Testcase for bug 1868075, "Query on ragged hierarchy gives only empty + * cells". + */ + public void testRagged() throws SQLException { + connection = tester.createConnection(); + Statement statement = connection.createStatement(); + final OlapStatement olapStatement = + tester.getWrapper().unwrap(statement, OlapStatement.class); + final CellSet cellSet = + olapStatement.executeOlapQuery("SELECT\n" + + "{[Product].[All Products].[Drink].[Alcoholic Beverages].Children,\n" + + "[Product].[All Products].[Food].[Baked Goods].Children} ON COLUMNS,\n" + + "CrossJoin([Store].[All Stores].[USA].[CA].Children,\n" + + "[Time].[1997].[Q1].Children) ON ROWS\n" + + "FROM [Sales Ragged]"); + String s = TestContext.toString(cellSet); + TestContext.assertEqualsVerbose( + TestContext.fold("Axis #0:\n" + + "{[Measures].[Unit Sales], [Geography].[All Geographys], [Store Size in SQFT].[All Store Size in SQFTs], [Store Type].[All Store Types], [Promotion Media].[All Media], [Promotions].[All Promotions], [Customers].[All Customers], [Education Level].[All Education Levels], [Gender].[All Gender], [Marital Status].[All Marital Status], [Yearly Income].[All Yearly Incomes]}\n" + + "Axis #1:\n" + + "{[Product].[All Products].[Drink].[Alcoholic Beverages].[Beer and Wine]}\n" + + "{[Product].[All Products].[Food].[Baked Goods].[Bread]}\n" + + "Axis #2:\n" + + "{[Store].[All Stores].[USA].[CA].[Alameda], [Time].[1997].[Q1].[1]}\n" + + "{[Store].[All Stores].[USA].[CA].[Alameda], [Time].[1997].[Q1].[2]}\n" + + "{[Store].[All Stores].[USA].[CA].[Alameda], [Time].[1997].[Q1].[3]}\n" + + "{[Store].[All Stores].[USA].[CA].[Beverly Hills], [Time].[1997].[Q1].[1]}\n" + + "{[Store].[All Stores].[USA].[CA].[Beverly Hills], [Time].[1997].[Q1].[2]}\n" + + "{[Store].[All Stores].[USA].[CA].[Beverly Hills], [Time].[1997].[Q1].[3]}\n" + + "{[Store].[All Stores].[USA].[CA].[Los Angeles], [Time].[1997].[Q1].[1]}\n" + + "{[Store].[All Stores].[USA].[CA].[Los Angeles], [Time].[1997].[Q1].[2]}\n" + + "{[Store].[All Stores].[USA].[CA].[Los Angeles], [Time].[1997].[Q1].[3]}\n" + + "{[Store].[All Stores].[USA].[CA].[San Francisco], [Time].[1997].[Q1].[1]}\n" + + "{[Store].[All Stores].[USA].[CA].[San Francisco], [Time].[1997].[Q1].[2]}\n" + + "{[Store].[All Stores].[USA].[CA].[San Francisco], [Time].[1997].[Q1].[3]}\n" + + "Row #0: \n" + + "Row #0: \n" + + "Row #1: \n" + + "Row #1: \n" + + "Row #2: \n" + + "Row #2: \n" + + "Row #3: 22\n" + + "Row #3: 63\n" + + "Row #4: 28\n" + + "Row #4: 59\n" + + "Row #5: 28\n" + + "Row #5: 39\n" + + "Row #6: 70\n" + + "Row #6: 51\n" + + "Row #7: 89\n" + + "Row #7: 51\n" + + "Row #8: 27\n" + + "Row #8: 54\n" + + "Row #9: 6\n" + + "Row #9: 2\n" + + "Row #10: 3\n" + + "Row #10: 7\n" + + "Row #11: 2\n" + + "Row #11: 10\n"), + s); + + } /** * Tests members from a parent-child hierarchy. *