Author: maschmid
Date: 2012-07-27 07:32:28 -0400 (Fri, 27 Jul 2012)
New Revision: 15005
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component1.java
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component2.java
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/PrecedenceComponentTest.java
Log:
JBPAPP-8159 update PrecedenceComponentTest to verify default values behavior
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml 2012-07-27
11:14:27 UTC (rev 15004)
+++
branches/enterprise/JBPAPP_5_0/src/test/integration/resources/WEB-INF/components.xml 2012-07-27
11:32:28 UTC (rev 15005)
@@ -59,5 +59,6 @@
</component>
<component name="component1"
class="org.jboss.seam.test.integration.Component1"
precedence="10">
<property name="name">Component1Low</property>
+ <property
name="defaultValue">Component1override</property>
</component>
</components>
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component1.java
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component1.java 2012-07-27
11:14:27 UTC (rev 15004)
+++
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component1.java 2012-07-27
11:32:28 UTC (rev 15005)
@@ -4,6 +4,7 @@
{
private String name;
+ private String defaultValue = "Component1default";
public String getName()
{
@@ -14,5 +15,15 @@
{
this.name = name;
}
-
+
+ public String getDefaultValue()
+ {
+ return defaultValue;
+ }
+
+ public void setDefaultValue(String defaultValue)
+ {
+ this.defaultValue = defaultValue;
+ }
+
}
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component2.java
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component2.java 2012-07-27
11:14:27 UTC (rev 15004)
+++
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/Component2.java 2012-07-27
11:32:28 UTC (rev 15005)
@@ -4,6 +4,7 @@
{
private String name;
+ private String defaultValue = "Component2default";
public String getName()
{
@@ -14,5 +15,15 @@
{
this.name = name;
}
-
+
+ public String getDefaultValue()
+ {
+ return defaultValue;
+ }
+
+ public void setDefaultValue(String defaultValue)
+ {
+ this.defaultValue = defaultValue;
+ }
+
}
Modified:
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/PrecedenceComponentTest.java
===================================================================
---
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/PrecedenceComponentTest.java 2012-07-27
11:14:27 UTC (rev 15004)
+++
branches/enterprise/JBPAPP_5_0/src/test/integration/src/org/jboss/seam/test/integration/PrecedenceComponentTest.java 2012-07-27
11:32:28 UTC (rev 15005)
@@ -34,8 +34,9 @@
}
Component2 myPrecedenceComponent = (Component2) component;
Assert.assertEquals(myPrecedenceComponent.getName(),
"Component1High");
+ Assert.assertEquals(myPrecedenceComponent.getDefaultValue(),
"Component2default");
}
}.run();
}
-}
\ No newline at end of file
+}