openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r777135 [7/10] - in /openjpa/trunk: openjpa-kernel/src/test/java/org/apache/openjpa/meta/ openjpa-lib/src/test/java/org/apache/openjpa/lib/conf/ openjpa-lib/src/test/java/org/apache/openjpa/lib/graph/ openjpa-lib/src/test/java/org/apache/op...
Date Thu, 21 May 2009 14:39:43 GMT
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinGetObjectById.java Thu May 21 14:39:31 2009
@@ -44,7 +44,7 @@
 
 
 public class TestSubclassJoinGetObjectById
-        extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase{
+    extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
     
 
     private String _outer = "OUTER";

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/meta/vertical/TestSubclassJoinRelations.java Thu May 21 14:39:31 2009
@@ -43,8 +43,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestSubclassJoinRelations extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase 
-{
+public class TestSubclassJoinRelations
+    extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
     private String _outer = "OUTER";
     private Object _oid = null;
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/oracle/TestAutoIncrement.java Thu May 21 14:39:31 2009
@@ -44,7 +44,7 @@
 	private static String PLATFORM = "oracle";
 
 	public void setUp() throws Exception {
-		if ("testAutoIncrementIdentityWithNamedSequence".equals(getName())) {
+        if ("testAutoIncrementIdentityWithNamedSequence".equals(getName())) {
 			super.setUp(CLEAR_TABLES, PObject.class,
 			    "openjpa.jdbc.DBDictionary",
 			    "oracle(UseTriggersForAutoAssign=true," + 
@@ -52,7 +52,7 @@
 		} else {
 			super.setUp(CLEAR_TABLES, PObjectNative.class,
 					"openjpa.jdbc.DBDictionary",
-					"oracle(UseTriggersForAutoAssign=true)");
+                    "oracle(UseTriggersForAutoAssign=true)");
 		}
 	}
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/order/TestOrderColumn.java Thu May 21 14:39:31 2009
@@ -1103,8 +1103,9 @@
     private void validateIndexAndValues(OpenJPAEntityManagerSPI em, 
             String entity, String indexedCol, int base, Object[] objs, String
             idField, Object idValue) {
-        String queryString = "SELECT INDEX(b), b FROM " + entity + " a JOIN a." +
-            indexedCol + " b WHERE a." + idField + " = :idVal";
+        String queryString =
+            "SELECT INDEX(b), b FROM " + entity + " a JOIN a." + indexedCol
+                + " b WHERE a." + idField + " = :idVal";
         em.clear();
         Query qry = em.createQuery(queryString);
         qry.setParameter("idVal", idValue);

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestEJBQLSelectNPlusOne.java Thu May 21 14:39:31 2009
@@ -27,8 +27,8 @@
 import org.apache.openjpa.persistence.kernel.common.apps.RuntimeTest1;
 import junit.framework.*;
 
-public class TestEJBQLSelectNPlusOne extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest
-{
+public class TestEJBQLSelectNPlusOne
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
 	public TestEJBQLSelectNPlusOne(String name)
 	{
 		super(name);
@@ -47,8 +47,9 @@
 	public void testSimpleEJBQLQuery() throws Exception
 	{
 		EntityManager pm = currentEntityManager();
-		// run a JDOQL query first to take care of any class-loading issues
-		List l = pm.createQuery("select object(o) from " + RuntimeTest1.class.getSimpleName()+" o").getResultList();
+        // run a JDOQL query first to take care of any class-loading issues
+        List l = pm.createQuery("select object(o) from "
+                + RuntimeTest1.class.getSimpleName() + " o").getResultList();
 
 		// now run the actual test.
 		assertEquals(1, l.size());

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestGroupByQuery.java Thu May 21 14:39:31 2009
@@ -39,7 +39,7 @@
  */
 public class TestGroupByQuery extends SingleEMFTestCase {
 	public void setUp() {
-		super.setUp(DROP_TABLES, Game.class, IndoorGame.class, Scrabble.class,
+        super.setUp(DROP_TABLES, Game.class, IndoorGame.class, Scrabble.class,
 				Chess.class);
 		try {
 			createData();
@@ -51,7 +51,7 @@
 	void createData() throws Exception {
 		EntityManager em = emf.createEntityManager();
 		em.getTransaction().begin();
-		Class[] classes = { Game.class, IndoorGame.class, Scrabble.class,
+        Class[] classes = { Game.class, IndoorGame.class, Scrabble.class,
 				Chess.class };
 		for (Class cls : classes) {
 			for (int i = 1; i <= 4; i++) {
@@ -65,11 +65,11 @@
 
 	public void testGroupBy() {
 		String jpql = "SELECT g.name, g.nTile FROM Scrabble g WHERE "
-				+ "(g.name = ANY(SELECT g1.name FROM Scrabble g1 "
+                + "(g.name = ANY(SELECT g1.name FROM Scrabble g1 "
 				+ "GROUP BY g1.name )) ORDER BY g.name";
 		EntityManager em = emf.createEntityManager();
 
-		List<IndoorGame> employees = em.createQuery(jpql).getResultList();
+        List<IndoorGame> employees = em.createQuery(jpql).getResultList();
 
 	}
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestMultipleEntityProjection.java Thu May 21 14:39:31 2009
@@ -37,7 +37,8 @@
  * joins.
  * 
  * Originally reported in 
- * <A HREF="http://n2.nabble.com/Selecting-multiple-objects---bug--tc732941.html">
+ * <A HREF=
+ * "http://n2.nabble.com/Selecting-multiple-objects---bug--tc732941.html">
  * OpenJPA mailing list</A>
  * 
  * @author Pinaki Poddar
@@ -78,13 +79,13 @@
 				pub.setName(pubName);
 				mag.setPublisher(pub);
 				try {
-					DateFormat df = new SimpleDateFormat ("yyyy-MM-dd");
+                    DateFormat df = new SimpleDateFormat ("yyyy-MM-dd");
 					Date date = df.parse("2001-01-01");
 					mag.setDatePublished(date);
 				} catch (ParseException e) {
 					mag.setDatePublished(null);
 				}
-				mag.setTsPublished(new Timestamp(System.currentTimeMillis()));
+                mag.setTsPublished(new Timestamp(System.currentTimeMillis()));
 				
 				em.persist(pub);
 			}
@@ -96,7 +97,7 @@
 	public void testMultipleEntitiesInProjectionUsingOuterJoin() {
 		String jpql = "select m, p " +
 		              "from Magazine m left outer join m.publisher p " +
-		              "where ((:useName = false) or (m.name like :name))";
+                      "where ((:useName = false) or (m.name like :name))";
 		EntityManager em = emf.createEntityManager();
 		Query query = em.createQuery(jpql);
 		
@@ -106,7 +107,7 @@
 		
 		List result = query.getResultList();
 		
-		int expecetedCount = getExpecetedResultCount(magKey, !INNER_JOIN);
+        int expecetedCount = getExpecetedResultCount(magKey, !INNER_JOIN);
 		assertFalse(result.isEmpty());
 		assertEquals(expecetedCount, result.size());
 		for (Object o : result) {
@@ -114,7 +115,7 @@
 			Object[] row = (Object[])o;
 			assertEquals(2, row.length);
 			assertTrue(row[0] instanceof Magazine);
-			assertTrue(row[1] == null || row[1] instanceof Publisher);
+            assertTrue(row[1] == null || row[1] instanceof Publisher);
 			assertNotNull(row[0]);
 			assertEquals(((Magazine)row[0]).getPublisher(), row[1]);
 		}
@@ -123,7 +124,7 @@
 	public void testMultipleEntitiesInProjectionUsingInnerJoin() {
 		String jpql = "select m, p " +
 		              "from Magazine m inner join m.publisher p " +
-		              "where ((:useName = false) or (m.name like :name))";
+                      "where ((:useName = false) or (m.name like :name))";
 		EntityManager em = emf.createEntityManager();
 		Query query = em.createQuery(jpql);
 		
@@ -133,7 +134,7 @@
 		
 		List result = query.getResultList();
 		
-		int expecetedCount = getExpecetedResultCount(magKey, INNER_JOIN);
+        int expecetedCount = getExpecetedResultCount(magKey, INNER_JOIN);
 		assertFalse(result.isEmpty());
 		assertEquals(expecetedCount, result.size());
 		for (Object o : result) {
@@ -150,7 +151,7 @@
 	
 	public void testAggregateExpressionInHavingExpression() {
         String jpql = "select m.publisher, max(m.datePublished) " + 
-					  "from Magazine m group by m.publisher " + 
+                      "from Magazine m group by m.publisher " +
 					  "having max(m.datePublished) is null";
 		
 		EntityManager em = emf.createEntityManager();
@@ -167,7 +168,7 @@
 	}
 	
 	/**
-	 * Count number of expected result based on inner/outer join condition and
+     * Count number of expected result based on inner/outer join condition and
 	 * the name of the Magazine.
 	 */
 	private int getExpecetedResultCount(String key, boolean innerJoin) {
@@ -176,7 +177,7 @@
 			String magName = MAGAZINE_PUBLISHER_NAME_PAIRS[i][0];
 			String pubName = MAGAZINE_PUBLISHER_NAME_PAIRS[i][1];
 			if (magName.indexOf(key) != -1)
-				if (!innerJoin || (innerJoin && pubName != null))
+                if (!innerJoin || (innerJoin && pubName != null))
 					count++;
 		}
 		return count;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNamedSQLQueries.java Thu May 21 14:39:31 2009
@@ -41,7 +41,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestNamedSQLQueries extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestNamedSQLQueries
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
      
     
     /** Creates a new instance of TestNamedSQLQueries */

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryParameterBinding.java Thu May 21 14:39:31 2009
@@ -73,9 +73,9 @@
 					fail("Expected " + error.getName());
 			} catch (Exception e) {
 				if (!error.isAssignableFrom(e.getClass())) {
-				    // let the test harness handle the exception.
-				    throw new RuntimeException("An unexpected exception " + 
-				        "occurred see the initCause for details", e);
+                    // let the test harness handle the exception.
+                    throw new RuntimeException("An unexpected exception " +
+                            "occurred see the initCause for details", e);
 				} 
 			}		
 		}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestNativeQueryProcedures.java Thu May 21 14:39:31 2009
@@ -29,7 +29,8 @@
 import org.apache.openjpa.persistence.jdbc.query.domain.Applicant;
 import org.apache.openjpa.persistence.jdbc.query.domain.Game;
 import org.apache.openjpa.persistence.jdbc.query.procedure.DerbyProcedureList;
-import org.apache.openjpa.persistence.jdbc.query.procedure.AbstractProcedureList;
+import 
+    org.apache.openjpa.persistence.jdbc.query.procedure.AbstractProcedureList;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestOrderByQuery.java Thu May 21 14:39:31 2009
@@ -52,7 +52,7 @@
 	void createData() throws Exception {
 		EntityManager em = emf.createEntityManager();
 		em.getTransaction().begin();
-		Class[] classes = { Game.class, IndoorGame.class, Scrabble.class,
+        Class[] classes = { Game.class, IndoorGame.class, Scrabble.class,
 				Chess.class };
 		for (Class cls : classes) {
 			for (int i = 1; i <= 4; i++) {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestQueryParameterBinding.java Thu May 21 14:39:31 2009
@@ -53,7 +53,7 @@
 	}
 	
 	public void testPositionalParameterWithPositionalBindingSucceeds() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter(1, INT_VALUE);
 		q.setParameter(2, STR_VALUE);
@@ -63,7 +63,7 @@
 	}
 	
 	public void testPositionalParameterWithNamedBindingFails() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter("p1", INT_VALUE);
 		q.setParameter("p2", STR_VALUE);
@@ -73,7 +73,7 @@
 	}
 	
 	public void testPositionalParameterWithInsufficientValuesFails() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter(1, INT_VALUE);
 		q.setParameter(2, STR_VALUE);
@@ -82,7 +82,7 @@
 	}
 	
 	public void testPositionalParameterWithExtraValuesFails() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter(1, INT_VALUE);
 		q.setParameter(2, STR_VALUE);
@@ -125,7 +125,7 @@
 	}
 	
 	public void testNamedParameterWithNamedBindingSucceeds() {
-		String JPQL_NAMED  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_NAMED = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_NAMED);
 		q.setParameter("p1", INT_VALUE);
 		q.setParameter("p2", STR_VALUE);
@@ -135,7 +135,7 @@
 	}
 	
 	public void testNamedParameterWithPositionalBindingFails() {
-		String JPQL_NAMED  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_NAMED = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_NAMED);
 		q.setParameter(1, INT_VALUE);
 		q.setParameter(2, STR_VALUE);
@@ -145,7 +145,7 @@
 	}
 	
 	public void testNamedParameterWithInsufficientValuesFails() {
-		String JPQL_NAMED  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_NAMED = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_NAMED);
 		q.setParameter("p1", INT_VALUE);
 		q.setParameter("p2", STR_VALUE);
@@ -154,7 +154,7 @@
 	}
 	
 	public void testNamedParameterWithExtraValuesFails() {
-		String JPQL_NAMED  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_NAMED = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_NAMED);
 		q.setParameter("p1", INT_VALUE);
 		q.setParameter("p2", STR_VALUE);
@@ -196,7 +196,7 @@
 	}
 	
 	public void testNamedParameterWithWrongType() {
-		String JPQL_NAMED  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_NAMED = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_NAMED);
 		q.setParameter("p1",  INT_VALUE);
 		q.setParameter("p2",  DBL_VALUE);
@@ -206,7 +206,7 @@
 	}
 	
 	public void testPositionalParameterWithWrongType() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(2,  DBL_VALUE);
@@ -216,7 +216,8 @@
 	}
 	
 	public void testNamedParameterWithNullValue() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
+        String JPQL_POSITIONAL =
+            JPQL + "WHERE p.p1=:p1 AND p.p2=:p2 AND p.p3=:p3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter("p1",  INT_VALUE);
 		q.setParameter("p2",  null);
@@ -226,7 +227,7 @@
 	}
 	
 	public void testPositionalParameterWithNullValue() {
-		String JPQL_POSITIONAL  = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
+        String JPQL_POSITIONAL = JPQL + "WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3";
 		Query q = em.createQuery(JPQL_POSITIONAL);
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(2,  null);
@@ -237,7 +238,7 @@
 	
 	public void testPositionalParameterWithSingleResult() {
 		Query q = em.createNamedQuery("JPQL_POSITIONAL");
-		// "SELECT p FROM Binder p WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
+        // "SELECT p FROM Binder p WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(2,  null);
 		q.setParameter(3,  null);
@@ -247,7 +248,7 @@
 	
 	public void testPositionalParameterWithNativeQuery() {
 		Query q = em.createNamedQuery("SQL_POSITIONAL");
-		// "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
+        // "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(2,  STR_VALUE);
 		q.setParameter(3,  DBL_VALUE);
@@ -257,7 +258,7 @@
 	
 	public void testPositionalParameterWithNativeQueryFails() {
 		Query q = em.createNamedQuery("SQL_POSITIONAL");
-		// "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
+        // "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(2,  STR_VALUE);
 		
@@ -266,7 +267,7 @@
 	
 	public void testPositionalParameterWithNativeQueryFailsWithGap() {
 		Query q = em.createNamedQuery("SQL_POSITIONAL");
-		// "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
+        // "SELECT p.id FROM Binder WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3"
 		q.setParameter(1,  INT_VALUE);
 		q.setParameter(3,  DBL_VALUE);
 		

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestSQLQueries.java Thu May 21 14:39:31 2009
@@ -53,7 +53,8 @@
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
 
-public class TestSQLQueries extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestSQLQueries
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
      
     
     /** Creates a new instance of TestSQLQueries */
@@ -84,7 +85,9 @@
         pm.persist(pc1);
         endTx(pm);;
         
-        JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) pm).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) pm)
+            .getConfiguration();
         DBDictionary dict = conf.getDBDictionaryInstance();
         MappingRepository repos = conf.getMappingRepositoryInstance();
         ClassMapping mapping = repos.getMapping(RuntimeTest1.class,
@@ -160,8 +163,8 @@
     public void testTableStarQuery() {
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
         OpenJPAQuery q = pm.createQuery("javax.jdo.query.SQL",
-                "select " + _tableName + ".* from " + _fullTableName + " order by "
-                + _intColName);
+                "select " + _tableName + ".* from " + _fullTableName
+                + " order by " + _intColName);
         q.setResultClass(RuntimeTest1.class);
         Iterator itr = ((Collection) q.getCandidateCollection()).iterator();
         assertTrue(itr.hasNext());
@@ -176,8 +179,9 @@
     public void testColumnQuery() {
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
         OpenJPAQuery q = pm.createQuery("javax.jdo.query.SQL",
-                "select " + _pkColName + ", " + _intColName + ", " + _stringColName
-                + " from " + _fullTableName + " order by " + _intColName);
+                "select " + _pkColName + ", " + _intColName + ", "
+                + _stringColName + " from " + _fullTableName + " order by "
+                + _intColName);
         q.setResultClass(RuntimeTest1.class);
         Iterator itr = ((Collection) q.getCandidateCollection()).iterator();
         assertTrue(itr.hasNext());
@@ -235,8 +239,9 @@
     public void testOnlySelectedFieldsLoaded() {
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
         OpenJPAQuery q = pm.createQuery("javax.jdo.query.SQL",
-                "select " + _pkColName + ", " + _intColName + ", " + _stringColName
-                + " from " + _fullTableName + " order by " + _intColName);
+                "select " + _pkColName + ", " + _intColName + ", "
+                + _stringColName + " from " + _fullTableName + " order by "
+                + _intColName);
         q.setResultClass(RuntimeTest1.class);
         Iterator itr = ((Collection) q.getCandidateCollection()).iterator();
         assertTrue(itr.hasNext());
@@ -332,8 +337,8 @@
     public void testClasslessProjection() {
         OpenJPAEntityManager pm =(OpenJPAEntityManager)currentEntityManager();
         OpenJPAQuery q = pm.createQuery("javax.jdo.query.SQL",
-                "select " + _intColName + " as I, " + _stringColName + " as S from "
-                + _fullTableName + " order by " + _intColName);
+                "select " + _intColName + " as I, " + _stringColName
+                + " as S from " + _fullTableName + " order by " + _intColName);
         q.setResultClass(Holder.class);
         Iterator itr = ((Collection) q.getCandidateCollection()).iterator();
         assertTrue(itr.hasNext());
@@ -371,7 +376,9 @@
         pm.getTransaction().commit();
         pm.close();
         
-        JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) pm).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) pm)
+            .getConfiguration();
         DBDictionary dict = conf.getDBDictionaryInstance();
         MappingRepository repos = conf.getMappingRepositoryInstance();
         

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestStringFunctions.java Thu May 21 14:39:31 2009
@@ -41,8 +41,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestStringFunctions extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest
-{
+public class TestStringFunctions
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
     private OpenJPAEntityManager _pm = null;
     private QueryTest1 _match = null;
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestTemporalTypeQueryParameterBinding.java Thu May 21 14:39:31 2009
@@ -189,8 +189,8 @@
 			} catch (Exception e) {
 				if (!error.isAssignableFrom(e.getClass())) {
 				    // let the test harness handle the exception
-				    throw new RuntimeException("An unexpected exception " + 
-				        "occurred see initCause for details", e);
+                    throw new RuntimeException("An unexpected exception " +
+                            "occurred see initCause for details", e);
 				}
 			} 
 		}

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/TestUpdateSingleValuedAssociation.java Thu May 21 14:39:31 2009
@@ -79,8 +79,8 @@
 	void assertUserNullity(boolean shouldBeNull) {
 		EntityManager em = emf.createEntityManager();
 		em.getTransaction().begin();
-		List<Application> result = 
-			em.createQuery("SELECT a FROM Application a").getResultList();
+        List<Application> result = em.createQuery(
+                "SELECT a FROM Application a").getResultList();
 		assertFalse(result.isEmpty());
 		for (Application pc : result) {
 			Applicant user = pc.getUser();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/PartComposite.java Thu May 21 14:39:31 2009
@@ -41,7 +41,8 @@
 
     public PartComposite() {}
 
-    public PartComposite(int partno, String name, double asmCost, double massInc) {
+    public PartComposite(int partno, String name, double asmCost,
+            double massInc) {
         this.partno=partno;
         this.name=name;
         assemblyCost=asmCost;
@@ -49,7 +50,8 @@
         inventory=0;
     }
 
-    public PartComposite addSubPart(EntityManager em,  int quantity, Part subpart) {
+    public PartComposite addSubPart(EntityManager em, int quantity,
+            Part subpart) {
         Usage use = new Usage( this, quantity, subpart);
         em.persist(use);
         return this;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/cache/TestNonPrimaryKeyQueryParameters.java Thu May 21 14:39:31 2009
@@ -67,13 +67,13 @@
 		EntityManager em = emf.createEntityManager();
 
 		Query query = em
-				.createQuery("SELECT d from Department d where d.name=?1");
+                .createQuery("SELECT d from Department d where d.name=?1");
 		query.setParameter(1, DEPT_NAME);
 		Department dept = (Department) query.getSingleResult();
 
-		assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
-				.size());
-		assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
+        assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
+                .size());
+        assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
 				.size());
 		assertSQL(".* AND t0.TYPE = .*");
 		em.close();
@@ -86,9 +86,9 @@
 
 		Department dept = (Department) query.getSingleResult();
 
-		assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
-				.size());
-		assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
+        assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
+                .size());
+        assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
 				.size());
 
 		assertSQL(".* AND t0.TYPE = .*");
@@ -100,9 +100,9 @@
 
 		Department dept = em.find(Department.class, DEPT_NAME);
 
-		assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
-				.size());
-		assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
+        assertEquals(FULLTIME_EMPLOYEE_COUNT, dept.getFullTimeEmployees()
+                .size());
+        assertEquals(PARTTIME_EMPLOYEE_COUNT, dept.getPartTimeEmployees()
 				.size());
 
 		assertSQL(".* AND t0.TYPE = .*");
@@ -116,11 +116,13 @@
 	public void testSelectSubClass() {
 		EntityManager em = emf.createEntityManager();
 
-		Query query = em.createQuery("SELECT e from FullTimeEmployee e");
-		assertEquals(FULLTIME_EMPLOYEE_COUNT, query.getResultList().size());
+        Query query = em.createQuery("SELECT e from FullTimeEmployee e");
+        assertEquals(FULLTIME_EMPLOYEE_COUNT,
+                query.getResultList().size());
 
 		query = em.createQuery("SELECT e from PartTimeEmployee e");
-		assertEquals(PARTTIME_EMPLOYEE_COUNT, query.getResultList().size());
+        assertEquals(PARTTIME_EMPLOYEE_COUNT,
+                query.getResultList().size());
 
 		assertSQL(".* WHERE t0.TYPE = .*");
 	}
@@ -129,8 +131,8 @@
 		EntityManager em = emf.createEntityManager();
 
 		Query query = em.createQuery("SELECT e from Employee e");
-		assertEquals(FULLTIME_EMPLOYEE_COUNT + PARTTIME_EMPLOYEE_COUNT, query
-				.getResultList().size());
+        assertEquals(FULLTIME_EMPLOYEE_COUNT + PARTTIME_EMPLOYEE_COUNT,
+                query.getResultList().size());
 		assertNotSQL(".* WHERE t0.TYPE = .*");
 	}
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/query/domain/Binder.java Thu May 21 14:39:31 2009
@@ -26,9 +26,9 @@
 
 @Entity
 @NamedQuery(name="JPQL_POSITIONAL", 
-		query="SELECT p FROM Binder p WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3")
+        query="SELECT p FROM Binder p WHERE p.p1=?1 AND p.p2=?2 AND p.p3=?3")
 @NamedNativeQuery(name="SQL_POSITIONAL",
-		query="SELECT id, p1 FROM Binder WHERE p1=?1 AND p2=?2 AND p3=?3")
+        query="SELECT id, p1 FROM Binder WHERE p1=?1 AND p2=?2 AND p3=?3")
 public class Binder {
 	@Id
 	@GeneratedValue

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestClassDBSequenceFactory.java Thu May 21 14:39:31 2009
@@ -47,7 +47,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestClassDBSequenceFactory extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestClassDBSequenceFactory
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
     
     
     /** Creates a new instance of TestClassDBSequenceFactory */
@@ -73,7 +74,8 @@
         
         OpenJPAEntityManagerFactory pmf =(OpenJPAEntityManagerFactory)
                 getEmf(getProps());
-        OpenJPAEntityManager pm = (OpenJPAEntityManager) pmf.createEntityManager();
+        OpenJPAEntityManager pm =
+            (OpenJPAEntityManager) pmf.createEntityManager();
         //FIXME jthomas
         //Sequence gen = pm.getIdentitySequence(SeqF.class);
         Sequence gen=null;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDBSequenceFactory.java Thu May 21 14:39:31 2009
@@ -45,7 +45,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestDBSequenceFactory extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestDBSequenceFactory
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
         
     private Broker _broker;
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestDynamicSchemaFactory.java Thu May 21 14:39:31 2009
@@ -50,7 +50,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestDynamicSchemaFactory extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestDynamicSchemaFactory
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
     
     private ClassMapping _mapping = null;    
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestJDBCListener.java Thu May 21 14:39:31 2009
@@ -42,7 +42,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestJDBCListener extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestJDBCListener
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
     
     public static boolean commitOccurred;    
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestLazySchemaFactory.java Thu May 21 14:39:31 2009
@@ -44,7 +44,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestLazySchemaFactory extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestLazySchemaFactory
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
        
     private SchemaGroup _group = null;
     private boolean _fks = true;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestPerClassSequenceFactory.java Thu May 21 14:39:31 2009
@@ -46,7 +46,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestPerClassSequenceFactory extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestPerClassSequenceFactory
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
     
    
     /** Creates a new instance of TestPerClassSequenceFactory */

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchema.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchema.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchema.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchema.java Thu May 21 14:39:31 2009
@@ -47,8 +47,9 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestSchema extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
-    
+public class TestSchema
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
+
     private Schema _schema = new SchemaGroup().addSchema("schema");
     
     /** Creates a new instance of TestSchema */

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSchemaGenerator.java Thu May 21 14:39:31 2009
@@ -54,7 +54,8 @@
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 
 
-public class TestSchemaGenerator extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestSchemaGenerator
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
         
     /** Creates a new instance of TestSchemaGenerator */
     public TestSchemaGenerator(String name) 
@@ -94,7 +95,9 @@
         OpenJPAEntityManagerFactory pmf = (OpenJPAEntityManagerFactory)
         getEmf();
         OpenJPAEntityManager pm = pmf.createEntityManager();
-        JDBCConfiguration con = (JDBCConfiguration) ((OpenJPAEntityManagerSPI) pm).getConfiguration();
+        JDBCConfiguration con =
+            (JDBCConfiguration) ((OpenJPAEntityManagerSPI) pm)
+            .getConfiguration();
         DBDictionary dict = con.getDBDictionaryInstance();
         MappingRepository repos = con.getMappingRepositoryInstance();
         ClassMapping cm = repos.getMapping(RuntimeTest1.class,
@@ -109,7 +112,9 @@
         
         OpenJPAEntityManagerFactory kpmf =(OpenJPAEntityManagerFactory)
                 getEmf(props);
-        JDBCConfiguration conf = (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) kpmf).getConfiguration();
+        JDBCConfiguration conf =
+            (JDBCConfiguration) ((OpenJPAEntityManagerFactorySPI) kpmf)
+            .getConfiguration();
         
         StringWriter sw = new StringWriter();
         

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestSequenceGeneratorEnsureCapacityCall.java Thu May 21 14:39:31 2009
@@ -39,7 +39,7 @@
 
 
 public class TestSequenceGeneratorEnsureCapacityCall 
-        extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase{
+    extends org.apache.openjpa.persistence.jdbc.kernel.TestSQLListenerTestCase {
    
     
     

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/schema/TestXMLSchemaParser.java Thu May 21 14:39:31 2009
@@ -53,7 +53,8 @@
 import org.apache.openjpa.persistence.OpenJPAEntityManager;
 
 
-public class TestXMLSchemaParser extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest{
+public class TestXMLSchemaParser
+        extends org.apache.openjpa.persistence.jdbc.kernel.BaseJDBCTest {
         
     protected JDBCConfiguration conf = null;
     private SchemaGroup _group = null;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/Company.java Thu May 21 14:39:31 2009
@@ -28,11 +28,12 @@
 	@NamedQuery(name="Company.PreparedQueryWithNoParameter", 
 	    query="select x from Company x"),
 	@NamedQuery(name="Company.PreparedQueryWithNamedParameter", 
-	    query="select x from Company x where x.name=:name and x.startYear=:startYear"),
+        query="select x from Company x "
+            + "where x.name=:name and x.startYear=:startYear"),
 	@NamedQuery(name="Company.PreparedQueryWithPositionalParameter", 
 	    query="select x from Company x where x.name=?1 and x.startYear=?2"),
 	@NamedQuery(name="Company.PreparedQueryWithLiteral", 
-	    query="select x from Company x where x.name='IBM' and x.startYear=1900")
+        query="select x from Company x where x.name='IBM' and x.startYear=1900")
 })
 public class Company {
 	@Id

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestEagerQueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestEagerQueries.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestEagerQueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestEagerQueries.java Thu May 21 14:39:31 2009
@@ -81,7 +81,8 @@
         EntityManager em = emf.createEntityManager();
         
         Query q1 = em.createQuery(jpql);
-        assertEquals(OpenJPAPersistence.cast(q1).getLanguage(), JPQLParser.LANG_JPQL);
+        assertEquals(OpenJPAPersistence.cast(q1).getLanguage(),
+                JPQLParser.LANG_JPQL);
         List<Author> authors1 = q1.getResultList();
         assertFalse(authors1.isEmpty());
         Author author1 = authors1.iterator().next();
@@ -92,7 +93,8 @@
         // do the same thing again, this time query should be cached
         em = emf.createEntityManager();
         Query q2 = em.createQuery(jpql);
-        assertEquals(OpenJPAPersistence.cast(q2).getLanguage(), QueryLanguages.LANG_PREPARED_SQL);
+        assertEquals(OpenJPAPersistence.cast(q2).getLanguage(),
+                QueryLanguages.LANG_PREPARED_SQL);
         List<Author> authors2 = q2.getResultList();
         assertFalse(authors2.isEmpty());
         Author author2 = authors2.iterator().next();
@@ -107,7 +109,8 @@
         EntityManager em = emf.createEntityManager();
         
         Query q1 = em.createQuery(jpql);
-        assertEquals(OpenJPAPersistence.cast(q1).getLanguage(), JPQLParser.LANG_JPQL);
+        assertEquals(OpenJPAPersistence.cast(q1).getLanguage(),
+                JPQLParser.LANG_JPQL);
         List<Book> books = q1.getResultList();
         assertFalse(books.isEmpty());
         Book book1 = books.iterator().next();
@@ -120,7 +123,8 @@
         // because it requires multiple selects
         em = emf.createEntityManager();
         Query q2 = em.createQuery(jpql);
-        assertEquals(OpenJPAPersistence.cast(q2).getLanguage(), JPQLParser.LANG_JPQL);
+        assertEquals(OpenJPAPersistence.cast(q2).getLanguage(),
+                JPQLParser.LANG_JPQL);
         List<Book> books2 = q2.getResultList();
         assertFalse(books2.isEmpty());
         Book book2 = books2.iterator().next();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestFinderCache.java Thu May 21 14:39:31 2009
@@ -38,9 +38,11 @@
  */
 public class TestFinderCache extends SQLListenerTestCase {
     public static final long[] BOOK_IDS = {1000, 2000, 3000};
-    public static final String[] BOOK_NAMES = {"Argumentative Indian", "Tin Drum", "Blink"};
+    public static final String[] BOOK_NAMES =
+            {"Argumentative Indian", "Tin Drum", "Blink"};
     public static final long[] CD_IDS = {1001, 2001, 3001};
-    public static final String[] CD_LABELS = {"Beatles", "Sinatra", "Don't Rock My Boat"};
+    public static final String[] CD_LABELS =
+            {"Beatles", "Sinatra", "Don't Rock My Boat"};
     
     void createTestData() {
         EntityManager em = emf.createEntityManager();
@@ -113,7 +115,8 @@
     }
     
     FinderCache getCache() {
-        return ((JDBCConfiguration)emf.getConfiguration()).getFinderCacheInstance();
+        return ((JDBCConfiguration) emf.getConfiguration()).
+                getFinderCacheInstance();
     }
 
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCache.java Thu May 21 14:39:31 2009
@@ -62,11 +62,13 @@
     public static final int[] START_YEARS = {1900, 2000, 2010 };
 	public static final String[] DEPARTMENT_NAMES = { "Marketing", "Sales",
 			"Engineering" };
-	public static final String[] EMPLOYEE_NAMES = { "Tom", "Dick", "Harray" };
+    public static final String[] EMPLOYEE_NAMES = { "Tom", "Dick", "Harray" };
 	public static final String[] CITY_NAMES = {"Tulsa", "Durban", "Harlem"};
 	
-	public static final String EXCLUDED_QUERY_1 = "select count(p) from Company p";
-	public static final String EXCLUDED_QUERY_2 = "select count(p) from Department p";
+    public static final String EXCLUDED_QUERY_1 =
+        "select count(p) from Company p";
+    public static final String EXCLUDED_QUERY_2 =
+        "select count(p) from Department p";
 	public static final String INCLUDED_QUERY   = "select p from Address p";
 	private Company IBM;
 	
@@ -74,7 +76,8 @@
 		super.setUp(CLEAR_TABLES, Company.class, Department.class, 
 		    Employee.class, Address.class, 
 				"openjpa.jdbc.QuerySQLCache", 
-				"true(excludes='select count(p) from Company p;select count(p) from Department p')");
+                "true(excludes='select count(p) from Company p;"
+                + "select count(p) from Department p')");
 		createTestData();
 	}
 	
@@ -304,7 +307,7 @@
 
 	public void testQueryStatistics() {
 		String jpql1 = "select c from Company c";
-		String jpql2 = "select c from Company c where c.name = 'PObject'";
+        String jpql2 = "select c from Company c where c.name = 'PObject'";
 		OpenJPAEntityManager em = emf.createEntityManager();
 		int N1 = 5;
 		int N2 = 8;
@@ -330,7 +333,7 @@
 
 	public void testResetQueryStatistics() {
 		String jpql1 = "select c from Company c";
-		String jpql2 = "select c from Company c where c.name = 'PObject'";
+        String jpql2 = "select c from Company c where c.name = 'PObject'";
 		OpenJPAEntityManager em = emf.createEntityManager();
 		int N10 = 4;
 		int N20 = 7;
@@ -387,7 +390,8 @@
 	}
 
 	public void testQueryWithLiteral() {
-		String jpql = "select p from Company p where p.name = " + literal(COMPANY_NAMES[0]);
+        String jpql = "select p from Company p where p.name = "
+                + literal(COMPANY_NAMES[0]);
 		Object[] params = null;
 		compare(!IS_NAMED_QUERY, jpql, 1, params);
 	}
@@ -399,12 +403,13 @@
 	}
 
 	public void testQueryWithJoinsAndParameters() {
-		String jpql = "select e from Employee e " + "where e.name = :emp"
+        String jpql = "select e from Employee e " + "where e.name = :emp"
 					+ " and e.department.name = :dept"
-					+ " and e.department.company.name LIKE  " + literal(COMPANY_NAMES[0]) 
+                    + " and e.department.company.name LIKE  "
+                    + literal(COMPANY_NAMES[0]) 
 					+ " and e.address.city = :city";
 		Object[] params = { "emp", EMPLOYEE_NAMES[0], 
-							"dept",	DEPARTMENT_NAMES[0],
+                            "dept", DEPARTMENT_NAMES[0],
 							"city", CITY_NAMES[0]};
 		compare(!IS_NAMED_QUERY, jpql, 1, params);
 	}
@@ -412,7 +417,7 @@
 	public void testNamedQueryWithNoParameter() {
 		String namedQuery = "Company.PreparedQueryWithNoParameter";
 		Object[] params = null;
-		compare(IS_NAMED_QUERY, namedQuery, COMPANY_NAMES.length, params);
+        compare(IS_NAMED_QUERY, namedQuery, COMPANY_NAMES.length, params);
 	}
 
 	public void testNamedQueryWithLiteral() {
@@ -422,49 +427,61 @@
 	}
 
 	public void testNamedQueryWithPositionalParameter() {
-		String namedQuery = "Company.PreparedQueryWithPositionalParameter";
+        String namedQuery = "Company.PreparedQueryWithPositionalParameter";
 		Object[] params = {1, COMPANY_NAMES[0], 2, START_YEARS[0]};
 		compare(IS_NAMED_QUERY, namedQuery, 1, params);
 	}
 	
 	public void testNamedQueryWithNamedParameter() {
 		String namedQuery = "Company.PreparedQueryWithNamedParameter";
-		Object[] params = {"name", COMPANY_NAMES[0], "startYear", START_YEARS[0]};
+        Object[] params = {"name", COMPANY_NAMES[0], "startYear",
+                START_YEARS[0]};
 		compare(IS_NAMED_QUERY, namedQuery, 1, params);
 	}
 	
 	public void testPersistenceCapableParameter() {
-	    String jpql = "select e from Employee e where e.department.company=:company";
+        String jpql = "select e from Employee e " +
+                "where e.department.company=:company";
 	    Object[] params = {"company", IBM};
-	    compare(!IS_NAMED_QUERY, jpql, EMPLOYEE_NAMES.length*DEPARTMENT_NAMES.length, params);
+	    compare(!IS_NAMED_QUERY, jpql,
+	            EMPLOYEE_NAMES.length * DEPARTMENT_NAMES.length, params);
 	}
 	
 	/**
 	 * Project results are returned with different types of ROP.
 	 */
 	public void testProjectionResult() {
-	    String jpql = "select e.name from Employee e where e.address.city=:city";
+        String jpql = "select e.name from Employee e " +
+                "where e.address.city=:city";
         Object[] params = {"city", CITY_NAMES[0]};
-        compare(!IS_NAMED_QUERY, jpql, COMPANY_NAMES.length*DEPARTMENT_NAMES.length, params);
+        compare(!IS_NAMED_QUERY, jpql,
+                COMPANY_NAMES.length * DEPARTMENT_NAMES.length, params);
 	}
 	
 	public void testCollectionValuedParameters() {
 	    String jpql = "select e from Employee e where e.name in :names";
-	    Object[] params1 = {"names", Arrays.asList(new String[]{EMPLOYEE_NAMES[0], EMPLOYEE_NAMES[1]})};
-        Object[] params2 = {"names", Arrays.asList(new String[]{EMPLOYEE_NAMES[2]})};
+	    Object[] params1 = {"names",
+	            Arrays.asList(new String[]{EMPLOYEE_NAMES[0],
+	            EMPLOYEE_NAMES[1]})};
+        Object[] params2 = {"names",
+                Arrays.asList(new String[]{EMPLOYEE_NAMES[2]})};
         Object[] params3 = {"names", Arrays.asList(EMPLOYEE_NAMES)};
         
         boolean checkHits = false;
         
-        int expectedCount = 2*COMPANY_NAMES.length*DEPARTMENT_NAMES.length;
-        run(jpql, params1, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount, checkHits);
+        int expectedCount = 2 * COMPANY_NAMES.length * DEPARTMENT_NAMES.length;
+        run(jpql, params1, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount,
+                checkHits);
         assertCached(jpql);
         
-        expectedCount = 1*COMPANY_NAMES.length*DEPARTMENT_NAMES.length;
-        run(jpql, params2, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount, checkHits);
+        expectedCount = 1 * COMPANY_NAMES.length * DEPARTMENT_NAMES.length;
+        run(jpql, params2, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount,
+                checkHits);
         
-        expectedCount = EMPLOYEE_NAMES.length*COMPANY_NAMES.length*DEPARTMENT_NAMES.length;
-        run(jpql, params3, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount, checkHits);
+        expectedCount = EMPLOYEE_NAMES.length * COMPANY_NAMES.length *
+                DEPARTMENT_NAMES.length;
+        run(jpql, params3, USE_CACHE, 2, !IS_NAMED_QUERY, expectedCount,
+                checkHits);
 	}
 	
 	/**
@@ -472,59 +489,64 @@
 	 * Prepared Query Cache.
 	 * 
 	 */
-	void compare(boolean isNamed, String jpql, int expectedCount, Object... params) {
+    void compare(boolean isNamed, String jpql, int expectedCount,
+            Object... params) {
 		String realJPQL = isNamed ? getJPQL(jpql) : jpql;
 		// run the query once for warming up 
 		run(jpql, params, !USE_CACHE, 1, isNamed, expectedCount);
 		
 		// run N times without cache
-		long without = run(jpql, params, !USE_CACHE, SAMPLE_SIZE, isNamed, expectedCount);
+        long without = run(jpql, params, !USE_CACHE, SAMPLE_SIZE, isNamed,
+                expectedCount);
 		assertNotCached(realJPQL);
 		
 		// run N times with cache
-		long with = run(jpql, params, USE_CACHE, SAMPLE_SIZE, isNamed, expectedCount);
+        long with = run(jpql, params, USE_CACHE, SAMPLE_SIZE, isNamed,
+                expectedCount);
 		assertCached(realJPQL);
 		
-		long delta = (without == 0) ? 0 : (without - with) * 100 / without;
+        long delta = (without == 0) ? 0 : (without - with) * 100 / without;
 		
 		if (delta < 0) {
 			if (FAIL_ON_PERF_DEGRADE)
-				assertFalse("change in execution time = " + delta + "%", 
+                assertFalse("change in execution time = " + delta + "%", 
 						delta < 0);
 		}
 	}
 
     long run(String jpql, Object[] params, boolean useCache, int N, 
         boolean isNamedQuery, int expectedCount) {
-        return run(jpql, params, useCache, N, isNamedQuery, expectedCount, true);
+        return run(jpql, params, useCache, N, isNamedQuery, expectedCount,
+                true);
     }
 	/**
-	 * Create and run a query N times with the given parameters. The time for 
+     * Create and run a query N times with the given parameters. The time for
 	 * each query execution is measured in nanosecond precision and 
 	 * median time taken in N observation is returned.  
 	 * 
 	 * returns median time taken for single execution.
 	 */
 	long run(String jpql, Object[] params, boolean useCache, int N, 
-			boolean isNamedQuery, int expectedCount, boolean checkHits) {
+            boolean isNamedQuery, int expectedCount, boolean checkHits) {
 		List<Long> stats = new ArrayList<Long>();
 		sql.clear();
 		for (int i = 0; i < N; i++) {
 	        OpenJPAEntityManager em = emf.createEntityManager();
 	        ((OpenJPAEntityManagerSPI)em).setQuerySQLCache(useCache);
-	        assertEquals(useCache, ((OpenJPAEntityManagerSPI)em).getQuerySQLCache());
+            assertEquals(useCache,
+                    ((OpenJPAEntityManagerSPI)em).getQuerySQLCache());
 			long start = System.nanoTime();
 			OpenJPAQuery q = isNamedQuery 
-				? em.createNamedQuery(jpql) : em.createQuery(jpql);
-			for (int j = 0; params != null && j < params.length - 1; j += 2) {
+                ? em.createNamedQuery(jpql) : em.createQuery(jpql);
+            for (int j = 0; params != null && j < params.length - 1; j += 2) {
 				Object key = params[j];
 				Object val = params[j + 1];
 				if (key instanceof Integer)
-					q.setParameter(((Number)key).intValue(), val); 
+                    q.setParameter(((Number)key).intValue(), val); 
 				else if (key instanceof String)
 					q.setParameter(key.toString(), val); 
 				else
-					fail("key " + key + " is neither Number nor String");
+                    fail("key " + key + " is neither Number nor String");
 			}
 			List list = q.getResultList();
 			walk(list);
@@ -553,7 +575,8 @@
 	 * @return
 	 */
 	String getSQL(String queryKey) {
-		PreparedQueryCache cache = emf.getConfiguration().getQuerySQLCacheInstance();
+        PreparedQueryCache cache =
+            emf.getConfiguration().getQuerySQLCacheInstance();
 		if (cache == null)
 			return "null";
 		PreparedQuery query = cache.get(queryKey);
@@ -562,7 +585,7 @@
 	
 	String getJPQL(String namedQuery) {
 		return emf.getConfiguration().getMetaDataRepositoryInstance()
-				  .getQueryMetaData(null, namedQuery, null, true)
+                  .getQueryMetaData(null, namedQuery, null, true)
 				  .getQueryString();
 	}
 	

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/sqlcache/TestPreparedQueryCacheExclusion.java Thu May 21 14:39:31 2009
@@ -42,7 +42,7 @@
 		super.setUp();
 		cache = new PreparedQueryCacheImpl();
 		for (int i = 0; i < keys.length; i++) {
-			PreparedQuery p = new PreparedQueryImpl(keys[i], values[i], null);
+            PreparedQuery p = new PreparedQueryImpl(keys[i], values[i], null);
 			cache.cache(p);
 		}
 	}
@@ -69,8 +69,10 @@
 		int EXCLUDED = 1;
 		cache.addExclusionPattern(keys[EXCLUDED]);
 		
-		PreparedQuery p = new PreparedQueryImpl(keys[EXCLUDED], values[EXCLUDED], null);
-		assertFalse("Must not cache excluded key " + keys[EXCLUDED], cache.cache(p));
+        PreparedQuery p = new PreparedQueryImpl(keys[EXCLUDED],
+                values[EXCLUDED], null);
+        assertFalse("Must not cache excluded key " + keys[EXCLUDED],
+                cache.cache(p));
 	}
 
 	public void testAddExclusionPatternMakesExistingEntryInvalid() {
@@ -92,23 +94,27 @@
 		int EXCLUDED = 1;
 		cache.addExclusionPattern(keys[EXCLUDED]);
 		
-		PreparedQuery p = new PreparedQueryImpl(keys[EXCLUDED], values[EXCLUDED], null);
-		assertFalse("Must not cache excluded key " + keys[EXCLUDED], cache.cache(p));
+        PreparedQuery p = new PreparedQueryImpl(keys[EXCLUDED],
+                values[EXCLUDED], null);
+        assertFalse("Must not cache excluded key " + keys[EXCLUDED],
+                cache.cache(p));
 		
 		cache.removeExclusionPattern(keys[EXCLUDED]);
-		assertTrue("Must cache remove excluded key " + keys[EXCLUDED], cache.cache(p));
+        assertTrue("Must cache remove excluded key " + keys[EXCLUDED],
+                cache.cache(p));
 	}
 
 	public void testRemoveExclusionPatternDoesNotRemoveUserProhbitedKeys() {
 		String USER_MARKED_UNCACHABLE = "[user prohibited]";
 		cache.markUncachable(USER_MARKED_UNCACHABLE);
 		
-		PreparedQuery p = new PreparedQueryImpl(USER_MARKED_UNCACHABLE, "xyz", null);
+        PreparedQuery p = new PreparedQueryImpl(USER_MARKED_UNCACHABLE, "xyz",
+                null);
 		assertFalse("Must not cache user-prohibited key " + 
 				USER_MARKED_UNCACHABLE, cache.cache(p));
 		
 		cache.removeExclusionPattern(USER_MARKED_UNCACHABLE);
-		assertFalse("Must not cache user-prohibited key even when removed " + 
+        assertFalse("Must not cache user-prohibited key even when removed " +
 				USER_MARKED_UNCACHABLE, cache.cache(p));
 	}
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/TestUniqueConstraint.java Thu May 21 14:39:31 2009
@@ -40,7 +40,7 @@
 public class TestUniqueConstraint extends SQLListenerTestCase {
     @Override
     public void setUp(Object... props) {
-    	super.setUp(DROP_TABLES, UniqueA.class, UniqueB.class);    			    
+        super.setUp(DROP_TABLES, UniqueA.class, UniqueB.class);
     }
     
 	public void testMapping() {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueA.java Thu May 21 14:39:31 2009
@@ -91,8 +91,8 @@
 	@JoinTable(name="UNIQUE_JOINTABLE",
 			joinColumns={@JoinColumn(name="FK_A", nullable=false, 
 					referencedColumnName="aid")},
-			inverseJoinColumns={@JoinColumn(name="FK_B", nullable=false, 
+            inverseJoinColumns={@JoinColumn(name="FK_B", nullable=false,
 					referencedColumnName="bid")},
-			uniqueConstraints=@UniqueConstraint(columnNames={"FK_A","FK_B"}))
+            uniqueConstraints=@UniqueConstraint(columnNames={"FK_A","FK_B"}))
 	private Collection<UniqueB> bs;
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/unique/UniqueB.java Thu May 21 14:39:31 2009
@@ -25,10 +25,10 @@
 	   uniqueConstraints={@UniqueConstraint(columnNames={"f1","f2"})})
 public class UniqueB {
 	@Id
-	@GeneratedValue(strategy=GenerationType.TABLE, generator="testGenerator")
+    @GeneratedValue(strategy=GenerationType.TABLE, generator="testGenerator")
 	@TableGenerator(name="testGenerator", table="UNIQUE_GENERATOR", 
 			pkColumnName="GEN1", valueColumnName="GEN2",
-			uniqueConstraints={@UniqueConstraint(columnNames={"GEN1","GEN2"})})
+            uniqueConstraints={@UniqueConstraint(columnNames={"GEN1","GEN2"})})
 	private int bid;
 	
 	// Same named field in UniqueA also is defined as unique

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/Parent.java Thu May 21 14:39:31 2009
@@ -45,9 +45,10 @@
 	private String name;
 	
 	/**
-	 * This field is mapped by the child. The child's table will hold a foreign
-	 * key linking to the primary key of this Parent's table. In JPA terminology, 
-	 * that makes the Child the owner of this bi-directional relationship.
+     * This field is mapped by the child. The child's table will hold a foreign
+     * key linking to the primary key of this Parent's table. In JPA
+     * terminology, that makes the Child the owner of this bi-directional
+     * relationship.
 	 */
 	@OneToMany(mappedBy="parent", cascade = CascadeType.ALL)
 	private Collection<Child> children;
@@ -69,8 +70,8 @@
 	}
 
 	/**
-	 * Creates and adds a child to this receiver. Creating child via the parent
-	 * is the preferred pattern to ensure referential integrity of domain model.
+     * Creates and adds a child to this receiver. Creating child via the parent
+     * is the preferred pattern to ensure referential integrity of domain model.
 	 */
 	public Child newChild(String name) {
 		Child child = new Child();
@@ -87,8 +88,8 @@
 	}
 	
 	/**
-	 * Unsafe way of adding a child. Does not warranty referential integrity.
-	 * The caller has to ensure bi-directionality of parent-child relation is 
+     * Unsafe way of adding a child. Does not warranty referential integrity.
+     * The caller has to ensure bi-directionality of parent-child relation is 
 	 * consistent.
 	 */
 	public void add(Child child) {

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/update/TestParentChild.java Thu May 21 14:39:31 2009
@@ -31,7 +31,7 @@
  * for a Parent-Child model against different physical database constraints.
  * 
  * SQL statement ordering is influenced by 
- * 1. In-memory schema model: The in-memory schema model can be aware of logical 
+ * 1. In-memory schema model: The in-memory schema model can be aware of logical
  *    or physical foreign keys. 
  *    a) This is configured by <code>jdbc.SchemaFactory</code> property setting 
  *       to <code>native(ForeignKeys=true|false)</code> which makes OpenJPA to 
@@ -39,9 +39,9 @@
  *    b) @ForeignKey annotation on the relation -- OpenJPA then considers 
  *       logical foreign key 
  *       
- *  2. Physical Schema: The database schema can be defined with physical foreign 
- *     keys. This is configured by <code>jdbc.MappingDefaults</code> property 
- *     setting to <code>ForeignKeyDeleteAction</code> 
+ *  2. Physical Schema: The database schema can be defined with physical
+ *     foreign keys. This is configured by <code>jdbc.MappingDefaults</code>
+ *     property setting to <code>ForeignKeyDeleteAction</code> 
  *     
  *  3. Update Strategy: the update manager is configured by 
  *     <code>jdbc.UpdateManager</code> 
@@ -66,12 +66,12 @@
 	// Each of these property keys can take multiple possible values 
 	private static String Key_UpdateManager = "openjpa.jdbc.UpdateManager";
 	private static String Key_SchemaFactory = "openjpa.jdbc.SchemaFactory";
-	private static String Key_MappingDefaults = "openjpa.jdbc.MappingDefaults";
+    private static String Key_MappingDefaults = "openjpa.jdbc.MappingDefaults";
 	private static String Key_PersistOrder = "persist-order";
 
 	private static String[] Option_MappingDefaults = {
-		"ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict",
-		"ForeignKeyDeleteAction=none, JoinForeignKeyDeleteAction=none" };
+        "ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict",
+        "ForeignKeyDeleteAction=none, JoinForeignKeyDeleteAction=none" };
 	
 	private static String[] Option_SchemaFactory = {
 		"native(ForeignKeys=false)", 
@@ -91,39 +91,39 @@
 	// The options are added in a static block, so that we can count on
 	// total number of combinations before the test is set up.
 	static {
-		getHelper().addOption(Key_MappingDefaults, Option_MappingDefaults);
+        getHelper().addOption(Key_MappingDefaults, Option_MappingDefaults);
 		getHelper().addOption(Key_SchemaFactory, Option_SchemaFactory);
 		getHelper().addOption(Key_UpdateManager, Option_UpdateManager);
 
 		// The last argument tells that this is a runtime option. So the
 		// values are included to generate combinations but are excluded
 		// from generating OpenJPA configuration.
-		getHelper().addOption(Key_PersistOrder, PersistOrder.values(), true);
+        getHelper().addOption(Key_PersistOrder, PersistOrder.values(), true);
 	}
 
 	public void setUp() {
-		// The options can also be added in setup() as well but then 
-		// coutTestCase() will only record test methods and not multiply them 
-		// with number of configuration combinations the same tests will run.
-		getHelper().addOption(Key_MappingDefaults, Option_MappingDefaults);
+        // The options can also be added in setup() as well but then 
+        // coutTestCase() will only record test methods and not multiply them
+        // with number of configuration combinations the same tests will run.
+        getHelper().addOption(Key_MappingDefaults, Option_MappingDefaults);
 		getHelper().addOption(Key_SchemaFactory, Option_SchemaFactory);
 		getHelper().addOption(Key_UpdateManager, Option_UpdateManager);
 
-		getHelper().addOption(Key_PersistOrder, PersistOrder.values(), true);
+        getHelper().addOption(Key_PersistOrder, PersistOrder.values(), true);
 		
 		sql.clear();
 		super.setUp(DROP_TABLES, Parent.class, Child.class);
 	}
 
 	/**
-	 * This test will run in 2*2*2*3 = 24 times with different configurations.
+     * This test will run in 2*2*2*3 = 24 times with different configurations.
 	 */
 	public void testInsert() {
 		Parent parent = createData(getPersistOrder(), 3);
 		validateData(parent.getId(), 3);
 
-		// verification can be challenging under multiple configuration options
-		// see the methods as exemplars how verification can vary based on
+        // verification can be challenging under multiple configuration options
+        // see the methods as exemplars how verification can vary based on
 		// configuration.
 		assertLogicalOrPhysicalForeignKey();
 		assertPhysicalForeignKeyCreation();
@@ -175,7 +175,7 @@
 	 * for certain combinations of configurations.
 	 */
 	void assertPhysicalForeignKeyCreation() {
-		String regex = "ALTER TABLE .* ADD FOREIGN KEY \\(PARENT_ID\\) " 
+        String regex = "ALTER TABLE .* ADD FOREIGN KEY \\(PARENT_ID\\) "
 		             + "REFERENCES Parent \\(id\\)";
 		if (getMappingDefaults().contains("restrict")) {
 			assertSQL(regex);
@@ -201,8 +201,8 @@
 	 */
 	void assertLogicalOrPhysicalForeignKey() {
 		ForeignKey fk = getChildParentForeignKey();
-		boolean physicalKeyExists = getMappingDefaults().contains("restrict");
-		boolean keyRead = getSchemaFactory().contains("ForeignKeys=true");
+        boolean physicalKeyExists = getMappingDefaults().contains("restrict");
+        boolean keyRead = getSchemaFactory().contains("ForeignKeys=true");
 		if (physicalKeyExists && keyRead)
 			assertFalse(fk.isLogical());
 		else if (keyRead)

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBDeleteUpdateImpl.java Thu May 21 14:39:31 2009
@@ -63,8 +63,8 @@
         assertEquals("runt1", ret.getStringField());
         assertNotNull(ret.getSelfOneOne());
 
-        String ejbqlUpdate =
-            "UPDATE RuntimeTest1 x SET x.stringField = :strngfld WHERE x.stringField = :stdfield";
+        String ejbqlUpdate = "UPDATE RuntimeTest1 x " +
+            "SET x.stringField = :strngfld WHERE x.stringField = :stdfield";
         int updatedEntities = em.createQuery(ejbqlUpdate)
             .setParameter("strngfld", "runner13")
             .setParameter("stdfield", "runt1")

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/clauses/TestEJBPolymorphicQuery.java Thu May 21 14:39:31 2009
@@ -57,8 +57,9 @@
     }
 
     /**
-     * Ensures that when a select query is ran against an entity at the top of the hierarchy
-     * that the result is its instances and that of all its subclass.
+     * Ensures that when a select query is ran against an entity at the top of
+     * the hierarchy that the result is its instances and that of all its
+     * subclass.
      */
     public void testPolymorphicSelect() {
         EntityManager em = currentEntityManager();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEJBQLCondExpression.java Thu May 21 14:39:31 2009
@@ -79,8 +79,8 @@
 
     public void testBetweenExpr() {
         EntityManager em = currentEntityManager();
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age BETWEEN 19 AND 40 AND o.computerName = 'PC'";
+        String query = "SELECT o.name FROM CompUser o WHERE" +
+            " o.age BETWEEN 19 AND 40 AND o.computerName = 'PC'";
 
         List result = em.createQuery(query).getResultList();
 
@@ -94,8 +94,8 @@
 
     public void testNotBetweenExpr() {
         EntityManager em = currentEntityManager();
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age NOT BETWEEN 19 AND 40 AND o.computerName= 'PC'";
+        String query = "SELECT o.name FROM CompUser o " +
+            "WHERE o.age NOT BETWEEN 19 AND 40 AND o.computerName= 'PC'";
 
         List result = em.createQuery(query).getResultList();
 
@@ -139,16 +139,16 @@
     public void testLikeExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT o.computerName FROM CompUser o WHERE o.name LIKE 'Sha%' AND o.computerName NOT IN ('PC')";
+        String query = "SELECT o.computerName FROM CompUser o WHERE o.name " +
+            "LIKE 'Sha%' AND o.computerName NOT IN ('PC')";
 
         List result = em.createQuery(query).getResultList();
 
         assertNotNull(result);
         assertEquals(0, result.size());
 
-        query =
-            "SELECT o.computerName FROM CompUser o WHERE o.name LIKE 'Sha%o_' AND o.computerName NOT IN ('UNIX')";
+        query = "SELECT o.computerName FROM CompUser o WHERE o.name " +
+            "LIKE 'Sha%o_' AND o.computerName NOT IN ('UNIX')";
 
         result = em.createQuery(query).getResultList();
 
@@ -175,8 +175,8 @@
     public void testNullExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT o.name FROM CompUser o WHERE o.age IS NOT NULL AND o.computerName = 'PC' ";
+        String query = "SELECT o.name FROM CompUser o WHERE o.age IS NOT NULL" +
+            " AND o.computerName = 'PC' ";
 
         List result = em.createQuery(query).getResultList();
 
@@ -259,7 +259,8 @@
 
         String query =
             "SELECT DISTINCT o.name FROM CompUser o WHERE NOT EXISTS" +
-                " (SELECT s FROM CompUser s WHERE s.address.country = o.address.country)";
+                " (SELECT s FROM CompUser s " +
+                "WHERE s.address.country = o.address.country)";
 
         List result = em.createQuery(query).getResultList();
 
@@ -274,7 +275,8 @@
 
         String query =
             "SELECT o.name FROM CompUser o WHERE o.address.zipcode = ANY (" +
-                " SELECT s.computerName FROM CompUser s WHERE s.address.country IS NOT NULL )";
+                " SELECT s.computerName FROM CompUser s " +
+                "WHERE s.address.country IS NOT NULL )";
 
         List result = em.createQuery(query).getResultList();
 
@@ -287,9 +289,9 @@
     public void testConstructorExpr() {
         EntityManager em = currentEntityManager();
 
-        String query =
-            "SELECT NEW org.apache.openjpa.persistence.common.apps.MaleUser(c.name, c.computerName, c.address, c.age, c.userid)" +
-                " FROM CompUser c WHERE c.name = 'Seetha'";
+        String query = "SELECT NEW org.apache.openjpa.persistence.common.apps" +
+               ".MaleUser(c.name, c.computerName, c.address, c.age, c.userid)" +
+               " FROM CompUser c WHERE c.name = 'Seetha'";
 
         MaleUser male = (MaleUser) em.createQuery(query).getSingleResult();
 



Mime
View raw message