[jboss-cvs] JBossAS SVN: r105328 - in projects/metadata/ear/trunk/src/test: resources/org/jboss/test/metadata/ear and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2010-05-28 05:40:00 -0400 (Fri, 28 May 2010)
New Revision: 105328

Modified:
   projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear6xEverythingUnitTestCase.java
   projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear6xEverything_testEverything.xml
Log:
JBMETA-285

Modified: projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear6xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear6xEverythingUnitTestCase.java	2010-05-28 08:10:58 UTC (rev 105327)
+++ projects/metadata/ear/trunk/src/test/java/org/jboss/test/metadata/ear/Ear6xEverythingUnitTestCase.java	2010-05-28 09:40:00 UTC (rev 105328)
@@ -318,7 +318,13 @@
       {
          assertNotNull(ds);
          String dsPrefix = "dataSource" + i;
-         assertDescriptions(dsPrefix, ds.getDescriptions());
+         //assertDescriptions(dsPrefix, ds.getDescriptions());
+         Descriptions desc = ds.getDescriptions();
+         assertNotNull(desc);
+         Description[] descArr = desc.value();
+         assertNotNull(descArr);
+         assertEquals(1, descArr.length);
+         assertEquals("en-" + dsPrefix + "-desc", descArr[0].value());
          assertEquals(dsPrefix + "Name", ds.getName());
          assertEquals(dsPrefix + "ClassName", ds.getClassName());
          assertEquals(dsPrefix + "ServerName", ds.getServerName());

Modified: projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear6xEverything_testEverything.xml
===================================================================
--- projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear6xEverything_testEverything.xml	2010-05-28 08:10:58 UTC (rev 105327)
+++ projects/metadata/ear/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear6xEverything_testEverything.xml	2010-05-28 09:40:00 UTC (rev 105328)
@@ -432,8 +432,10 @@
 
       <data-source>
          <description>en-dataSource1-desc</description>
+<!--
          <description xml:lang="fr">fr-dataSource1-desc</description>
          <description xml:lang="de">de-dataSource1-desc</description>
+-->
          <name>dataSource1Name</name>
          <class-name>dataSource1ClassName</class-name>
          <server-name>dataSource1ServerName</server-name>
@@ -461,8 +463,10 @@
       </data-source>
       <data-source>
          <description>en-dataSource2-desc</description>
+<!--
          <description xml:lang="fr">fr-dataSource2-desc</description>
          <description xml:lang="de">de-dataSource2-desc</description>
+-->
          <name>dataSource2Name</name>
          <class-name>dataSource2ClassName</class-name>
          <server-name>dataSource2ServerName</server-name>