[jbosscache-commits] JBoss Cache SVN: r6771 - core/trunk/src/test/java/org/jboss/cache/loader.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-09-22 11:40:47 -0400 (Mon, 22 Sep 2008)
New Revision: 6771

Modified:
   core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
Log:
Allow for unset/null JDBC props

Modified: core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java	2008-09-22 15:34:46 UTC (rev 6770)
+++ core/trunk/src/test/java/org/jboss/cache/loader/JDBCCacheLoaderTest.java	2008-09-22 15:40:47 UTC (rev 6771)
@@ -32,20 +32,28 @@
    protected void configureCache() throws Exception
    {
       Properties prop = getProperties();
+      String props = props2String(prop);
 
-      String props = "cache.jdbc.driver =" + prop.getProperty("cache.jdbc.driver") + "\n" +
-            "cache.jdbc.url=" + prop.getProperty("cache.jdbc.url") + "\n" +
-            "cache.jdbc.user=" + prop.getProperty("cache.jdbc.user") + "\n" +
-            "cache.jdbc.password=" + prop.getProperty("cache.jdbc.password") + "\n" +
-            "cache.jdbc.node.type=" + prop.getProperty("cache.jdbc.node.type") + "\n" +
-            "cache.jdbc.sql-concat=" + prop.getProperty("cache.jdbc.sql-concat") + "\n" +
-            "cache.jdbc.table.name=" + prop.getProperty("cache.jdbc.table.name") + "\n" +
-            "cache.jdbc.table.drop=false";
+      cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", JDBCCacheLoader.class.getName(), props, false, true, false));
+   }
 
-      // make sure dropTable is false!!
+   private String props2String(Properties prop)
+   {
+      StringBuilder p = new StringBuilder();
+      append("cache.jdbc.driver", prop, p);
+      append("cache.jdbc.url", prop, p);
+      append("cache.jdbc.user", prop, p);
+      append("cache.jdbc.password", prop, p);
+      append("cache.jdbc.node.type", prop, p);
+      append("cache.jdbc.sql-concat", prop, p);
+      append("cache.jdbc.table.name", prop, p);
+      return p.toString();
+   }
 
-      cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("",
-            "org.jboss.cache.loader.JDBCCacheLoader", props, false, true, false));
+   private void append(String propertyName, Properties prop, StringBuilder builder)
+   {
+      if (prop.containsKey(propertyName))
+         builder.append(propertyName).append("=").append(prop.getProperty(propertyName)).append("\n");
    }
 
    public void testLargeObject()