You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/08/31 00:14:46 UTC
svn commit: r438674 -
/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
Author: jdillon
Date: Wed Aug 30 15:14:46 2006
New Revision: 438674
URL: http://svn.apache.org/viewvc?rev=438674&view=rev
Log:
Drop commented bits that used old test data locations
Modified:
geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java?rev=438674&r1=438673&r2=438674&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/PlanParsingTest.java Wed Aug 30 15:14:46 2006
@@ -23,7 +23,6 @@
public void testLoadGeronimoDeploymentDescriptor10() throws Exception {
URL srcXml = classLoader.getResource("connector_1_0/geronimo-ra.xml");
-// File geronimoDD = new File(basedir, "src/test-data/connector_1_0/geronimo-ra.xml");
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
@@ -33,8 +32,6 @@
public void testLoadJ2eeDeploymentDescriptor() throws Exception {
URL srcXml = classLoader.getResource("connector_1_5/ra.xml");
-// File j2eeDD = new File(basedir, "src/test-data/connector_1_5/ra.xml");
-// assertTrue(j2eeDD.exists());
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
ConnectorDocument connectorDocument = (ConnectorDocument) plan.changeType(ConnectorDocument.type);
assertNotNull(connectorDocument.getConnector().getResourceadapter());
@@ -43,8 +40,6 @@
public void testLoadGeronimoDeploymentDescriptor15() throws Exception {
URL srcXml = classLoader.getResource("connector_1_5/geronimo-ra.xml");
-// File geronimoDD = new File(basedir, "src/test-data/connector_1_5/geronimo-ra.xml");
-// assertTrue(geronimoDD.exists());
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument connectorDocument = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
GerConnectorType connector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(connectorDocument, CONNECTOR_QNAME, GerConnectorType.type);
@@ -53,9 +48,6 @@
public void testResourceAdapterNameUniqueness() throws Exception {
URL srcXml = classLoader.getResource("data/dup-resourceadapter-name.xml");
-// File resourcePlan = new File(basedir, "src/test-data/data/dup-resourceadapter-name.xml");
-// assertTrue(resourcePlan.exists());
-
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
if (doc == null) {
@@ -71,9 +63,6 @@
public void testConnectionFactoryNameUniqueness() throws Exception {
URL srcXml = classLoader.getResource("data/dup-connectionfactoryinstance-name.xml");
-// File resourcePlan = new File(basedir, "src/test-data/data/dup-connectionfactoryinstance-name.xml");
-// assertTrue(resourcePlan.exists());
-
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
if (doc == null) {
@@ -89,9 +78,6 @@
public void testAdminObjectNameUniqueness() throws Exception {
URL srcXml = classLoader.getResource("data/dup-admin-object-name.xml");
-// File resourcePlan = new File(basedir, "src/test-data/data/dup-admin-object-name.xml");
-// assertTrue(resourcePlan.exists());
-
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
if (doc == null) {
@@ -107,9 +93,6 @@
public void testRectifyPlan() throws Exception {
URL srcXml = classLoader.getResource("data/old-schema-plan.xml");
-// File resourcePlan = new File(basedir, "src/test-data/data/old-schema-plan.xml");
-// assertTrue(resourcePlan.exists());
-
XmlObject plan = XmlBeansUtil.parse(srcXml, getClass().getClassLoader());
GerConnectorDocument doc = (GerConnectorDocument) plan.changeType(GerConnectorDocument.type);
if (doc == null) {
@@ -119,5 +102,4 @@
ConnectorPlanRectifier.rectifyPlan(gerConnector);
gerConnector = (GerConnectorType) SchemaConversionUtils.fixGeronimoSchema(gerConnector, CONNECTOR_QNAME, GerConnectorType.type);
}
-
}