[jboss-cvs] JBossAS SVN: r107533 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/ds and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: maeste
Date: 2010-08-11 05:52:32 -0400 (Wed, 11 Aug 2010)
New Revision: 107533

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
   projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/DsParserTestCase.java
Log:
JBJCA-400 Parser implementation bug fixing and adding test case for all examples parsing

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java	2010-08-11 09:51:40 UTC (rev 107532)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java	2010-08-11 09:52:32 UTC (rev 107533)
@@ -43,8 +43,8 @@
     */
    protected boolean elementAsBoolean(XMLStreamReader reader) throws XMLStreamException
    {
-      return reader.getElementText() == null || reader.getElementText().length() == 0 ? true : Boolean.valueOf(reader
-            .getElementText().trim());
+      String elementtext = reader.getElementText();
+      return elementtext == null || elementtext.length() == 0 ? true : Boolean.valueOf(elementtext.trim());
    }
 
    /**
@@ -72,7 +72,8 @@
     */
    protected String elementAsString(XMLStreamReader reader) throws XMLStreamException
    {
-      return reader.getElementText() == null ? null : reader.getElementText().trim();
+      String elementtext = reader.getElementText();
+      return elementtext == null ? null : elementtext.trim();
    }
 
    /**
@@ -103,7 +104,8 @@
       integerValue = null;
       try
       {
-         integerValue = Integer.valueOf(reader.getElementText().trim());
+
+         integerValue = Integer.valueOf(elementAsString(reader));
       }
       catch (NumberFormatException nfe)
       {
@@ -126,7 +128,7 @@
       longValue = null;
       try
       {
-         longValue = Long.valueOf(reader.getElementText().trim());
+         longValue = Long.valueOf(elementAsString(reader));
       }
       catch (NumberFormatException nfe)
       {

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-08-11 09:51:40 UTC (rev 107532)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java	2010-08-11 09:52:32 UTC (rev 107533)
@@ -241,8 +241,7 @@
                switch (XaDataSource.Tag.forName(reader.getLocalName()))
                {
                   case XADATASOURCEPROPERTY : {
-                     xaDataSourceProperty.put(reader.getAttributeValue("", "name"),
-                           reader.getAttributeValue("", "value"));
+                     xaDataSourceProperty.put(attributeAsString(reader, "name"), elementAsString(reader));
                      break;
                   }
                   case XADATASOURCECLASS : {
@@ -456,8 +455,7 @@
                switch (DataSource.Tag.forName(reader.getLocalName()))
                {
                   case CONNECTIONPROPERTY : {
-                     connectionProperties.put(reader.getAttributeValue("", "name"),
-                           reader.getAttributeValue("", "value"));
+                     connectionProperties.put(attributeAsString(reader, "name"), elementAsString(reader));
                      break;
                   }
                   case CONNECTIONURL : {

Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/DsParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/DsParserTestCase.java	2010-08-11 09:51:40 UTC (rev 107532)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ra/DsParserTestCase.java	2010-08-11 09:52:32 UTC (rev 107533)
@@ -27,6 +27,8 @@
 import java.io.File;
 import java.io.FileInputStream;
 
+import org.jboss.util.file.FileSuffixFilter;
+
 import org.junit.Test;
 
 import static org.hamcrest.core.Is.is;
@@ -42,33 +44,35 @@
 public class DsParserTestCase
 {
    /**
-    * shouldParseJbossRa10WithSingleProperty
+    * shouldParseAnyExample
     * @throws Exception in case of error
     */
    @Test
-   public void shouldParseJbossRa10WithSingleProperty() throws Exception
+   public void shouldParseAnyExample() throws Exception
    {
       FileInputStream is = null;
-      try
+
+      //given
+      File directory = new File(Thread.currentThread().getContextClassLoader().getResource("ds").toURI());
+      for (File xmlFile : directory.listFiles(new FileSuffixFilter("-ds.xml")))
       {
-         //given
-         File xmlFile = new File(Thread.currentThread().getContextClassLoader()
-               .getResource("ds/db2-ds.xml").toURI());
-         is = new FileInputStream(xmlFile);
-         DsParser parser = new DsParser();
-         //when
-         DataSources ds = parser.parse(is);
-         //then
-         assertThat(ds.getDatasource().size(), is(1));
+         System.out.println(xmlFile.getName());
+         try
+         {
+            is = new FileInputStream(xmlFile);
+            DsParser parser = new DsParser();
+            //when
+            DataSources ds = parser.parse(is);
+            //then
+            assertThat(ds.getDatasource().size() + ds.getXaDataSource().size(), is(1));
 
-
+         }
+         finally
+         {
+            if (is != null)
+               is.close();
+         }
       }
-      finally
-      {
-         if (is != null)
-            is.close();
-      }
    }
 
-
 }