[jboss-cvs] JBossAS SVN: r67302 - trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test.

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

Author: dimitris at jboss.org
Date: 2007-11-20 12:25:04 -0500 (Tue, 20 Nov 2007)
New Revision: 67302

Modified:
   trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
Log:
JBAS-4152, fix test after hsqldb 1.8.0.8 upgrade

Modified: trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java	2007-11-20 17:17:05 UTC (rev 67301)
+++ trunk/testsuite/src/main/org/jboss/test/cmp2/idxandusersql/test/IdxAndUsersqlUnitTestCase.java	2007-11-20 17:25:04 UTC (rev 67302)
@@ -1,34 +1,36 @@
 /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2005, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
 package org.jboss.test.cmp2.idxandusersql.test;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
 import junit.framework.Test;
+
 import org.jboss.logging.Logger;
 import org.jboss.test.JBossTestCase;
 import org.jboss.test.util.ejb.EJBTestCase;
@@ -78,7 +80,6 @@
       DatabaseMetaData dMeta = cConn.getMetaData();
 
       String driver = dMeta.getDriverName();
-      String version = dMeta.getDriverVersion();
 
       cConn.close();
       assertTrue("Error: We are not using HSQL", driver.startsWith("HSQL Database"));
@@ -238,7 +239,9 @@
          String iName = rs.getString(6); // name of index
 
          //	Ignore indices that are autogenerated for PKs
-         if (cName.equals(column) && !iName.startsWith("PK_IDX"))
+         if (cName.equals(column) 
+               && !iName.startsWith("PK_IDX")
+               && !iName.startsWith("SYS_IDX")) 
          {  					
             found = true;
          }