You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/05/21 16:39:43 UTC
svn commit: r777135 [8/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...
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestEntityTypeExpression.java Thu May 21 14:39:31 2009
@@ -99,14 +99,16 @@
user = rs.get(0);
assertEquals("Shannon", user.getName());
- query = "SELECT e FROM CompUser e where TYPE(e) in ?1 and e.age in ?2 ORDER By e.name";
+ query = "SELECT e FROM CompUser e where TYPE(e) in ?1 and e.age in ?2" +
+ " ORDER By e.name";
rs = em.createQuery(query).
setParameter(1, params).
setParameter(2, params2).getResultList();
user = rs.get(0);
assertEquals("Famzy", user.getName());
- query = "SELECT e FROM CompUser e where TYPE(e) in :params ORDER BY e.age";
+ query = "SELECT e FROM CompUser e where TYPE(e) in :params " +
+ "ORDER BY e.age";
rs = em.createQuery(query).
setParameter("params", params).getResultList();
user = rs.get(0);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/expressions/TestJPQLScalarExpressions.java Thu May 21 14:39:31 2009
@@ -97,7 +97,7 @@
List rs = em.createQuery(query).getResultList();
Object[] result = (Object[]) rs.get(1);
- assertEquals("the name is not shannon ", "Shannon ", result[0]);
+ assertEquals("the name is not shannon ", "Shannon ", result[0]);
assertNull("is not null", result[1]);
endTx(em);
@@ -160,25 +160,31 @@
startTx(em);
String update = "update CompUser c set c.creditRating = " +
" CASE c.age WHEN 35 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.POOR" +
" WHEN 11 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD" +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.EXCELLENT" +
" END ";
int updateCount = em.createQuery(update).executeUpdate();
assertEquals("the result is not 6", 6, updateCount);
/*
- //Derby fails but DB2 worksh
+ //Derby fails but DB2 works
String update2 = "update CompUser c set c.creditRating = " +
" (select " +
" CASE c1.age WHEN 10 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ CompUser$CreditRating.POOR" +
" WHEN 19 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD " +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD " +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT " +
+ "org.apache.openjpa.persistence.common.apps." +
+ CompUser$CreditRating.EXCELLENT " +
" END " +
" from CompUser c1" +
" where c.userid = c1.userid)";
@@ -229,11 +235,14 @@
String query3 = " select e.name, " +
"CASE WHEN e.age = 11 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.POOR" +
" WHEN e.age = 35 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD" +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.EXCELLENT" +
" END FROM CompUser e ORDER BY e.age";
List rs3 = em.createQuery(query3).getResultList();
Object[] result3 = (Object[]) rs3.get(0);
@@ -244,21 +253,27 @@
// this jpql fail with NPE in Derby. It works with DB2
String update2 = "update CompUser c set c.creditRating = " +
" CASE WHEN c.name ='Jacob' THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps.CompUser$
+ CreditRating.POOR" +
" WHEN c.name = 'Ugo' THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD " +
+ "org.apache.openjpa.persistence.common.apps.CompUser$
+ CreditRating.GOOD " +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT " +
+ "org.apache.openjpa.persistence.common.apps.CompUser$
+ CreditRating.EXCELLENT " +
" END ";
*/
String update2 = "update CompUser c set c.creditRating = " +
" CASE WHEN c.age > 30 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.POOR" +
" WHEN c.age < 15 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD " +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD " +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT " +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.EXCELLENT " +
" END ";
int updateCount = em.createQuery(update2).executeUpdate();
assertEquals("the result is not 6", 6, updateCount);
@@ -267,11 +282,14 @@
"where e.creditRating = " +
"(select " +
"CASE WHEN e1.age = 11 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.POOR" +
" WHEN e1.age = 35 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD" +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.EXCELLENT" +
" END " +
"from CompUser e1" +
" where e.userid = e1.userid) ORDER BY e.age";
@@ -284,11 +302,14 @@
String update3 = "update CompUser c set c.creditRating = " +
" CASE c.age WHEN 35 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.POOR" +
" WHEN 11 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD " +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.GOOD " +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT " +
+ "org.apache.openjpa.persistence.common.apps." +
+ "CompUser$CreditRating.EXCELLENT " +
" END ";
result = em.createQuery(update3).executeUpdate();
assertEquals("the result is not 6", 6, result);
@@ -298,11 +319,14 @@
String update4 = "update CompUser c set c.creditRating = " +
" (select " +
" CASE c1.age WHEN 10 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.POOR" +
+ "org.apache.openjpa.persistence.common.apps.
+ CompUser$CreditRating.POOR" +
" WHEN 19 THEN " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.GOOD" +
+ "org.apache.openjpa.persistence.common.apps
+ .CompUser$CreditRating.GOOD" +
" ELSE " +
- "org.apache.openjpa.persistence.common.apps.CompUser$CreditRating.EXCELLENT" +
+ "org.apache.openjpa.persistence.common.apps.
+ CompUser$CreditRating.EXCELLENT" +
" END " +
" from CompUser c1" +
" where c.userid = c1.userid)";
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestEJBQLFunction.java Thu May 21 14:39:31 2009
@@ -284,8 +284,8 @@
public void testGroupByHavingClause() {
EntityManager em = currentEntityManager();
- String query =
- "SELECT c.name FROM CompUser c GROUP BY c.name HAVING c.name LIKE 'S%'";
+ String query = "SELECT c.name FROM CompUser c GROUP BY c.name "
+ + "HAVING c.name LIKE 'S%'";
List result = em.createQuery(query).getResultList();
@@ -301,8 +301,8 @@
public void testOrderByClause() {
EntityManager em = currentEntityManager();
- String query =
- "SELECT c.name FROM CompUser c WHERE c.name LIKE 'S%' ORDER BY c.name";
+ String query = "SELECT c.name FROM CompUser c WHERE c.name LIKE 'S%' "
+ + "ORDER BY c.name";
List result = em.createQuery(query).getResultList();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/functions/TestSetParameter.java Thu May 21 14:39:31 2009
@@ -61,7 +61,8 @@
public void testSetPositionalParameter() {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- String query = "UPDATE CompUser e set e.name= ?1, e.age = ?2 WHERE e.userid = ?3";
+ String query = "UPDATE CompUser e set e.name= ?1, e.age = ?2 "
+ + "WHERE e.userid = ?3";
int count = em.createQuery(query).
setParameter(1, UPDATED_NAME).
@@ -78,7 +79,8 @@
public void testSetPositionalParameterInNonIntutiveOrder() {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- String query = "UPDATE CompUser e set e.name= ?2, e.age = ?1 WHERE e.userid = ?3";
+ String query = "UPDATE CompUser e set e.name= ?2, e.age = ?1 "
+ + "WHERE e.userid = ?3";
int count = em.createQuery(query).
setParameter(2, UPDATED_NAME).
@@ -96,7 +98,8 @@
public void testSetNamedParameter() {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- String query = "UPDATE CompUser e set e.name= :name, e.age = :age WHERE e.userid = :id";
+ String query = "UPDATE CompUser e set e.name= :name, e.age = :age "
+ + "WHERE e.userid = :id";
int count = em.createQuery(query).
setParameter("name", UPDATED_NAME).
@@ -114,7 +117,8 @@
public void testNativeSQL() {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- int count = em.createNativeQuery("INSERT INTO Address (id, city, country, streetAd, zipcode) VALUES (?,?,?,?,?)")
+ int count = em.createNativeQuery("INSERT INTO Address (id, city,"
+ + " country, streetAd, zipcode) VALUES (?,?,?,?,?)")
.setParameter(1, System.currentTimeMillis()%10000)
.setParameter(2, "Some City")
.setParameter(3, "Some Country")
@@ -130,7 +134,8 @@
public CompUser createUser(String name, String cName, int age,
boolean isMale) {
CompUser user = null;
- Address addr = new Address("43 Sansome", "SF", "United-Kingdom", "94104");
+ Address addr = new Address("43 Sansome", "SF", "United-Kingdom",
+ "94104");
if (isMale) {
user = new MaleUser();
user.setName(name);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jpql/joins/TestEJBJoins.java Thu May 21 14:39:31 2009
@@ -120,8 +120,8 @@
try {
List ls = em.createQuery(query).getResultList();
- fail(
- "Not permitted to specify an id variable for entities ref. by the right side of fetch join");
+ fail("Not permitted to specify an id variable for entities ref." +
+ " by the right side of fetch join");
}
catch (Exception e) {
//suppose to throw an exception..should not pass
@@ -133,9 +133,8 @@
public void testLeftOuterJoin() {
EntityManager em = currentEntityManager();
- String ljoin =
- "SELECT DISTINCT s.name FROM Student s LEFT OUTER JOIN s.department d " +
- "WHERE d.name = 'CompSci2'";
+ String ljoin = "SELECT DISTINCT s.name FROM Student s " +
+ "LEFT OUTER JOIN s.department d WHERE d.name = 'CompSci2'";
List ls = em.createQuery(ljoin).getResultList();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java Thu May 21 14:39:31 2009
@@ -51,7 +51,8 @@
import org.apache.openjpa.persistence.OpenJPAEntityManager;
-public abstract class BaseKernelTest extends org.apache.openjpa.persistence.common.utils.AbstractTestCase
+public abstract class BaseKernelTest
+ extends org.apache.openjpa.persistence.common.utils.AbstractTestCase
{
private static Map _sysprops = new HashMap();
@@ -67,7 +68,8 @@
return currentEntityManager();
}
- protected OpenJPAEntityManager getPM(boolean optimistic,boolean retainValues)
+ protected OpenJPAEntityManager getPM(boolean optimistic,
+ boolean retainValues)
{
OpenJPAEntityManager em = currentEntityManager();
em.setNontransactionalRead(true);
@@ -111,7 +113,9 @@
Properties loaded = (Properties) _sysprops.get(str);
if (loaded == null) {
loaded = new Properties();
- ConfigurationProvider cp = (ConfigurationProvider) Configurations.getProperty(str, null);
+ ConfigurationProvider cp =
+ (ConfigurationProvider) Configurations.getProperty(
+ str, null);
if (cp != null)
loaded.putAll(cp.getProperties());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/Test2EJBConcurrency.java Thu May 21 14:39:31 2009
@@ -102,15 +102,19 @@
// Entity1 b1 = (Entity1) em1.find (Entity1.class, 3);
// Entity1 b2 = (Entity1) em2.find (Entity1.class, 3);
//
-// assertEquals ("b1.getstringField is not STRING as exp.","STRING", b1.getStringField ());
-// assertEquals ("b2.getstringField is not STRING as exp.","STRING", b2.getStringField ());
+// assertEquals("b1.getstringField is not STRING as exp.", "STRING",
+// b1.getStringField());
+// assertEquals("b2.getstringField is not STRING as exp.", "STRING",
+// b2.getStringField());
//
-// b1.setStringField ("STRING2");
+// b1.setStringField("STRING2");
// endTx(em1);
-// assertEquals ("b1.getstringField is not STRING as exp.","STRING2", b1.getStringField ());
+// assertEquals("b1.getstringField is not STRING as exp.", "STRING2",
+// b1.getStringField());
//
-// assertEquals ("b2.getstringField is not STRING as exp.","STRING", b2.getStringField ());
-// b2.setStringField ("STRING3");
+// assertEquals("b2.getstringField is not STRING as exp.", "STRING",
+// b2.getStringField());
+// b2.setStringField("STRING3");
//
// try
// {
@@ -126,7 +130,8 @@
//
//
// b2 = (Entity1) em2.find (Entity1.class, 3);
-// assertEquals ("b2.getstringField is not STRING2 as exp.","STRING2", b2.getStringField ());
+// assertEquals ("b2.getstringField is not STRING2 as exp.", "STRING2",
+// b2.getStringField ());
//
// endEm(em1);
// endEm(em2);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestAbstractMappedAppIdSuper.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestAbstractMappedAppIdSuper.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestAbstractMappedAppIdSuper.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestAbstractMappedAppIdSuper.java Thu May 21 14:39:31 2009
@@ -57,15 +57,18 @@
// endEm(pm,());
//
// pm = getPM();
-// String query = "SELECT DISTINCT o FROM ConcreteMappedAppIdSub o WHERE o.pk = :p ";
+// String query = "SELECT DISTINCT o FROM ConcreteMappedAppIdSub o "
+// + "WHERE o.pk = :p ";
// OpenJPAQuery q = pm.createQuery(query);
//
-//// OpenJPAQuery q = pm.createNativeQuery("pk == :p", ConcreteMappedAppIdSub.class);
+// OpenJPAQuery q = pm.createNativeQuery(
+// "pk == :p", ConcreteMappedAppIdSub.class);
// //FIXME jthomas
//
// try
// {
-// pc = (ConcreteMappedAppIdSub) q.setParameter("p", pkd).getSingleResult();
+// pc = (ConcreteMappedAppIdSub) q.setParameter("p", pkd)
+// .getSingleResult();
// }
// catch (RuntimeException re)
// {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestCalendarFields.java Thu May 21 14:39:31 2009
@@ -125,16 +125,27 @@
assertEquals(1, size);
-// assertSize(0, pm.newQuery(CalendarFields.class, "singapore < :date").execute(new Date(time - 100000)));
+// assertSize(0, pm.newQuery(CalendarFields.class,
+// "singapore < :date").execute(new Date(time - 100000)));
//
-// assertSize(0, pm.newQuery(CalendarFields.class, "singapore > :date").execute(new Date(time + 100000)));
-// assertSize(1, pm.newQuery(CalendarFields.class, "singapore > :date").execute(new Date(time - 100000)));
+// assertSize(0, pm.newQuery(CalendarFields.class,
+// "singapore > :date").execute(new Date(time + 100000)));
+// assertSize(1, pm.newQuery(CalendarFields.class,
+// "singapore > :date").execute(new Date(time - 100000)));
//
-// assertSize(1, pm.newQuery(CalendarFields.class, "singapore < :date").execute(newCalendar(new Date(time + 100000), null)));
-// assertSize(0, pm.newQuery(CalendarFields.class, "singapore < :date").execute(newCalendar(new Date(time - 100000), null)));
+// assertSize(1, pm.newQuery(CalendarFields.class,
+// "singapore < :date").execute(newCalendar(new Date(time + 100000),
+// null)));
+// assertSize(0, pm.newQuery(CalendarFields.class,
+// "singapore < :date").execute(newCalendar(new Date(time - 100000),
+// null)));
//
-// assertSize(0, pm.newQuery(CalendarFields.class, "singapore > :date").execute(newCalendar(new Date(time + 100000), null)));
-// assertSize(1, pm.newQuery(CalendarFields.class, "singapore > :date").execute(newCalendar(new Date(time - 100000), null)));
+// assertSize(0, pm.newQuery(CalendarFields.class,
+// "singapore > :date").execute(newCalendar(new Date(time + 100000),
+// null)));
+// assertSize(1, pm.newQuery(CalendarFields.class,
+// "singapore > :date").execute(newCalendar(new Date(time - 100000),
+// null)));
endEm(pm);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java Thu May 21 14:39:31 2009
@@ -140,7 +140,8 @@
public void testDetachWithGroups() {
OpenJPAEntityManager pm = getPM();
//FIXME jthomas
-// pm.getFetchPlan().setDetachmentOptions(FetchPlanImpl.DETACH_LOAD_FIELDS | FetchPlanImpl.DETACH_UNLOAD_FIELDS);
+// pm.getFetchPlan().setDetachmentOptions(
+// FetchPlanImpl.DETACH_LOAD_FIELDS | FetchPlanImpl.DETACH_UNLOAD_FIELDS);
pm.setDetachState(DetachStateType.FETCH_GROUPS);
pm.getFetchPlan().addFetchGroup("all");
AttachB b = pm.find(AttachB.class, oid);
@@ -528,7 +529,8 @@
Options opts = new Options();
opts.put("jdo", "true");
PCEnhancer.run(conf, new String[]{
- "org.apache.openjpa.persistence.kernel.noenhance.DetachSMPC" }, opts);
+ "org.apache.openjpa.persistence.kernel.noenhance.DetachSMPC" },
+ opts);
}
private void assertDetachedSM(Object obj) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDynamicFetchPlan.java Thu May 21 14:39:31 2009
@@ -39,7 +39,7 @@
private static final String JPQL = "select a from FetchA a";
public void setUp() {
- super.setUp(CLEAR_TABLES, FetchBase.class, FetchA.class, FetchB.class);
+ super.setUp(CLEAR_TABLES, FetchBase.class, FetchA.class, FetchB.class);
createData();
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBInterfaces.java Thu May 21 14:39:31 2009
@@ -114,7 +114,8 @@
// startTx(em);
// hold = (InterfaceHolder)em.find(InterfaceHolder.class, 1);
// assertEquals (1, hold.getIntfs ().size ());
-// assertEquals ("intf-1-set", ((InterfaceTest) hold.getIntfs ().iterator ().next ()).getStringField ());
+// assertEquals ("intf-1-set", ((InterfaceTest) hold.getIntfs().iterator().
+// next()).getStringField());
// endTx(em);
// endEm(em);
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java Thu May 21 14:39:31 2009
@@ -66,8 +66,9 @@
// do some searching in the first PM
List l2 = buildSelectQuery(pm, "x");
- assertEquals(0,
- l2.size()); //should be zero if retainvalue is set to true but that is kodo specific.
+ //should be zero if retainvalue is set to true but that is kodo
+ //specific.
+ assertEquals(0, l2.size());
List l3 = buildSelectQuery(pm, "y");
assertEquals(1, l3.size());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroups.java Thu May 21 14:39:31 2009
@@ -43,7 +43,8 @@
import org.apache.openjpa.persistence.kernel.common.apps.AttachE;
import org.apache.openjpa.persistence.kernel.common.apps.AttachF;
import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
-import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObjectChild;
+import org.apache.openjpa.persistence.kernel.common.apps.
+ FetchGroupTestObjectChild;
import org.apache.openjpa.kernel.OpenJPAStateManager;
import org.apache.openjpa.meta.FieldMetaData;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java Thu May 21 14:39:31 2009
@@ -32,7 +32,8 @@
import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
-import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObjectChild;
+import org.apache.openjpa.persistence.kernel.common.apps.
+ FetchGroupTestObjectChild;
import org.apache.openjpa.persistence.Extent;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java Thu May 21 14:39:31 2009
@@ -32,7 +32,8 @@
import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObject;
-import org.apache.openjpa.persistence.kernel.common.apps.FetchGroupTestObjectChild;
+import org.apache.openjpa.persistence.kernel.common.apps.
+ FetchGroupTestObjectChild;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
import org.apache.openjpa.persistence.OpenJPAQuery;
@@ -50,7 +51,8 @@
}
protected FetchGroupTestObject getO1(OpenJPAEntityManager pm) {
-// OpenJPAQuery q = pm.createNativeQuery("a == 5",FetchGroupTestObject.class);
+// OpenJPAQuery q = pm.createNativeQuery("a == 5",
+// FetchGroupTestObject.class);
// return (FetchGroupTestObject)
// ((Collection) q.getResultList()).iterator().next();
@@ -62,7 +64,8 @@
}
protected FetchGroupTestObject getO2(OpenJPAEntityManager pm) {
-// OpenJPAQuery q = pm.createNativeQuery("a == 3",FetchGroupTestObject.class);
+// OpenJPAQuery q = pm.createNativeQuery("a == 3",
+// FetchGroupTestObject.class);
// return (FetchGroupTestObject)
// ((Collection) q.getResultList()).iterator().next();
@@ -74,7 +77,8 @@
}
protected FetchGroupTestObjectChild getC1(OpenJPAEntityManager pm) {
-// OpenJPAQuery q = pm.createNativeQuery("a == 4",FetchGroupTestObjectChild.class);
+// OpenJPAQuery q = pm.createNativeQuery("a == 4",
+// FetchGroupTestObjectChild.class);
// return (FetchGroupTestObjectChild)
// ((Collection) q.getResultList()).iterator().next();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestFetchPlan.java Thu May 21 14:39:31 2009
@@ -493,7 +493,8 @@
}
private void clearTestData() throws Exception {
-// OpenJPAEntityManagerFactory pmf =(OpenJPAEntityManagerFactory) getEmf();
+// OpenJPAEntityManagerFactory pmf =
+// (OpenJPAEntityManagerFactory) getEmf();
// OpenJPAConfiguration conf=pmf.getConfiguration();
//
// Class.forName(pmf.getConfiguration().getConnection2DriverName());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java Thu May 21 14:39:31 2009
@@ -28,7 +28,8 @@
-import org.apache.openjpa.persistence.kernel.common.apps.ModInstanceCallbackTests;
+import org.apache.openjpa.persistence.kernel.common.apps.
+ ModInstanceCallbackTests;
import org.apache.openjpa.persistence.kernel.common.apps.ModRuntimeTest1;
import org.apache.openjpa.event.AbstractTransactionListener;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java Thu May 21 14:39:31 2009
@@ -130,7 +130,7 @@
/*
* ### some remaining test deletes:
* PDirty => PDeleted => PDeletedFlushed
-* PDirty => (change and flush) PDirty => PDeleted => PDeletedFlushed
+* PDirty => (change and flush) PDirty => PDeleted => PDeletedFlushed
* PClean => PDeleted => PDeletedFlushed
* Hollow => PDeleted => PDeletedFlushed
*/
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java Thu May 21 14:39:31 2009
@@ -172,11 +172,12 @@
private RuntimeTest1 getObject(OpenJPAEntityManager pm) {
// return (RuntimeTest1) ((Collection)
-// pm.createNativeQuery( "stringField == \"TestInitialValueFetching\"",RuntimeTest1.class)
-// .getResultList()).iterator().next();
+// pm.createNativeQuery( "stringField == "
+// +"\"TestInitialValueFetching\"",RuntimeTest1.class)
+// .getResultList()).iterator().next();
- OpenJPAQuery q = pm.createQuery(
- "SELECT o FROM RuntimeTest1 o WHERE o.stringField = \'TestInitialValueFetching\'");
+ OpenJPAQuery q = pm.createQuery("SELECT o FROM RuntimeTest1 o "
+ + "WHERE o.stringField = \'TestInitialValueFetching\'");
List l = q.getResultList();
return (RuntimeTest1) l.iterator().next();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java Thu May 21 14:39:31 2009
@@ -198,7 +198,8 @@
endEm(pm1);
}
-// FIX ME: aokeke - test is taking so much resource and causing subsequent test to fail
+// FIX ME: aokeke - test is taking so much resource and causing
+// subsequent test to fail
// public void testNoLockGroupSuccess() {
// OpenJPAEntityManager pm1 = getPM(false, false);
// startTx(pm1,());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java Thu May 21 14:39:31 2009
@@ -68,13 +68,14 @@
/**
* Test that configuration is frozen after retrieving a factory.
*
- * This test case is for kodo persistencemanagerfactories and not openjpaentitymanagers.
- * therefore its been commented out.
+ * This test case is for kodo persistencemanagerfactories and not
+ * openjpaentitymanagers. Therefore it's been commented out.
* FIX ME: aokeke
*/
/* public void testConfigurationFreeze()
{
- OpenJPAEntityManagerFactory pmf = getOpenJPAEntityManagerFactory(_conf.toProperties(false));
+ OpenJPAEntityManagerFactory pmf =
+ getOpenJPAEntityManagerFactory(_conf.toProperties(false));
assertEquals("user", pmf.getConfiguration().getConnection2UserName());
assertEquals("url", pmf.getConfiguration().getConnection2URL());
try
@@ -90,22 +91,25 @@
/**
* Test that persistence manager factories are being pooled.
*
- * This test case is for kodo persistencemanagerfactories. It doesnt apply to
- * openjpaentitymanagerfactories therefore it will be commented out.
+ * This test case is for kodo persistencemanagerfactories. It doesnt apply
+ * to openjpaentitymanagerfactories therefore it will be commented out.
* FIX ME: aokeke
*/
/*public void testFactoryPooling() {
Properties props = new Properties();
props.putAll(_conf.toProperties(false));
- OpenJPAEntityManagerFactory pmf1 = getOpenJPAEntityManagerFactory(props);
+ OpenJPAEntityManagerFactory pmf1 =
+ getOpenJPAEntityManagerFactory(props);
props = new Properties();
props.putAll(_conf.toProperties(false));
- OpenJPAEntityManagerFactory pmf2 = getOpenJPAEntityManagerFactory(props);
+ OpenJPAEntityManagerFactory pmf2 =
+ getOpenJPAEntityManagerFactory(props);
props = new Properties();
props.putAll(_conf.toProperties(false));
- OpenJPAEntityManagerFactory pmf3 = getOpenJPAEntityManagerFactory(props);
+ OpenJPAEntityManagerFactory pmf3 =
+ getOpenJPAEntityManagerFactory(props);
_conf.setConnectionURL("url2");
props = new Properties();
@@ -115,12 +119,17 @@
props = new Properties();
props.putAll(_conf.toProperties(false));
- OpenJPAEntityManagerFactory pmf5 = getOpenJPAEntityManagerFactory(_conf.toProperties(false));
+ OpenJPAEntityManagerFactory pmf5 =
+ getOpenJPAEntityManagerFactory(_conf.toProperties(false));
- assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) == JPAFacadeHelper.toBrokerFactory(pmf2));
- assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) == JPAFacadeHelper.toBrokerFactory(pmf3));
- assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) != JPAFacadeHelper.toBrokerFactory(pmf4));
- assertTrue(JPAFacadeHelper.toBrokerFactory(pmf4) == JPAFacadeHelper.toBrokerFactory(pmf5));
+ assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) ==
+ JPAFacadeHelper.toBrokerFactory(pmf2));
+ assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) ==
+ JPAFacadeHelper.toBrokerFactory(pmf3));
+ assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) !=
+ JPAFacadeHelper.toBrokerFactory(pmf4));
+ assertTrue(JPAFacadeHelper.toBrokerFactory(pmf4) ==
+ JPAFacadeHelper.toBrokerFactory(pmf5));
}*/
/**
@@ -166,17 +175,18 @@
/**
* Tests that pooling is maintained on deserialization.
- * This test case is for kodo persistencemanagerfactories. It doesnt apply to
- * openjpaentitymanagerfactories therefore it will be commented out.
+ * This test case is for kodo persistencemanagerfactories. It doesnt apply
+ * to openjpaentitymanagerfactories therefore it will be commented out.
*/
/*
public void testFactorySerialization()
throws Exception {
- OpenJPAEntityManagerFactory pmf1 = getOpenJPAEntityManagerFactory(_conf.toProperties(false));
+ OpenJPAEntityManagerFactory pmf1 =
+ getOpenJPAEntityManagerFactory(_conf.toProperties(false));
Object pmf2 = roundtrip(pmf1, true);
assertEquals(pmf1, pmf2);
assertTrue(JPAFacadeHelper.toBrokerFactory(pmf1) ==
- JPAFacadeHelper.toBrokerFactory((OpenJPAEntityManagerFactory) pmf2));
+ JPAFacadeHelper.toBrokerFactory((OpenJPAEntityManagerFactory) pmf2));
}
*/
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java Thu May 21 14:39:31 2009
@@ -127,8 +127,8 @@
* Test that pessimistic locking is working by attempting to update the same
* object in the data store.
*
- * @param useReentrantLock true if we want to synchronize on a lock instead of relying on
- * the data store (used for validating the test case).
+ * @param useReentrantLock true if we want to synchronize on a lock instead
+ * of relying on the data store (used for validating the test case).
*/
public void pessimisticLockingTest(boolean useReentrantLock)
throws Throwable {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestProxies2.java Thu May 21 14:39:31 2009
@@ -289,7 +289,7 @@
assertTrue("pc.getComp() is not instanceof Proxy",
pc.getComp() instanceof Proxy);
assertTrue(
- "(TreeSet) is not pc.getComp()).comparator() instanceof ComparableComparator",
+ "(TreeSet) is not pc.getComp()).comparator() instanceof ComparableComparator",
((TreeSet) pc.getComp())
.comparator() instanceof ComparableComparator);
pm.evict(pc);
@@ -302,7 +302,7 @@
Comparator compart = ((TreeSet) pc.getComp()).comparator();
assertNotNull("compart is null", compart);
assertTrue(
- "((TreeSet) is not pc.getComp()).comparator()instanceof ComparableComparator",
+ "((TreeSet) is not pc.getComp()).comparator()instanceof ComparableComparator",
((TreeSet) pc.getComp())
.comparator() instanceof ComparableComparator);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSecondClassValues.java Thu May 21 14:39:31 2009
@@ -527,7 +527,8 @@
{
assertEquals (collection.size retrievedCollection.size ());
} catch (AssertionFailedError afe) {
- bug (AbstractTestCase.Platform.SQLSERVER, 2, afe, "Second-class collections"
+ bug (AbstractTestCase.Platform.SQLSERVER, 2, afe,
+ "Second-class collections"
+ " are not being retrieved correctly");
}
*/
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSimple.java Thu May 21 14:39:31 2009
@@ -63,8 +63,8 @@
{
OpenJPAEntityManager pm = getPM();
startTx(pm);
- String theQuery =
- "SELECT r FROM RuntimeTest1 r WHERE r.stringField = \'testSimple\'";
+ String theQuery = "SELECT r FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple\'";
OpenJPAQuery query = pm.createQuery(theQuery);
List list = query.getResultList();
assertSize(1, list);
@@ -76,8 +76,8 @@
{
OpenJPAEntityManager pm = getPM();
startTx(pm);
- String theQuery =
- "SELECT r FROM RuntimeTest1 r WHERE r.stringField = \'testSimple\'";
+ String theQuery = "SELECT r FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple\'";
OpenJPAQuery query = pm.createQuery(theQuery);
RuntimeTest1 toUpdate = (RuntimeTest1) query.getSingleResult();
toUpdate.setStringField("testSimple2");
@@ -86,10 +86,10 @@
pm = getPM();
startTx(pm);
- String query1 =
- "SELECT r FROM RuntimeTest1 r WHERE r.stringField = \'testSimple\'";
- String query2 =
- "SELECT r FROM RuntimeTest1 r WHERE r.stringField = \'testSimple2\'";
+ String query1 = "SELECT r FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple\'";
+ String query2 = "SELECT r FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple2\'";
OpenJPAQuery q1 = pm.createQuery(query1);
OpenJPAQuery q2 = pm.createQuery(query2);
assertSize(0, q1.getResultList());
@@ -114,8 +114,8 @@
{
OpenJPAEntityManager pm = getPM();
startTx(pm);
- String delete =
- "DELETE FROM RuntimeTest1 r WHERE r.stringField = \'testSimple2\'";
+ String delete = "DELETE FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple2\'";
OpenJPAQuery deleteQuery = pm.createQuery(delete);
int deleted = deleteQuery.executeUpdate();
endTx(pm);
@@ -123,8 +123,8 @@
pm = getPM();
startTx(pm);
- String select =
- "SELECT r FROM RuntimeTest1 r WHERE r.stringField = \'testSimple2\'";
+ String select = "SELECT r FROM RuntimeTest1 r "
+ + "WHERE r.stringField = \'testSimple2\'";
OpenJPAQuery selectQuery = pm.createQuery(select);
assertSize(0, selectQuery.getResultList());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java Thu May 21 14:39:31 2009
@@ -238,7 +238,8 @@
try {
saveAndQuery(aftt, "testbyte =", new Byte(Byte.MIN_VALUE));
} catch (Throwable t) {
- //bug(AbstractTestCase.Platform.EMPRESS, 889, t, "Empress cannot store min values");
+ //bug(AbstractTestCase.Platform.EMPRESS, 889, t,
+ // "Empress cannot store min values");
Assert.fail(
"Exception was thrown while storing Byte.MIN_VALUE : \n" +
getStackTrace(t));
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java Thu May 21 14:39:31 2009
@@ -96,8 +96,11 @@
// */
// endEm(pm,());
/*OpenJPAEntityManager pm = getPM();
- OpenJPAQuery q = pm.createQuery("SELECT c FROM TestStaticInnerClasses.Inner c WHERE c.string = 'foo' ORDER BY c.string ASC");
- q.setCandidateCollection((Collection)pm.createExtent(TestStaticInnerClasses.Inner.class, false));
+ OpenJPAQuery q = pm.createQuery(
+ "SELECT c FROM TestStaticInnerClasses.Inner c "
+ + "WHERE c.string = 'foo' ORDER BY c.string ASC");
+ q.setCandidateCollection((Collection)pm.createExtent(
+ TestStaticInnerClasses.Inner.class, false));
try
{
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Entity1.java Thu May 21 14:39:31 2009
@@ -36,7 +36,8 @@
@Table(name = "entity_1")
@Inheritance(strategy = InheritanceType.JOINED)
@SqlResultSetMapping(name = "NativeTestResult", entities = @EntityResult(
- entityClass = org.apache.openjpa.persistence.kernel.common.apps.Entity1.class))
+ entityClass =
+ org.apache.openjpa.persistence.kernel.common.apps.Entity1.class))
public class Entity1 implements Serializable {
private static final long serialVersionUID = 2882935803066041165L;
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerFindPermutation.java Thu May 21 14:39:31 2009
@@ -139,7 +139,8 @@
public void testFindWritePessimisticForceInc() {
commonFindTest(
"testFind(Write,Commit/PessimisticForceInc,Commit)",
- LockModeType.WRITE, Act.CommitTx, 1, ExpectingOptimisticLockExClass,
+ LockModeType.WRITE, Act.CommitTx, 1,
+ ExpectingOptimisticLockExClass,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null);
commonFindTest(
"testFind(Write,Commit/PessimisticForceInc,Rollback)",
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerLockPermutation.java Thu May 21 14:39:31 2009
@@ -139,7 +139,8 @@
public void testLockWritePessimisticForceInc() {
commonLockTest(
"testLock(Write,Commit/PessimisticForceInc,Commit)",
- LockModeType.WRITE, Act.CommitTx, 1, ExpectingOptimisticLockExClass,
+ LockModeType.WRITE, Act.CommitTx, 1,
+ ExpectingOptimisticLockExClass,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 1, null);
commonLockTest(
"testLock(Write,Commit/PessimisticForceInc,Rollback)",
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/lockmgr/TestMixedLockManagerRefreshPermutation.java Thu May 21 14:39:31 2009
@@ -140,7 +140,8 @@
public void testRefreshWritePessimisticForceInc() {
commonRefreshTest(
"testRefresh(Write,Commit/PessimisticForceInc,Commit)",
- LockModeType.WRITE, Act.CommitTx, 2, ExpectingOptimisticLockExClass,
+ LockModeType.WRITE, Act.CommitTx, 2,
+ ExpectingOptimisticLockExClass,
LockModeType.PESSIMISTIC_FORCE_INCREMENT, Act.CommitTx, 2, null);
commonRefreshTest(
"testRefresh(Write,Commit/PessimisticForceInc,Rollback)",
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/managedinterface/TestManagedInterfaces.java Thu May 21 14:39:31 2009
@@ -35,7 +35,8 @@
import org.apache.openjpa.meta.ClassMetaData;
import org.apache.openjpa.persistence.PersistenceException;
-@AllowFailure(message="On JDK6 Upgrade these tests are failing with wrong mapping. " +
+@AllowFailure(message=
+ "On JDK6 Upgrade these tests are failing with wrong mapping. " +
"Column PC_ID in ManagedInterfaceSup Table is not created. getPC() is " +
"defined as property in ManageIFace sub-interface")
public class TestManagedInterfaces extends SingleEMFTestCase {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/ImplicitFieldAccessSubclass.java Thu May 21 14:39:31 2009
@@ -52,7 +52,8 @@
return mapRelationKeyEmbedded;
}
- public void setMapRelationKeyEmbedded(Map<Embed0, ExplicitPropertyAccess> map) {
+ public void setMapRelationKeyEmbedded(
+ Map<Embed0, ExplicitPropertyAccess> map) {
this.mapRelationKeyEmbedded = map;
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestMetamodel.java Thu May 21 14:39:31 2009
@@ -92,7 +92,8 @@
assertCategory(PersistenceType.MAPPED_SUPERCLASS,
ImplicitFieldAccessMappedSuperclass.class);
assertCategory(PersistenceType.ENTITY, ImplicitFieldAccessBase.class);
- assertCategory(PersistenceType.ENTITY, ImplicitFieldAccessSubclass.class);
+ assertCategory(PersistenceType.ENTITY,
+ ImplicitFieldAccessSubclass.class);
assertCategory(PersistenceType.EMBEDDABLE, Embed0.class);
assertCategory(PersistenceType.EMBEDDABLE, Embed1.class);
@@ -139,7 +140,8 @@
assertSame(e0.getAttribute("f0"), e0.getAttribute("f0", String.class));
assertSame(e1.getAttribute("f0"), e1.getAttribute("f0", String.class));
assertNotSame(e0.getAttribute("f0"), e1.getAttribute("f0"));
- assertNotSame(e0.getAttribute("f0", String.class), e1.getAttribute("f0", String.class));
+ assertNotSame(e0.getAttribute("f0", String.class), e1.getAttribute("f0",
+ String.class));
assertNotNull(e0.getDeclaredAttribute("f0"));
try {
e1.getDeclaredAttribute("f0");
@@ -150,10 +152,12 @@
}
public void testPCCollection() {
- ManagedType<ImplicitFieldAccessBase> e0 = model.entity(ImplicitFieldAccessBase.class);
- ManagedType<ExplicitFieldAccess> r1 = model.entity(ExplicitFieldAccess.class);
- Collection relColl
- = e0.getCollection("collectionRelation", ExplicitFieldAccess.class);
+ ManagedType<ImplicitFieldAccessBase> e0 =
+ model.entity(ImplicitFieldAccessBase.class);
+ ManagedType<ExplicitFieldAccess> r1 =
+ model.entity(ExplicitFieldAccess.class);
+ Collection relColl =
+ e0.getCollection("collectionRelation", ExplicitFieldAccess.class);
assertEquals(CollectionType.COLLECTION, relColl.getCollectionType());
assertEquals(e0, relColl.getDeclaringType());
assertEquals(r1, relColl.getElementType());
@@ -163,8 +167,10 @@
}
public void testPCList() {
- ManagedType<ImplicitFieldAccessBase> e0 = model.entity(ImplicitFieldAccessBase.class);
- ManagedType<ExplicitFieldAccess> r1 = model.entity(ExplicitFieldAccess.class);
+ ManagedType<ImplicitFieldAccessBase> e0 =
+ model.entity(ImplicitFieldAccessBase.class);
+ ManagedType<ExplicitFieldAccess> r1 =
+ model.entity(ExplicitFieldAccess.class);
List relList = e0.getList("listRelation", ExplicitFieldAccess.class);
assertEquals(CollectionType.LIST, relList.getCollectionType());
assertEquals(e0, relList.getDeclaringType());
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/meta/TestPersistentClasses.java Thu May 21 14:39:31 2009
@@ -72,7 +72,8 @@
public void testJPAClasspathScanner() {
Map map = new HashMap();
- map.put("openjpa.MetaDataFactory", "jpa(ClasspathScan=src;jdk1.5-test)");
+ map.put("openjpa.MetaDataFactory",
+ "jpa(ClasspathScan=src;jdk1.5-test)");
OpenJPAEntityManagerFactory pmf = getEmf(map);
assertClass(RuntimeTest1.class,
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TestProxyCollection.java Thu May 21 14:39:31 2009
@@ -51,7 +51,7 @@
}
/**
- * Tests that a uniform tree can be modified with different fan outs at each
+ * Tests that a uniform tree can be modified with different fan outs at each
* level. This is not a persistent operation, just in-memory.
*/
public void testModifyTree() {
@@ -66,7 +66,7 @@
}
/**
- * Tests that a uniform tree is persisted and later fetched back with same
+ * Tests that a uniform tree is persisted and later fetched back with same
* number of children at every level.
*/
public void testPersistTree() {
@@ -88,7 +88,7 @@
public void testAddAndRemove() {
int[] original = {2,3,4};
- int[] modifier = {4,3,2}; // add 1 at Level 1 + remove 1 at Level 3
+ int[] modifier = {4,3,2}; // add 1 at Level 1 + remove 1 at Level 3
createModifyAndMerge(original, modifier);
}
@@ -134,7 +134,7 @@
/**
* Create a uniform tree with given fan out.
* Persist.
- * Verify that the tree is stored by fetching it in a separate persistence
+ * Verify that the tree is stored by fetching it in a separate persistence
* context.
*/
TreeNode create(int[] original) {
@@ -158,8 +158,9 @@
assertArrayEquals(fanOuts, test.getFanOuts());
}
- /** Asserts the given arrays have exactly same elements at the same index.
- */
+ /**
+ * Asserts the given arrays have exactly same elements at the same index.
+ */
void assertArrayEquals(int[] a, int[] b) {
assertEquals(a.length, b.length);
for (int i = 0; i<a.length; i++)
@@ -167,7 +168,7 @@
}
/**
- * Asserts that the given object is a proxy collection and whether it is
+ * Asserts that the given object is a proxy collection and whether it is
* tracking changes.
*/
void assertProxyCollection(Object o, boolean tracking) {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/proxy/TreeNode.java Thu May 21 14:39:31 2009
@@ -89,7 +89,7 @@
}
/**
- * Insert a child node at the specified position in the list of children.
+ * Insert a child node at the specified position in the list of children.
*/
public void addNode(TreeNode node, int position) {
checkSequenceRange(position);
@@ -126,7 +126,7 @@
throws IllegalArgumentException {
int size = childern.size();
if (sequence < 0 || sequence > size)
- throw new IllegalArgumentException("Sequence number is beyond "
+ throw new IllegalArgumentException("Sequence number is beyond "
+ "range of 0 to " + size + ".");
}
@@ -135,8 +135,8 @@
}
/**
- * Create a uniform subtree below the receiver. Uniform subtree implies that
- * each child at a level L has equal number of grand children at level L+1.
+ * Create a uniform subtree below the receiver. Uniform subtree implies that
+ * each child at a level L has equal number of grand children at level L+1.
*
* @param fanOuts
* array of fan outs for children at every level.
@@ -145,7 +145,7 @@
if (fanOuts.length == 0)
return;
int[] nextFanOuts = new int[fanOuts.length];
- System.arraycopy(fanOuts, 1, nextFanOuts, 0, fanOuts.length - 1);
+ System.arraycopy(fanOuts, 1, nextFanOuts, 0, fanOuts.length - 1);
for (int j = 0; j < fanOuts[0]; j++) {
TreeNode child = new TreeNode();
child.setName(getName() + "." + j);
@@ -162,7 +162,7 @@
return;
int n = fanOuts[0];
int[] nextFanOuts = new int[fanOuts.length];
- System.arraycopy(fanOuts, 1, nextFanOuts, 0, fanOuts.length - 1);
+ System.arraycopy(fanOuts, 1, nextFanOuts, 0, fanOuts.length - 1);
List<TreeNode> children = getNodes();
int diff = children.size() - n;
if (diff < 0) {
@@ -203,7 +203,7 @@
}
for (int j = 0; j < fanOuts.length - 1; j++)
if (fanOuts[j] != fanOuts[j + 1])
- throw new RuntimeException("non-uniform fanouts for children "
+ throw new RuntimeException("non-uniform fanouts for children "
+ " of " + getName());
int[] newList = new int[list.length + 1];
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/BaseQueryTest.java Thu May 21 14:39:31 2009
@@ -44,7 +44,8 @@
import org.apache.openjpa.persistence.JPAFacadeHelper;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
-public abstract class BaseQueryTest extends org.apache.openjpa.persistence.common.utils.AbstractTestCase {
+public abstract class BaseQueryTest
+ extends org.apache.openjpa.persistence.common.utils.AbstractTestCase {
private static Map _sysprops = new HashMap();
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/Order.java Thu May 21 14:39:31 2009
@@ -76,8 +76,9 @@
}
public String toString(){
- return "Order:"+oid+" amount:"+amount+" delivered:"+delivered+" customer:"+
- ( customer!=null ? customer.getCid() : -1 );
+ return "Order:" + oid + " amount:" + amount
+ + " delivered:" + delivered
+ + " customer:" + ( customer != null ? customer.getCid() : -1 );
}
public Collection<OrderItem> getLineitems() {
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity.java Thu May 21 14:39:31 2009
@@ -36,8 +36,10 @@
@NamedQuery(name="FindXTwo", query="select s from simple s where s.name = ?1")
@NamedQueries( {
- @NamedQuery(name="FindOne", query="select s from simple s where s.name = ?1"),
- @NamedQuery(name="FindOne", query="select s from simple s where s.name = ?1"),
+ @NamedQuery(name="FindOne",
+ query="select s from simple s where s.name = ?1"),
+ @NamedQuery(name="FindOne",
+ query="select s from simple s where s.name = ?1"),
@NamedQuery(name="FindAll", query="select s from simple s")
})
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/SimpleEntity2.java Thu May 21 14:39:31 2009
@@ -30,8 +30,10 @@
@NamedQuery(name="FindXTwo", query="select s from simple2 s where s.name = ?1")
@NamedQueries( {
- @NamedQuery(name="FindOne", query="select s from simple2 s where s.name = ?1"),
- @NamedQuery(name="Find2One", query="select s from simple2 s where s.name = ?1"),
+ @NamedQuery(name="FindOne",
+ query="select s from simple2 s where s.name = ?1"),
+ @NamedQuery(name="Find2One",
+ query="select s from simple2 s where s.name = ?1"),
@NamedQuery(name="Find2All", query="select s from simple2 s")
})
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestAccessPathsOfSubqueries.java Thu May 21 14:39:31 2009
@@ -52,7 +52,9 @@
public void testSimpleSubqueryAccessPath() {
Broker broker = getBrokerFactory().newBroker();
Query q = broker.newQuery(JPQLParser.LANG_JPQL,
- "SELECT o FROM RuntimeTest1 o WHERE EXISTS (SELECT rt5.name FROM RuntimeTest5 rt5 WHERE rt5.name IS NOT NULL)");
+ "SELECT o FROM RuntimeTest1 o WHERE EXISTS ("
+ + "SELECT rt5.name FROM RuntimeTest5 rt5 "
+ + "WHERE rt5.name IS NOT NULL)");
ClassMetaData[] metas = q.getAccessPathMetaDatas();
Collection c = Arrays.asList(metas);
ClassMetaData rt1 = broker.getConfiguration().
@@ -69,7 +71,9 @@
public void testRelationTraversalSubqueryAccessPath() {
Broker broker = getBrokerFactory().newBroker();
Query q = broker.newQuery(JPQLParser.LANG_JPQL,
- "SELECT o FROM RuntimeTest1 o WHERE EXISTS (SELECT rt5.runtimeTest4.name FROM RuntimeTest5 rt5 WHERE rt5.name IS NOT NULL)");
+ "SELECT o FROM RuntimeTest1 o WHERE EXISTS ("
+ + "SELECT rt5.runtimeTest4.name FROM RuntimeTest5 rt5 "
+ + "WHERE rt5.name IS NOT NULL)");
ClassMetaData[] metas = q.getAccessPathMetaDatas();
Collection c = Arrays.asList(metas);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestComplexQueries.java Thu May 21 14:39:31 2009
@@ -81,7 +81,8 @@
broker.begin();
// test against database
-// OpenJPAQuery q = pm.createQuery("SELECT o FROM "+c.getSimpleName()+"o WHERE o."+filter);
+ //OpenJPAQuery q = pm.createQuery("SELECT o FROM " +
+ //c.getSimpleName() + "o WHERE o." + filter);
String qstrng =
"SELECT o FROM " + c.getSimpleName() + " o WHERE o." + filter;
assertSize(size,
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBDeleteUpdateImpl.java Thu May 21 14:39:31 2009
@@ -73,7 +73,8 @@
assertNotNull(ret.getSelfOneOne());
String ejbqlUpdate =
- "UPDATE RuntimeTest1 x SET x.stringField = :strngfld WHERE x.stringField = :stdfield";
+ "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/query/TestEJBPolymorphicQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestEJBPolymorphicQuery.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/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/query/TestNewEntityAsQueryParameter.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestNewEntityAsQueryParameter.java Thu May 21 14:39:31 2009
@@ -110,8 +110,10 @@
}
@SuppressWarnings("unchecked")
- void queryWithParameter(EntityManager em, Projekt projekt1, Projekt projekt2) {
- String jpql = "SELECT DISTINCT o FROM Osoba o WHERE :projekt MEMBER OF o.projekty";
+ void queryWithParameter(EntityManager em, Projekt projekt1,
+ Projekt projekt2) {
+ String jpql =
+ "SELECT DISTINCT o FROM Osoba o WHERE :projekt MEMBER OF o.projekty";
em.getTransaction().begin();
Query query = em.createQuery(jpql);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java?rev=777135&r1=777134&r2=777135&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/query/TestProjectionQueryWithIdenticalResult.java Thu May 21 14:39:31 2009
@@ -22,8 +22,10 @@
import javax.persistence.EntityManager;
-import org.apache.openjpa.persistence.jdbc.common.apps.UnidirectionalOneToOneOwned;
-import org.apache.openjpa.persistence.jdbc.common.apps.UnidirectionalOneToOneOwner;
+import org.apache.openjpa.persistence.jdbc.common.apps.
+ UnidirectionalOneToOneOwned;
+import org.apache.openjpa.persistence.jdbc.common.apps.
+ UnidirectionalOneToOneOwner;
import org.apache.openjpa.persistence.test.SingleEMFTestCase;
@@ -58,44 +60,48 @@
}
public void testDuplicateResultInProjection1() {
- String jpql = "SELECT p.owned, p FROM UnidirectionalOneToOneOwner p";
+ String jpql = "SELECT p.owned, p FROM UnidirectionalOneToOneOwner p";
List<Object[]> result = executeQuery(jpql, USE_TXN);
for (Object[] row : result) {
- assertTrue(row[0] instanceof UnidirectionalOneToOneOwned);
- assertTrue(row[1] instanceof UnidirectionalOneToOneOwner);
- assertTrue(((UnidirectionalOneToOneOwner)row[1]).getOwned() == row[0]);
+ assertTrue(row[0] instanceof UnidirectionalOneToOneOwned);
+ assertTrue(row[1] instanceof UnidirectionalOneToOneOwner);
+ assertTrue(((UnidirectionalOneToOneOwner)row[1]).getOwned() ==
+ row[0]);
}
}
public void testDuplicateResultInProjection2() {
- String jpql = "SELECT p, p.owned FROM UnidirectionalOneToOneOwner p";
+ String jpql = "SELECT p, p.owned FROM UnidirectionalOneToOneOwner p";
List<Object[]> result = executeQuery(jpql, USE_TXN);
for (Object[] row : result) {
- assertTrue(row[1] instanceof UnidirectionalOneToOneOwned);
- assertTrue(row[0] instanceof UnidirectionalOneToOneOwner);
- assertTrue(((UnidirectionalOneToOneOwner)row[0]).getOwned() == row[1]);
+ assertTrue(row[1] instanceof UnidirectionalOneToOneOwned);
+ assertTrue(row[0] instanceof UnidirectionalOneToOneOwner);
+ assertTrue(((UnidirectionalOneToOneOwner)row[0]).getOwned() ==
+ row[1]);
}
}
public void testDuplicateResultInProjection3() {
- String jpql = "SELECT p, q FROM UnidirectionalOneToOneOwner p, " +
- "UnidirectionalOneToOneOwned q WHERE p.owned = q";
+ String jpql = "SELECT p, q FROM UnidirectionalOneToOneOwner p, " +
+ "UnidirectionalOneToOneOwned q WHERE p.owned = q";
List<Object[]> result = executeQuery(jpql, USE_TXN);
for (Object[] row : result) {
- assertTrue(row[0] instanceof UnidirectionalOneToOneOwner);
- assertTrue(row[1] instanceof UnidirectionalOneToOneOwned);
- assertTrue(((UnidirectionalOneToOneOwner)row[0]).getOwned() == row[1]);
+ assertTrue(row[0] instanceof UnidirectionalOneToOneOwner);
+ assertTrue(row[1] instanceof UnidirectionalOneToOneOwned);
+ assertTrue(((UnidirectionalOneToOneOwner)row[0]).getOwned() ==
+ row[1]);
}
}
public void testDuplicateResultInProjection4() {
- String jpql = "SELECT q, p FROM UnidirectionalOneToOneOwner p, " +
- "UnidirectionalOneToOneOwned q WHERE p.owned = q";
+ String jpql = "SELECT q, p FROM UnidirectionalOneToOneOwner p, " +
+ "UnidirectionalOneToOneOwned q WHERE p.owned = q";
List<Object[]> result = executeQuery(jpql, USE_TXN);
for (Object[] row : result) {
- assertTrue(row[0] instanceof UnidirectionalOneToOneOwned);
- assertTrue(row[1] instanceof UnidirectionalOneToOneOwner);
- assertTrue(((UnidirectionalOneToOneOwner)row[1]).getOwned() == row[0]);
+ assertTrue(row[0] instanceof UnidirectionalOneToOneOwned);
+ assertTrue(row[1] instanceof UnidirectionalOneToOneOwner);
+ assertTrue(((UnidirectionalOneToOneOwner)row[1]).getOwned()==
+ row[0]);
}
}