[jboss-cvs] JBossAS SVN: r66183 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/ear and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 16 11:20:14 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-16 11:20:14 -0400 (Tue, 16 Oct 2007)
New Revision: 66183
Added:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
Log:
Update description group test and drop unused tests
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2007-10-16 14:56:44 UTC (rev 66182)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ear/Ear5xUnitTestCase.java 2007-10-16 15:20:14 UTC (rev 66183)
@@ -81,7 +81,7 @@
assertTrue(result.isEE5());
}
- public void testDescriptionDefaultLanguage() throws Exception
+ public void testDescriptionGroup() throws Exception
{
Ear5xMetaData result = unmarshal();
DescriptionGroupMetaData group = result.getDescriptionGroup();
@@ -89,41 +89,51 @@
Descriptions descriptions = group.getDescriptions();
assertNotNull(descriptions);
- DescriptionImpl hello = new DescriptionImpl();
- hello.setDescription("Hello");
- assertEquals(new Description[] { hello }, descriptions.value());
- }
-
- public void testDisplayNameDefaultLanguage() throws Exception
- {
- Ear5xMetaData 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
- {
- Ear5xMetaData 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
- {
- Ear5xMetaData result = unmarshal();
- }
-
}
Added: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml 2007-10-16 15:20:14 UTC (rev 66183)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-test-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>
+ <module id="java0">
+ <java>client0.jar</java>
+ </module>
+ <module id="ejb0">
+ <ejb>ejb-jar0.jar</ejb>
+ </module>
+ <module id="ejb1">
+ <ejb>ejb-jar1.jar</ejb>
+ </module>
+ <module id="web0">
+ <web>
+ <web-uri>web-app0.war</web-uri>
+ <context-root>/web0</context-root>
+ </web>
+ </module>
+ <module id="web1">
+ <web>
+ <web-uri>web-app1.war</web-uri>
+ <context-root>/web1</context-root>
+ </web>
+ </module>
+ <security-role id="security-role0">
+ <role-name>role0</role-name>
+ </security-role>
+ <security-role id="security-role1">
+ <role-name>role1</role-name>
+ </security-role>
+ <library-directory id="library-directory0">lib0</library-directory>
+</application>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ear/Ear5x_testDescriptionGroup.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
More information about the jboss-cvs-commits
mailing list