prickett 2002/11/22 15:37:26
Modified:
periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database
DriverContentHandler.java
PeriodicityDriverService.java
periodicity/src/plugins-build/database/src/test/org/apache/commons/periodicity/database
DriverServiceConfigEmptyTest.java
DriverServiceGetInitTest.java
Log:
Added and attempted to initialize TurbineServices in
DriverServiceGetInitTest
Revision Changes Path
1.5 +18 -20
jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DriverContentHandler.java
Index: DriverContentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/DriverContentHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DriverContentHandler.java 27 Oct 2002 12:22:39 -0000 1.4
+++ DriverContentHandler.java 22 Nov 2002 23:37:26 -0000 1.5
@@ -68,6 +68,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import org.apache.commons.periodicity.util.JUnitUtils;
public class DriverContentHandler extends DefaultHandler
{
@@ -109,9 +110,6 @@
/** A flag to tell us whether we should process protocols */
private boolean processProtocol = false;
- /** A variable to hold the name of the current jdbc driver */
- private String name = null;
-
/** A variable to hold the url scheme for the current jdbc protocol */
private String scheme = null;
@@ -146,7 +144,15 @@
String rawName = attributes.getValue(NAME_QNAME_ATTRIBUTE);
if(rawName != null)
{
- name = rawName;
+ try
+ {
+ driverMeta = new DriverMetaDataImpl(rawName);
+ }
+ catch(Exception e)
+ {
+ throw new SAXException(
+ JUnitUtils.getStackTraceAsString(e));
+ }
}
else if(rawName == null)
{
@@ -155,7 +161,7 @@
}
else
{
- throw new SAXException("UNEXPECTED EXCEPTION");
+ throw new SAXException("UNEXPECTED EXCEPTION 1");
}
}
else if(attributes == null)
@@ -165,7 +171,7 @@
}
else
{
- throw new SAXException("UNEXPECTED EXCEPTION");
+ throw new SAXException("UNEXPECTED EXCEPTION 2");
}
}
else if(lookForDrivers && qName != null)
@@ -176,10 +182,6 @@
{
throw new SAXException("qName == null");
}
- else
- {
- throw new SAXException("UNEXPECTED EXCEPTION");
- }
}
public void endElement(String uri, String localName, String qName)
@@ -217,7 +219,7 @@
}
else
{
- throw new Exception("UNEXPECTED EXCEPTION");
+ throw new Exception("UNEXPECTED EXCEPTION 4");
}
}
else if(lookForDrivers && !processProtocol && qName != null &&
@@ -250,15 +252,11 @@
{
throw new SAXException("qName == null");
}
- else
- {
- throw new SAXException("Unrecognized driver element \n" +
- "qName = \"" + qName + "\".");
- }
}
catch(Exception e)
{
- throw new SAXException(e.getMessage());
+ throw new SAXException(
+ JUnitUtils.getStackTraceAsString(e));
}
finally
{
1.4 +6 -4
jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/PeriodicityDriverService.java
Index: PeriodicityDriverService.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/java/org/apache/commons/periodicity/database/PeriodicityDriverService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PeriodicityDriverService.java 22 Nov 2002 16:23:21 -0000 1.3
+++ PeriodicityDriverService.java 22 Nov 2002 23:37:26 -0000 1.4
@@ -75,6 +75,7 @@
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.periodicity.util.JUnitUtils;
class PeriodicityDriverService extends BaseService
{
@@ -208,7 +209,8 @@
}
catch(Exception e)
{
- throw new InitializationException(e.toString());
+ throw new InitializationException(
+ JUnitUtils.getStackTraceAsString(e));
}
}
else if(factory == null)
1.5 +5 -4
jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/test/org/apache/commons/periodicity/database/DriverServiceConfigEmptyTest.java
Index: DriverServiceConfigEmptyTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/test/org/apache/commons/periodicity/database/DriverServiceConfigEmptyTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DriverServiceConfigEmptyTest.java 24 Oct 2002 20:10:03 -0000 1.4
+++ DriverServiceConfigEmptyTest.java 22 Nov 2002 23:37:26 -0000 1.5
@@ -80,9 +80,10 @@
{
try
{
+ BaseConfiguration config = new BaseConfiguration();
TestDriverService driverService = new TestDriverService(
DriverMetaDataService.SERVICE_NAME,
- new BaseConfiguration());
+ config);
driverService.init();
fail("A Driver Meta Data Service with an empty configuration " +
"should throw an exception.");
1.4 +43 -14
jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/test/org/apache/commons/periodicity/database/DriverServiceGetInitTest.java
Index: DriverServiceGetInitTest.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/plugins-build/database/src/test/org/apache/commons/periodicity/database/DriverServiceGetInitTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DriverServiceGetInitTest.java 24 Oct 2002 03:24:16 -0000 1.3
+++ DriverServiceGetInitTest.java 22 Nov 2002 23:37:26 -0000 1.4
@@ -66,6 +66,8 @@
import junit.framework.Test;
import junit.framework.TestCase;
import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.fulcrum.TurbineServices;
+import org.apache.fulcrum.ServiceManager;
import org.apache.commons.periodicity.util.JUnitUtils;
@@ -74,7 +76,17 @@
public static final String TEST_NAME =
"DriverServiceGetInitTest.getInit()";
- public static final String FILE_NAME = "project.xml";
+
+ public static final String FILE_NAME = "./src/xml/databases.xml";
+
+ public static final String PERIODICITY_DRIVER_SERVICE_CLASS_NAME_KEY =
+ "services.PeriodicityDriverService.classname";
+
+ public static final String PERIODICITY_DRIVER_SERVICE_CLASS_NAME =
+ "org.apache.commons.periodicity.database.PeriodicityDriverService";
+
+ public static final String PERIODICITY_DRIVER_SERVICE_NAME =
+ "PeriodicityDriverService";
public DriverServiceGetInitTest(String name)
{
@@ -85,16 +97,33 @@
{
try
{
- BaseConfiguration config = new BaseConfiguration();
- config.addProperty(
- PeriodicityDriverService.DATABASE_META_DATA_FILE_KEY,
- FILE_NAME);
- TestDriverService driverService = new TestDriverService(
- DriverMetaDataService.SERVICE_NAME,
- config);
- driverService.init();
- assertTrue("Service should have been initialized.",
- driverService.isInitialized());
+ ServiceManager turbineServices =
+ TurbineServices.getInstance();
+ if(turbineServices != null)
+ {
+ BaseConfiguration turbineConfig = new BaseConfiguration();
+ turbineConfig.addProperty(
+ PERIODICITY_DRIVER_SERVICE_CLASS_NAME_KEY,
+ PERIODICITY_DRIVER_SERVICE_CLASS_NAME);
+ turbineServices.setConfiguration(turbineConfig);
+ turbineServices.init();
+ turbineServices.initService(
+ PERIODICITY_DRIVER_SERVICE_NAME);
+ BaseConfiguration config = new BaseConfiguration();
+ config.addProperty(
+ PeriodicityDriverService.DATABASE_META_DATA_FILE_KEY,
+ FILE_NAME);
+ TestDriverService driverService = new TestDriverService(
+ DriverMetaDataService.SERVICE_NAME,
+ config);
+ driverService.init();
+ assertTrue("Service should have been initialized.",
+ driverService.isInitialized());
+ }
+ else
+ {
+ fail("turbineServices == null");
+ }
}
catch(Exception e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
