svn commit: r662094 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/secureUsersldap.out tests/jdbcapi/_Suite.java

[my...@apache.org]

Author: myrnavl
Date: Sat May 31 14:53:42 2008
New Revision: 662094

URL: http://svn.apache.org/viewvc?rev=662094&view=rev
Log:
DERBY-3659; modifying _Suite so it checks for property derbyTesting.ldapServer
  instead of derbyTesting.ldapUser, and only runs xaJNDITest if it's set; also
  removing old 'sample' master file. 

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/secureUsersldap.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?rev=662094&r1=662093&r2=662094&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java Sat May 31 14:53:42 2008
@@ -141,17 +141,19 @@
             // functionality. 
             // Also, LDAPAuthentication needs properties passed in or is 
             // pointless (unless we can find a test LDAP Server)
-            String ldapUser=getSystemProperty("derbyTesting.ldapServer");
-            if (ldapUser == null || ldapUser.length() < 1)
-                suite.addTest(new TestSuite("LDAPAuthenticationTest requires properties " +
-                        "derbyTesting." +
-                "[ldapServer, ldapPort ldapUser, ldapPassword, dnString]"));
+            String ldapServer=getSystemProperty("derbyTesting.ldapServer");
+            if (ldapServer == null || ldapServer.length() < 1)
+                suite.addTest(new TestSuite(
+                    "LDAPAuthenticationTest and XAJNDITest require " +
+                    "derbyTesting.ldap* properties."));
             else
+            {
                 suite.addTest(LDAPAuthenticationTest.suite());
+                suite.addTest(XAJNDITest.suite());
+            }
             suite.addTest(InvalidLDAPServerAuthenticationTest.suite());
-            suite.addTest(XAJNDITest.suite());
         }
 
         return suite;
 	}
-}
+}
\ No newline at end of file