[jboss-cvs] JBossAS SVN: r73156 - in branches/JBPAPP_4_2_0_GA_CP/testsuite: imports and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 8 11:47:31 EDT 2008
Author: smcgowan at redhat.com
Date: 2008-05-08 11:47:30 -0400 (Thu, 08 May 2008)
New Revision: 73156
Modified:
branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
Log:
JBPAPP-814 - resolve issues running with JDK6
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-05-08 15:10:28 UTC (rev 73155)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml 2008-05-08 15:47:30 UTC (rev 73156)
@@ -271,6 +271,7 @@
<!-- Classpath to run the tests -->
<path id="tests.classpath">
+ <path refid="jboss.jmx.classpath"/>
<fileset dir="${jboss.dist}/client">
<include name="**/*.jar"/>
</fileset>
@@ -278,7 +279,6 @@
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
- <path refid="jboss.jmx.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -2339,6 +2339,7 @@
<pathelement location="${build.resources}"/>
<path refid="tests.classpath"/>
<path refid="jboss.iiop.classpath"/>
+
</classpath>
<!--formatter type="xml" usefile="${junit.formatter.usefile}"/-->
@@ -2578,6 +2579,7 @@
<!-- End JPDA Debuuging begin-->
<jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml 2008-05-08 15:10:28 UTC (rev 73155)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/imports/server-config.xml 2008-05-08 15:47:30 UTC (rev 73156)
@@ -123,6 +123,7 @@
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
<jvmarg value="-Djava.security.debug=policy"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="scoped-aop-jdk14" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
@@ -142,9 +143,11 @@
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/>
<jvmarg value="-Djava.security.debug="/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="jacc" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
<server name="jacc-security-external" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
@@ -708,6 +711,8 @@
<sysproperty key="jboss-junit-configuration" value="@{junit.configuration}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+
<syspropertyset>
<propertyref prefix="jbosstest"/>
</syspropertyset>
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2008-05-08 15:10:28 UTC (rev 73155)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/cmp2/commerce/QueryTest.java 2008-05-08 15:47:30 UTC (rev 73156)
@@ -164,7 +164,7 @@
compileJBossQL("SELECT OBJECT(u) FROM user u WHERE LCASE(u.userName) = ?1",
Collection.class, new Class[]{String.class}));
- String expected = "1.4".equals(javaVersion) ?
+ String expected = "1.5".equals(javaVersion) ?
"SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t2_o2_customer, CUSTOMEREJB t1_o1_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t3_o2.customer=t2_o2_customer.id AND t0_o1.customer=t1_o1_customer.id)" :
"SELECT t0_o1.ORDER_NUMBER FROM ORDER_DATA t0_o1, ORDER_DATA t3_o2, CUSTOMEREJB t1_o1_customer, CUSTOMEREJB t2_o2_customer WHERE (( NOT (t1_o1_customer.id=t2_o2_customer.id)) AND (t0_o1.CC_TYPE=t3_o2.CC_TYPE AND t0_o1.CC_FIRST_NAME=t3_o2.CC_FIRST_NAME AND t0_o1.CC_MI=t3_o2.CC_MI AND t0_o1.CC_LAST_NAME=t3_o2.CC_LAST_NAME AND t0_o1.CC_BILLING_ZIP=t3_o2.CC_BILLING_ZIP AND t0_o1.CC_CARD_NUMBER=t3_o2.CC_CARD_NUMBER) AND t0_o1.customer=t1_o1_customer.id AND t3_o2.customer=t2_o2_customer.id)";
String compiled = compileJBossQL(
@@ -307,7 +307,7 @@
)
);
- String expected = "1.4".equals(javaVersion) ?
+ String expected = "1.5".equals(javaVersion) ?
"SELECT t0_o.ORDER_NUMBER " +
"FROM ORDER_DATA t0_o, LINEITEMEJB t4_l, PRODUCTCATEGORYEJB t1_pc, PRODUCT_PRODUCT_CATEGORY t5_l_product_productCategories_R, PRODUCT t6_l_product " +
"WHERE (((t0_o.ORDER_NUMBER = ? AND t1_pc.name = ?))) " +
@@ -380,9 +380,17 @@
compileEJBQL("SELECT OBJECT(o) FROM OrderX o WHERE o.ordernumber = ?1 OR o.lineItems IS NOT EMPTY",
Set.class, new Class[]{Long.class}));
- assertEquals("SELECT t0_l.id FROM CUSTOMEREJB t1_c, ORDER_DATA t3_o, LINEITEMEJB t0_l WHERE ((t1_c.id = 1)) AND t1_c.id=t3_o.customer AND t3_o.ORDER_NUMBER=t0_l.ORDER_NUMBER",
+ if ( "1.5".equals(javaVersion) ) {
+ assertEquals("SELECT t0_l.id FROM CUSTOMEREJB t1_c, ORDER_DATA t3_o, LINEITEMEJB t0_l " +
+ "WHERE ((t1_c.id = 1)) AND t1_c.id=t3_o.customer AND t3_o.ORDER_NUMBER=t0_l.ORDER_NUMBER",
compileEJBQL("SELECT OBJECT(l) FROM Customer c, IN(c.orders) o, IN(o.lineItems) l WHERE c.id=1"));
+ } else {
+ assertEquals("SELECT t0_l.id FROM CUSTOMEREJB t1_c, ORDER_DATA t3_o, LINEITEMEJB t0_l " +
+ "WHERE ((t1_c.id = 1)) AND t3_o.ORDER_NUMBER=t0_l.ORDER_NUMBER AND t1_c.id=t3_o.customer",
+ compileEJBQL("SELECT OBJECT(l) FROM Customer c, IN(c.orders) o, IN(o.lineItems) l WHERE c.id=1"));
+ }
+
// customer query was SELECT OBJECT(s) FROM Service AS s, Platform AS p WHERE p.id = ?1 AND s.server MEMBER OF p.servers
assertEquals("SELECT t0_l.id FROM LINEITEMEJB t0_l, CUSTOMEREJB t1_c, ORDER_DATA t3_l_order WHERE (t1_c.id = 1 AND EXISTS (SELECT t2_c_orders.ORDER_NUMBER FROM ORDER_DATA t2_c_orders WHERE t1_c.id=t2_c_orders.customer AND t2_c_orders.ORDER_NUMBER=t3_l_order.ORDER_NUMBER) AND t0_l.ORDER_NUMBER=t3_l_order.ORDER_NUMBER)",
compileEJBQL("SELECT OBJECT(l) FROM LineItem l, Customer c WHERE c.id=1 AND l.order MEMBER OF c.orders"));
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java 2008-05-08 15:10:28 UTC (rev 73155)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/jbossmx/compliance/objectname/MalformedTestCase.java 2008-05-08 15:47:30 UTC (rev 73156)
@@ -50,12 +50,22 @@
public static final String GOOD_DOMAIN = "domain";
public static final String GOOD_KEY = "key1";
public static final String GOOD_VALUE = "val1";
+ public static String[] BAD_KEYVALS = null;
// strings containing illegal chars to use in key or value positions
- public static final String[] BAD_KEYVALS = {
+ public static final String[] BAD_KEYVALS_JDK5 = {
"som:thing", // cannot contain domain separator
+ "som,thing", // cannot contain kvp chunk separator
+ "som=thing", // cannot contain kvp separator
+ // JBAS-5476 - WildCards allowed with JDK 6 so these keys are BAD only
+ // if running with JDK 5
"som?thing", // cannot contain pattern chars
"som*thing", // cannot contain pattern chars
+ };
+
+ // strings containing illegal chars to use in key or value positions
+ public static final String[] BAD_KEYVALS_JDK6 = {
+ "som:thing", // cannot contain domain separator
"som,thing", // cannot contain kvp chunk separator
"som=thing", // cannot contain kvp separator
};
@@ -98,11 +108,18 @@
for (int i = 0; i < BAD_DOMAINS.length; i++)
{
suite.addTest(new FullNameTEST(BAD_DOMAINS[i] + ":" + GOOD_KEY + "=" + GOOD_VALUE));
- suite.addTest(new DomainKeyValueTEST(BAD_DOMAINS[i], GOOD_KEY, GOOD_VALUE));
suite.addTest(new DomainHashtableTEST(BAD_DOMAINS[i], GOOD_KEY, GOOD_VALUE));
}
- // all illegal key value characters
+ // determine the illegal key values based on JDK
+
+ if (Java.isVersion(Java.VERSION_1_5) == true)
+ {
+ BAD_KEYVALS = BAD_KEYVALS_JDK5;
+ } else {
+ BAD_KEYVALS = BAD_KEYVALS_JDK6;
+ }
+
for (int i = 0; i < BAD_KEYVALS.length; i++)
{
suite.addTest(new FullNameTEST(GOOD_DOMAIN + ":" + BAD_KEYVALS[i] + "=" + GOOD_VALUE));
@@ -195,6 +212,7 @@
return;
}
}
+
fail("invalid object name: " + domain + ":" + key + "=" + value);
}
}
@@ -290,6 +308,13 @@
return;
}
}
+ catch (ClassCastException cce)
+ {
+ if (Java.isVersion(Java.VERSION_1_5) == false)
+ {
+ return;
+ }
+ }
fail("invalid object name: " + domain + ":" + failureHint);
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2008-05-08 15:10:28 UTC (rev 73155)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/src/main/org/jboss/test/security/test/LoginModulesUnitTestCase.java 2008-05-08 15:47:30 UTC (rev 73156)
@@ -875,7 +875,7 @@
Set groups = subject.getPrincipals(Group.class);
assertTrue("Principals contains stark", subject.getPrincipals().contains(new SimplePrincipal("stark")));
assertTrue("Principals contains Roles", groups.contains(new SimplePrincipal("Roles")));
- Group roles = (Group) groups.iterator().next();
+ Group roles = findRolesGroup(groups);
assertTrue("Java is a role", roles.isMember(new SimplePrincipal("Java")));
assertTrue("Coder is a role", roles.isMember(new SimplePrincipal("Coder")));
@@ -914,7 +914,7 @@
Set groups = subject.getPrincipals(Group.class);
assertTrue("Principals contains jduke", subject.getPrincipals().contains(new SimplePrincipal("jduke")));
assertTrue("Principals contains Roles", groups.contains(new SimplePrincipal("Roles")));
- Group roles = (Group) groups.iterator().next();
+ Group roles = findRolesGroup(groups);
// Only the roles from the DatabaseServerLoginModule should exist
assertTrue("Role1 is a role", roles.isMember(new SimplePrincipal("Role1")));
assertTrue("Role2 is a role", roles.isMember(new SimplePrincipal("Role2")));
@@ -1014,6 +1014,20 @@
}
+ // Method to find the group named "Roles" in the given Set of groups.
+ private Group findRolesGroup(Set groups)
+ {
+ // Find the "Roles" group:
+ Iterator groupsIter = groups.iterator();
+ Group roles = null;
+ while (groupsIter.hasNext()) {
+ roles = (Group)groupsIter.next();
+ if (roles.getName().equals("Roles"))
+ break;
+ }
+ return roles;
+ }
+
private Connection setupLoginTables() throws Exception
{
Class.forName("org.hsqldb.jdbcDriver");
More information about the jboss-cvs-commits
mailing list