svn commit: r1022609 - in /openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf: TestOverrideNonJtaDataSource.java TestSwitchConnection.java

[allee8285]

Author: allee8285
Date: Thu Oct 14 16:42:49 2010
New Revision: 1022609

URL: http://svn.apache.org/viewvc?rev=1022609&view=rev
Log:
OPENJPA-1764 Per agreement with Donald, change test case skip condition from || 
to &&.

Modified:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java?rev=1022609&r1=1022608&r2=1022609&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestOverrideNonJtaDataSource.java
 Thu Oct 14 16:42:49 2010
@@ -54,7 +54,8 @@ public class TestOverrideNonJtaDataSourc
         super.setUp(Person.class, CLEAR_TABLES);
         OpenJPAEntityManager em = emf.createEntityManager();
         JDBCConfiguration conf = (JDBCConfiguration) em.getConfiguration();
-        if (conf.getConnectionUserName() != null || 
!conf.getConnectionUserName().equals("")) {
+        String user = conf.getConnectionUserName();
+        if (user != null && !user.equals("")) {
             // Disable for non-Derby, due to connectionUserName to schema 
mapping failures
             setTestsDisabled(true);
             getLog().trace("TestOverrideNonJtaDataSource can only be executed 
against Derby w/o a schema");

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java?rev=1022609&r1=1022608&r2=1022609&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/conf/TestSwitchConnection.java
 Thu Oct 14 16:42:49 2010
@@ -52,7 +52,8 @@ public class TestSwitchConnection extend
         super.setUp(Person.class, CLEAR_TABLES);
         OpenJPAEntityManager em = emf.createEntityManager();
         JDBCConfiguration conf = (JDBCConfiguration) em.getConfiguration();
-        if (conf.getConnectionUserName() != null || 
!conf.getConnectionUserName().equals("")) {
+        String user = conf.getConnectionUserName();
+        if (user != null && !user.equals("")) {
             // Disable for non-Derby, due to connectionUserName to schema 
mapping failures
             setTestsDisabled(true);
             getLog().trace("TestOverrideNonJtaDataSource can only be executed 
against Derby w/o a schema");