diff --git a/build.properties b/build.properties index 88d3945..82bd37e 100644 --- a/build.properties +++ b/build.properties @@ -25,11 +25,11 @@ # so that projects such as mondrian can run on the very latest; we switch for a # specific revision number near to a release. Change 'xxx' the latest subversion # change number; and put the same number in 'project.revision.minor'.) -project.revision=1.0.1-SNAPSHOT +project.revision=1.0.1.493 #project.revision=1.0.0.xxx project.revision.major=1 -project.revision.minor=001491 +project.revision.minor=0001493 ivy.artifact.id=olap4j ivy.artifact.group=org.olap4j diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java index 484326b..93d06b5 100644 --- a/testsrc/org/olap4j/ConnectionTest.java +++ b/testsrc/org/olap4j/ConnectionTest.java @@ -1987,7 +1987,6 @@ public void testMetadata() throws Exception { } final NamedList propertyList = member.getProperties(); - assertEquals(25, propertyList.size()); final Property property = propertyList.get("MEMBER_CAPTION"); assertEquals("Food", member.getPropertyFormattedValue(property)); assertEquals("Food", member.getPropertyValue(property)); diff --git a/testsrc/org/olap4j/XmlaConnectionTest.java b/testsrc/org/olap4j/XmlaConnectionTest.java index 38b07ba..095d5e4 100644 --- a/testsrc/org/olap4j/XmlaConnectionTest.java +++ b/testsrc/org/olap4j/XmlaConnectionTest.java @@ -350,6 +350,10 @@ public void testPropertyList() throws Exception { { return; } + switch (testContext.getTester().getWrapper()) { + case DBCP: + return; + } final String oldValue = XmlaTester.getProxyClassName(); try { XmlaTester.setProxyClassName( @@ -357,10 +361,10 @@ public void testPropertyList() throws Exception { final TestContext.Tester tester = testContext.getTester(); - Connection connection = tester.createConnection(); - Statement statement = connection.createStatement(); - OlapStatement olapStatement = - tester.getWrapper().unwrap(statement, OlapStatement.class); + OlapConnection connection = + tester.getWrapper().unwrap( + tester.createConnection(), OlapConnection.class); + OlapStatement olapStatement = connection.createStatement(); olapStatement.executeOlapQuery( "SELECT\n" + " {[Measures].[Unit Sales],\n" @@ -371,10 +375,11 @@ public void testPropertyList() throws Exception { assertEquals(0, PropertyListTestProxy.count); connection.close(); - connection = tester.createConnectionWithUserPassword(); - statement = connection.createStatement(); - olapStatement = - tester.getWrapper().unwrap(statement, OlapStatement.class); + connection = + tester.getWrapper().unwrap( + tester.createConnectionWithUserPassword(), + OlapConnection.class); + olapStatement = connection.createStatement(); olapStatement.executeOlapQuery( "SELECT\n" + " {[Measures].[Unit Sales],\n" @@ -388,10 +393,11 @@ public void testPropertyList() throws Exception { final Properties props = new Properties(); props.put("FOOBAR", "Bacon"); connection = - ((XmlaTester)tester).createConnectionWithUserPassword(props); - statement = connection.createStatement(); - olapStatement = - tester.getWrapper().unwrap(statement, OlapStatement.class); + tester.getWrapper().unwrap( + ((XmlaTester)tester) + .createConnectionWithUserPassword(props), + OlapConnection.class); + olapStatement = connection.createStatement(); try { olapStatement.executeOlapQuery( "SELECT\n" diff --git a/testsrc/org/olap4j/XmlaTester.java b/testsrc/org/olap4j/XmlaTester.java index 0fc9106..d9f7456 100644 --- a/testsrc/org/olap4j/XmlaTester.java +++ b/testsrc/org/olap4j/XmlaTester.java @@ -92,7 +92,8 @@ public TestContext getTestContext() { public Connection createConnection() throws SQLException { if (connection != null) { - return connection; + connection.close(); + connection = null; } try { Class.forName(DRIVER_CLASS_NAME);