From d533c9e82ffdc0624c05e76e47fad934c8e419a9 Mon Sep 17 00:00:00 2001 From: Julian Hyde Date: Fri, 1 Feb 2013 14:51:42 -0800 Subject: [PATCH] Remove dependency on MySQL JDBC driver. --- testsrc/org/olap4j/ConnectionTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testsrc/org/olap4j/ConnectionTest.java b/testsrc/org/olap4j/ConnectionTest.java index 8be564d..2547ef3 100644 --- a/testsrc/org/olap4j/ConnectionTest.java +++ b/testsrc/org/olap4j/ConnectionTest.java @@ -28,8 +28,6 @@ import org.olap4j.test.TestContext.Tester.Flavor; import org.olap4j.type.*; -import com.mysql.jdbc.StringUtils; - import junit.framework.AssertionFailedError; import junit.framework.TestCase; @@ -1989,8 +1987,7 @@ public void testMetadata() throws Exception { assertEquals("Food", member.getCaption()); - assertTrue( - StringUtils.isNullOrEmpty(member.getDescription())); + assertTrue(isNullOrEmpty(member.getDescription())); assertEquals(1, member.getOrdinal()); assertEquals(1, member.getDepth()); assertEquals(-1, member.getSolveOrder()); @@ -2092,6 +2089,10 @@ public void testMetadata() throws Exception { measureNameSet); } + private static boolean isNullOrEmpty(String s) { + return s == null || s.equals(""); + } + /** * Test case for {@link org.olap4j.metadata.Schema#getSharedDimensions()}. * Bug 3375355, "getSharedDimensions returns empty result".