[jboss-cvs] JBossAS SVN: r69036 - in branches/Branch_4_2/testsuite/src: resources/cmp2/ejbselect/META-INF and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2008-01-16 11:34:48 -0500 (Wed, 16 Jan 2008)
New Revision: 69036

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ABean.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
   branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
   branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml
Log:
JBAS-5142 testcase

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ABean.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ABean.java	2008-01-16 16:12:29 UTC (rev 69035)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ABean.java	2008-01-16 16:34:48 UTC (rev 69036)
@@ -112,6 +112,22 @@
     */
    public abstract Collection ejbSelectSomeBsDeclaredSQL(ALocal a) throws FinderException;
 
+   /**
+     * Dynamic QL
+     * @ejb.select query=""
+     */
+    public abstract Collection ejbSelectDynamic(String ql, Object[] params) throws FinderException;
+ 
+    // Home methods
+ 
+    /**
+     * @ejb.home-method
+     */
+    public Collection ejbHomeSelectDynamic(String ql, Object[] params) throws FinderException
+    {
+       return ejbSelectDynamic(ql, params);
+    }
+
    // Interface methods
 
    /**

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java	2008-01-16 16:12:29 UTC (rev 69035)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/ALocalHome.java	2008-01-16 16:34:48 UTC (rev 69036)
@@ -42,4 +42,5 @@
 
    public void checkFinderForNull() throws javax.ejb.FinderException;
 
+   public java.util.Collection selectDynamic(java.lang.String ql,java.lang.Object[] params) throws javax.ejb.FinderException;
 }

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java	2008-01-16 16:12:29 UTC (rev 69035)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cmp2/ejbselect/EJBSelectUnitTestCase.java	2008-01-16 16:34:48 UTC (rev 69036)
@@ -365,4 +365,15 @@
          assertEquals("B" + i++, b.getId());
       }
    }
+
+   public void testMemberOf() throws Exception
+   {
+      Collection col = AUtil.getLocalHome().selectDynamic(
+         "select distinct object(a) from A a, B b1, B b2 where b1.name=?1 and b2.name=?2 and b1 member of a.bs and b2 member of a.bs",
+         new String[]{"Alice", "Bob"});
+      assertEquals(1, col.size());
+      ALocal a = (ALocal)col.iterator().next();
+      assertNotNull(a);
+      assertEquals("A1", a.getId());
+   }
 }

Modified: branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml	2008-01-16 16:12:29 UTC (rev 69035)
+++ branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/ejb-jar.xml	2008-01-16 16:34:48 UTC (rev 69036)
@@ -147,6 +147,17 @@
             <ejb-ql><![CDATA[SELECT SUM(a.intField) FROM A AS a WHERE a.intField = -1234]]></ejb-ql>
          </query>
 	  <!-- Write a file named ejb-finders-ABean.xml if you want to define extra finders. -->
+         <query>
+            <description><![CDATA[Dynamic QL]]></description>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+            <ejb-ql><![CDATA[]]></ejb-ql>
+         </query>
       </entity>
 
      <!--

Modified: branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml
===================================================================
--- branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml	2008-01-16 16:12:29 UTC (rev 69035)
+++ branches/Branch_4_2/testsuite/src/resources/cmp2/ejbselect/META-INF/jbosscmp-jdbc.xml	2008-01-16 16:34:48 UTC (rev 69036)
@@ -89,6 +89,16 @@
                 <where><![CDATA[a.ID={0.id} AND b.A_ID=a.ID]]></where>
             </declared-sql>
          </query>
+         <query>
+            <query-method>
+               <method-name>ejbSelectDynamic</method-name>
+               <method-params>
+                  <method-param>java.lang.String</method-param>
+                  <method-param>java.lang.Object[]</method-param>
+               </method-params>
+            </query-method>
+            <dynamic-ql/>
+         </query>
 
 <!-- jboss 3.2 features -->
 <!-- optimistic locking does not express the exclusions needed -->