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

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

Author: scott.stark at jboss.org
Date: 2007-10-16 11:27:55 -0400 (Tue, 16 Oct 2007)
New Revision: 66184

Added:
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml
Modified:
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
Log:
Update description group test and drop unused tests

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-10-16 15:20:14 UTC (rev 66183)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear4xUnitTestCase.java	2007-10-16 15:27:55 UTC (rev 66184)
@@ -99,14 +99,8 @@
       assertFalse(result.isEE14());
       assertFalse(result.isEE5());
    }
-   public void testJBossVersion50() throws Exception
-   {
-      JBossAppMetaData result = unmarshal(JBossAppMetaData.class);
-      assertEquals("jboss-app_5_0-id", result.getId());
-      assertEquals("5.0", result.getVersion());
-   }
 
-   public void testDescriptionDefaultLanguage() throws Exception
+   public void testDescriptionGroup() throws Exception
    {
       EarMetaData result = unmarshal();
       DescriptionGroupMetaData group = result.getDescriptionGroup();
@@ -114,41 +108,52 @@
       Descriptions descriptions = group.getDescriptions();
       assertNotNull(descriptions);
       
-      DescriptionImpl hello = new DescriptionImpl();
-      hello.setDescription("Hello");
-      assertEquals(new Description[] { hello }, descriptions.value());
-   }
-   
-   public void testDisplayNameDefaultLanguage() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      DescriptionGroupMetaData group = result.getDescriptionGroup();
-      assertNotNull(group);
+      DescriptionImpl en = new DescriptionImpl();
+      en.setDescription("en-ear-desc");
+      DescriptionImpl de = new DescriptionImpl();
+      de.setDescription("de-ear-desc");
+      de.setLanguage("de");
+      DescriptionImpl fr = new DescriptionImpl();
+      fr.setDescription("fr-ear-desc");
+      fr.setLanguage("fr");
+      
+      Description[] expected = {en, fr, de};
+      assertEquals(expected, descriptions.value());
+
       DisplayNames displayNames = group.getDisplayNames();
       assertNotNull(displayNames);
       
-      DisplayNameImpl hello = new DisplayNameImpl();
-      hello.setDisplayName("Hello");
-      assertEquals(new DisplayName[] { hello }, displayNames.value());
-   }
-   
-   public void testIconDefaultLanguage() throws Exception
-   {
-      EarMetaData result = unmarshal();
-      DescriptionGroupMetaData group = result.getDescriptionGroup();
-      assertNotNull(group);
+      DisplayNameImpl endn = new DisplayNameImpl();
+      endn.setDisplayName("en-ear-disp");
+      DisplayNameImpl frdn = new DisplayNameImpl();
+      frdn.setDisplayName("fr-ear-disp");
+      frdn.setLanguage("fr");
+      DisplayNameImpl dedn = new DisplayNameImpl();
+      dedn.setDisplayName("de-ear-disp");
+      dedn.setLanguage("de");
+
+      DisplayName[] expecteddns = {endn, frdn, dedn};
+      assertEquals(expecteddns, displayNames.value());
+
       Icons icons = group.getIcons();
       assertNotNull(icons);
+      IconImpl enicn = new IconImpl();
+      enicn.setId("en-ear-icon-id");
+      enicn.setSmallIcon("en-ear-small-icon");
+      enicn.setLargeIcon("en-ear-large-icon");
+      IconImpl fricn = new IconImpl();
+      fricn.setLanguage("fr");
+      fricn.setId("fr-ear-icon-id");
+      fricn.setSmallIcon("fr-ear-small-icon");
+      fricn.setLargeIcon("fr-ear-large-icon");
+      IconImpl deicn = new IconImpl();
+      deicn.setLanguage("de");
+      deicn.setId("de-ear-icon-id");
+      deicn.setSmallIcon("de-ear-small-icon");
+      deicn.setLargeIcon("de-ear-large-icon");
       
-      IconImpl icon = new IconImpl();
-      icon.setSmallIcon("small");
-      icon.setLargeIcon("large");
-      assertEquals(new Icon[] { icon }, icons.value());
+      Icon[] expectedicns = {enicn, fricn, deicn};
+      assertEquals(expectedicns, icons.value());
    }
-   
-   public void testModules() throws Exception
-   {
-      EarMetaData result = unmarshal();
-   }
 
 }

Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml	                        (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml	2007-10-16 15:27:55 UTC (rev 66184)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
+    version="1.4" id="application_1_4-id">
+
+    <description>en-ear-desc</description>
+    <description xml:lang="fr">fr-ear-desc</description>
+    <description xml:lang="de">de-ear-desc</description>
+    <display-name>en-ear-disp</display-name>
+    <display-name xml:lang="fr">fr-ear-disp</display-name>
+    <display-name xml:lang="de">de-ear-disp</display-name>
+    <icon id="en-ear-icon-id">
+        <small-icon>en-ear-small-icon</small-icon>
+        <large-icon>en-ear-large-icon</large-icon>
+    </icon>
+    <icon xml:lang="fr" id="fr-ear-icon-id">
+        <small-icon>fr-ear-small-icon</small-icon>
+        <large-icon>fr-ear-large-icon</large-icon>
+    </icon>
+    <icon xml:lang="de" id="de-ear-icon-id">
+        <small-icon>de-ear-small-icon</small-icon>
+        <large-icon>de-ear-large-icon</large-icon>
+    </icon>
+
+    <module id="connector0">
+        <connector>rar0.rar</connector>
+    </module>
+</application>


Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear4x_testDescriptionGroup.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF