[jboss-cvs] JBossAS SVN: r108145 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/ironjacamar and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 15 08:41:44 EDT 2010
Author: maeste
Date: 2010-09-15 08:41:43 -0400 (Wed, 15 Sep 2010)
New Revision: 108145
Added:
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-empty.xml
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/empty-ra.xml
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
Log:
merging testsuite
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java 2010-09-15 06:19:08 UTC (rev 108144)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java 2010-09-15 12:41:43 UTC (rev 108145)
@@ -95,7 +95,7 @@
}
else
{
- this.connectionDefinitions = new ArrayList<CommonConnDef>(0);
+ this.connectionDefinitions = null;
}
if (adminObjects != null)
@@ -105,7 +105,7 @@
}
else
{
- this.adminObjects = new ArrayList<CommonAdminObject>(0);
+ this.adminObjects = null;
}
if (configProperties != null)
{
@@ -114,7 +114,7 @@
}
else
{
- this.configProperties = new HashMap<String, String>(0);
+ this.configProperties = null;
}
if (beanValidationGroups != null)
{
@@ -123,7 +123,7 @@
}
else
{
- this.beanValidationGroups = new ArrayList<String>(0);
+ this.beanValidationGroups = null;
}
this.bootstrapContext = bootstrapContext;
@@ -148,7 +148,7 @@
@Override
public final List<CommonConnDef> getConnectionDefinitions()
{
- return Collections.unmodifiableList(connectionDefinitions);
+ return connectionDefinitions == null ? null : Collections.unmodifiableList(connectionDefinitions);
}
/**
@@ -159,7 +159,7 @@
@Override
public final List<CommonAdminObject> getAdminObjects()
{
- return Collections.unmodifiableList(adminObjects);
+ return adminObjects == null ? null : Collections.unmodifiableList(adminObjects);
}
/**
@@ -170,7 +170,7 @@
@Override
public Map<String, String> getConfigProperties()
{
- return Collections.unmodifiableMap(configProperties);
+ return configProperties == null ? null : Collections.unmodifiableMap(configProperties);
}
/**
@@ -181,7 +181,7 @@
@Override
public final List<String> getBeanValidationGroups()
{
- return Collections.unmodifiableList(beanValidationGroups);
+ return beanValidationGroups == null ? null : Collections.unmodifiableList(beanValidationGroups);
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java 2010-09-15 06:19:08 UTC (rev 108144)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java 2010-09-15 12:41:43 UTC (rev 108145)
@@ -111,12 +111,12 @@
private IronJacamar parseIronJacamar(XMLStreamReader reader) throws XMLStreamException, ParserException
{
- ArrayList<CommonConnDef> connectionDefinitions = new ArrayList<CommonConnDef>();
- ArrayList<CommonAdminObject> adminObjects = new ArrayList<CommonAdminObject>();
- ArrayList<String> beanValidationGroups = new ArrayList<String>();
+ ArrayList<CommonConnDef> connectionDefinitions = null;
+ ArrayList<CommonAdminObject> adminObjects = null;
+ ArrayList<String> beanValidationGroups = null;
String bootstrapContext = null;
TransactionSupportEnum transactionSupport = null;
- HashMap<String, String> configProperties = new HashMap<String, String>();
+ HashMap<String, String> configProperties = null;
while (reader.hasNext())
{
switch (reader.nextTag())
@@ -146,15 +146,21 @@
break;
}
case ADMIN_OBJECT : {
+ if (adminObjects == null)
+ adminObjects = new ArrayList<CommonAdminObject>();
adminObjects.add(parseAdminObjects(reader));
break;
}
case CONNECTION_DEFINITION : {
+ if (connectionDefinitions == null)
+ connectionDefinitions = new ArrayList<CommonConnDef>();
connectionDefinitions.add(parseConnectionDefinitions(reader));
break;
}
case BEAN_VALIDATION_GROUP : {
+ if (beanValidationGroups == null)
+ beanValidationGroups = new ArrayList<String>();
beanValidationGroups.add(elementAsString(reader));
break;
}
@@ -163,6 +169,8 @@
break;
}
case CONFIG_PROPERTY : {
+ if (configProperties == null)
+ configProperties = new HashMap<String, String>();
configProperties.put(attributeAsString(reader, "name"), elementAsString(reader));
break;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-09-15 06:19:08 UTC (rev 108144)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-09-15 12:41:43 UTC (rev 108145)
@@ -150,13 +150,13 @@
private ResourceAdapter parseResourceAdapter(XMLStreamReader reader) throws XMLStreamException, ParserException
{
- ArrayList<CommonConnDef> connectionDefinitions = new ArrayList<CommonConnDef>();
- ArrayList<CommonAdminObject> adminObjects = new ArrayList<CommonAdminObject>();
- ArrayList<String> beanValidationGroups = new ArrayList<String>();
+ ArrayList<CommonConnDef> connectionDefinitions = null;
+ ArrayList<CommonAdminObject> adminObjects = null;
+ ArrayList<String> beanValidationGroups = null;
String bootstrapContext = null;
String archive = null;
TransactionSupportEnum transactionSupport = null;
- HashMap<String, String> configProperties = new HashMap<String, String>();
+ HashMap<String, String> configProperties = null;
while (reader.hasNext())
{
switch (reader.nextTag())
@@ -186,15 +186,21 @@
break;
}
case ADMIN_OBJECT : {
+ if (adminObjects == null)
+ adminObjects = new ArrayList<CommonAdminObject>();
adminObjects.add(parseAdminObjects(reader));
break;
}
case CONNECTION_DEFINITION : {
+ if (connectionDefinitions == null)
+ connectionDefinitions = new ArrayList<CommonConnDef>();
connectionDefinitions.add(parseConnectionDefinitions(reader));
break;
}
case BEAN_VALIDATION_GROUP : {
+ if (beanValidationGroups == null)
+ beanValidationGroups = new ArrayList<String>();
beanValidationGroups.add(elementAsString(reader));
break;
}
@@ -203,6 +209,8 @@
break;
}
case CONFIG_PROPERTY : {
+ if (configProperties == null)
+ configProperties = new HashMap<String, String>();
configProperties.put(attributeAsString(reader, "name"), elementAsString(reader));
break;
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2010-09-15 06:19:08 UTC (rev 108144)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2010-09-15 12:41:43 UTC (rev 108145)
@@ -21,16 +21,22 @@
*/
package org.jboss.jca.common.metadata.ironjacamar;
+import org.jboss.jca.common.api.metadata.common.CommonAdminObject;
+import org.jboss.jca.common.api.metadata.common.CommonConnDef;
+import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import java.io.File;
import java.io.FileInputStream;
+import java.util.List;
+import java.util.Map;
import org.jboss.util.file.FilenamePrefixFilter;
+import org.hamcrest.core.IsNull;
import org.junit.Test;
-import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertThat;
/**
@@ -55,7 +61,6 @@
File directory = new File(Thread.currentThread().getContextClassLoader().getResource("ironjacamar").toURI());
for (File xmlFile : directory.listFiles(new FilenamePrefixFilter("ironjacamar-")))
{
- System.out.println(xmlFile.getName());
try
{
is = new FileInputStream(xmlFile);
@@ -63,7 +68,7 @@
//when
IronJacamar ij = parser.parse(is);
//then
- assertThat(ij.getConnectionDefinitions().size() >= 1, is(true));
+ assertThat(ij, not(new IsNull<IronJacamar>()));
}
finally
@@ -74,4 +79,41 @@
}
}
+ /**
+ *
+ * shouldParseEmptyFileAndHaveNullMDContents
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseEmptyFileAndHaveNullMDContents() throws Exception
+ {
+ FileInputStream is = null;
+
+ //given
+ File directory = new File(Thread.currentThread().getContextClassLoader().getResource("ironjacamar").toURI());
+ for (File xmlFile : directory.listFiles(new FilenamePrefixFilter("ironjacamar-empty.xml")))
+ {
+ try
+ {
+ is = new FileInputStream(xmlFile);
+ IronJacamarParser parser = new IronJacamarParser();
+ //when
+ IronJacamar ij = parser.parse(is);
+ //then
+ assertThat(ij.getAdminObjects(), new IsNull<List<CommonAdminObject>>());
+ assertThat(ij.getConfigProperties(), new IsNull<Map<String, String>>());
+ assertThat(ij.getBeanValidationGroups(), new IsNull<List<String>>());
+ assertThat(ij.getConnectionDefinitions(), new IsNull<List<CommonConnDef>>());
+ assertThat(ij.getBootstrapContext(), new IsNull<String>());
+ assertThat(ij.getTransactionSupport(), new IsNull<TransactionSupportEnum>());
+
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+ }
+ }
+ }
+
}
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2010-09-15 06:19:08 UTC (rev 108144)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2010-09-15 12:41:43 UTC (rev 108145)
@@ -21,13 +21,21 @@
*/
package org.jboss.jca.common.metadata.resourceadapter;
+import org.jboss.jca.common.api.metadata.common.CommonAdminObject;
+import org.jboss.jca.common.api.metadata.common.CommonConnDef;
+import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
+import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapter;
import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapters;
import java.io.File;
import java.io.FileInputStream;
+import java.util.List;
+import java.util.Map;
import org.jboss.util.file.FileSuffixFilter;
+import org.jboss.util.file.FilenamePrefixFilter;
+import org.hamcrest.core.IsNull;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
@@ -52,7 +60,8 @@
FileInputStream is = null;
//given
- File directory = new File(Thread.currentThread().getContextClassLoader().getResource("resource-adapter").toURI());
+ File directory = new File(Thread.currentThread().getContextClassLoader().getResource("resource-adapter")
+ .toURI());
for (File xmlFile : directory.listFiles(new FileSuffixFilter("-ra.xml")))
{
System.out.println(xmlFile.getName());
@@ -74,4 +83,43 @@
}
}
+ /**
+ *
+ * shouldParseEmptyFileAndHaveNullMDContents
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseEmptyFileAndHaveNullMDContents() throws Exception
+ {
+ FileInputStream is = null;
+
+ //given
+ File directory = new File(Thread.currentThread().getContextClassLoader().getResource("resource-adapter")
+ .toURI());
+ File xmlFile = directory.listFiles(new FilenamePrefixFilter("empty-ra.xml"))[0];
+ try
+ {
+ is = new FileInputStream(xmlFile);
+ ResourceAdapterParser parser = new ResourceAdapterParser();
+ //when
+ ResourceAdapters ra = parser.parse(is);
+ //then
+ assertThat(ra.getResourceAdapters().size() == 1, is(true));
+ ResourceAdapter res = ra.getResourceAdapters().get(0);
+ assertThat(res.getAdminObjects(), new IsNull<List<CommonAdminObject>>());
+ assertThat(res.getConfigProperties(), new IsNull<Map<String, String>>());
+ assertThat(res.getBeanValidationGroups(), new IsNull<List<String>>());
+ assertThat(res.getConnectionDefinitions(), new IsNull<List<CommonConnDef>>());
+ assertThat(res.getBootstrapContext(), new IsNull<String>());
+ assertThat(res.getTransactionSupport(), new IsNull<TransactionSupportEnum>());
+ assertThat(res.getArchive(), is("token"));
+
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+ }
+
+ }
}
Added: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-empty.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-empty.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-empty.xml 2010-09-15 12:41:43 UTC (rev 108145)
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../main/resources/schema/ironjacamar_1_0.xsd">
+</ironjacamar>
\ No newline at end of file
Added: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/empty-ra.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/empty-ra.xml (rev 0)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/empty-ra.xml 2010-09-15 12:41:43 UTC (rev 108145)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- configuration for aSAPXcess SAP adapter for jboss 3.2 -->
+<!-- ==================================================================== -->
+<!-- aSAPXcess adapter configuration for SAP R3 -->
+<!-- Contact: aif_support at asapsolutions.com -->
+<!-- -->
+<!-- ==================================================================== -->
+<resource-adapters xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../main/resources/schema/resource-adapter_1_0.xsd">
+ <resource-adapter>
+ <archive>token</archive>
+ </resource-adapter>
+</resource-adapters>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list