[jboss-cvs] JBossAS SVN: r66732 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 5 08:54:50 EST 2007
Author: alex.loubyansky at jboss.com
Date: 2007-11-05 08:54:50 -0500 (Mon, 05 Nov 2007)
New Revision: 66732
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
Log:
fixed the default value for query result-type-mapping
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/QueryMetaData.java 2007-11-05 13:54:50 UTC (rev 66732)
@@ -43,7 +43,7 @@
private QueryMethodMetaData queryMethod;
/** The result type mapping */
- private ResultTypeMapping resultTypeMapping;
+ private ResultTypeMapping resultTypeMapping = ResultTypeMapping.Local;
/** The ejb ql */
private String ejbQL;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/AbstractEJBEverythingTest.java 2007-11-05 13:54:50 UTC (rev 66732)
@@ -362,7 +362,7 @@
assertExcludedMethods(ejbName, entity.getExcludedMethods());
assertSecurityRoleRefs(ejbName, 2, entity.getSecurityRoleReferences());
assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentityMetaData(), true);
- assertQueries(ejbName, 2, entity.getQueries());
+ assertQueries(ejbName, 3, entity.getQueries());
return entity;
}
@@ -426,7 +426,7 @@
String prefix = ejbName + "Query" + count;
assertEquals(prefix + "QueryMethod", query.getMethodName());
assertMethodParams(prefix + "QueryMethod", 2, query.getMethodParams());
- if (count == 1)
+ if (count == 1 || count == 3)
assertEquals("Local", query.getResultTypeMapping());
else
assertEquals("Remote", query.getResultTypeMapping());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar21EverythingUnitTestCase.java 2007-11-05 13:54:50 UTC (rev 66732)
@@ -209,7 +209,7 @@
assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
assertSecurityRoleRefs(ejbName, 2, entity.getSecurityRoleRefs());
assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true);
- assertQueries(ejbName, 2, entity.getQueries());
+ assertQueries(ejbName, 3, entity.getQueries());
}
private void assertCmpFields(String ejbName, int size, CMPFieldsMetaData cmpFieldsMetaData)
@@ -236,7 +236,7 @@
// en-entityMQueryN-desc
assertEquals("en-"+ejbName+"Query"+count+"-desc", query.getDescriptions().value()[0].value());
assertQueryMethod(ejbName + "Query" + count, 2, query.getQueryMethod());
- if (count == 1)
+ if (count == 1 || count == 3)
assertEquals(ResultTypeMapping.Local, query.getResultTypeMapping());
else
assertEquals(ResultTypeMapping.Remote, query.getResultTypeMapping());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java 2007-11-05 13:54:50 UTC (rev 66732)
@@ -273,7 +273,7 @@
assertExcludeList(ejbName, 5, 5, entity.getExcludeList());
assertSecurityRoleRefs(ejbName, 2, entity.getSecurityRoleRefs());
assertSecurityIdentity(ejbName, "SecurityIdentity", entity.getSecurityIdentity(), true);
- assertQueries(ejbName, 2, entity.getQueries());
+ assertQueries(ejbName, 3, entity.getQueries());
return entity;
}
@@ -300,7 +300,7 @@
{
assertId(ejbName + "Query" + count, query);
assertQueryMethod(ejbName + "Query" + count, 2, query.getQueryMethod());
- if (count == 1)
+ if (count == 1 || count == 3)
assertEquals(ResultTypeMapping.Local, query.getResultTypeMapping());
else
assertEquals(ResultTypeMapping.Remote, query.getResultTypeMapping());
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-11-05 13:54:50 UTC (rev 66732)
@@ -680,6 +680,18 @@
<result-type-mapping>Remote</result-type-mapping>
<ejb-ql>entity1Query2EjbQL</ejb-ql>
</query>
+ <query id="entity1Query3-id">
+ <description>en-entity1Query3-desc</description>
+ <query-method id="entity1Query3QueryMethod-id">
+ <method-name>entity1Query3QueryMethod</method-name>
+ <method-params>
+ <method-param>entity1Query3QueryMethodParam1</method-param>
+ <method-param>entity1Query3QueryMethodParam2</method-param>
+ </method-params>
+ </query-method>
+ <!-- test default value <result-type-mapping>Local</result-type-mapping> -->
+ <ejb-ql>entity1Query3EjbQL</ejb-ql>
+ </query>
</entity>
@@ -906,6 +918,18 @@
<result-type-mapping>Remote</result-type-mapping>
<ejb-ql>entity2Query2EjbQL</ejb-ql>
</query>
+ <query id="entity2Query3-id">
+ <description>en-entity2Query3-desc</description>
+ <query-method id="entity2Query3QueryMethod-id">
+ <method-name>entity2Query3QueryMethod</method-name>
+ <method-params>
+ <method-param>entity2Query3QueryMethodParam1</method-param>
+ <method-param>entity2Query3QueryMethodParam2</method-param>
+ </method-params>
+ </query-method>
+ <!-- test default value <result-type-mapping>Local</result-type-mapping> -->
+ <ejb-ql>entity2Query3EjbQL</ejb-ql>
+ </query>
</entity>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-11-05 13:46:58 UTC (rev 66731)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-11-05 13:54:50 UTC (rev 66732)
@@ -1464,6 +1464,18 @@
<result-type-mapping>Remote</result-type-mapping>
<ejb-ql>entity1Query2EjbQL</ejb-ql>
</query>
+ <query id="entity1Query3-id">
+ <!-- TODO description>en-entity1Query3-desc</description -->
+ <query-method id="entity1Query3QueryMethod-id">
+ <method-name>entity1Query3QueryMethod</method-name>
+ <method-params>
+ <method-param>entity1Query3QueryMethodParam1</method-param>
+ <method-param>entity1Query3QueryMethodParam2</method-param>
+ </method-params>
+ </query-method>
+ <!-- test default value <result-type-mapping>Local</result-type-mapping> -->
+ <ejb-ql>entity1Query3EjbQL</ejb-ql>
+ </query>
</entity>
@@ -1906,7 +1918,18 @@
<result-type-mapping>Remote</result-type-mapping>
<ejb-ql>entity2Query2EjbQL</ejb-ql>
</query>
-
+ <query id="entity2Query3-id">
+ <!-- TODO description>en-entity2Query3-desc</description -->
+ <query-method id="entity2Query3QueryMethod-id">
+ <method-name>entity2Query3QueryMethod</method-name>
+ <method-params>
+ <method-param>entity2Query3QueryMethodParam1</method-param>
+ <method-param>entity2Query3QueryMethodParam2</method-param>
+ </method-params>
+ </query-method>
+ <!-- test default value <result-type-mapping>Local</result-type-mapping> -->
+ <ejb-ql>entity2Query3EjbQL</ejb-ql>
+ </query>
</entity>
<entity>
More information about the jboss-cvs-commits
mailing list