directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r894581 - in /directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ: TestClassA.java TestClassB.java TestSuite.java TestSuiteServer.java TestSuiteWithoutFactory.java
Date Wed, 30 Dec 2009 10:46:43 GMT
Author: kayyagari
Date: Wed Dec 30 10:46:42 2009
New Revision: 894581

URL: http://svn.apache.org/viewvc?rev=894581&view=rev
Log:
o modified the ApplyLdifs annotation processing to take a series of strings without 
  specifying new lines and concatenating with +
o modified the data in ApplyLdifs annotations accordingly

Modified:
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
    directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=894581&r1=894580&r2=894581&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
Wed Dec 30 10:46:42 2009
@@ -33,10 +33,16 @@
 @CreateDS( name="ClassDS" )
 @ApplyLdifs(
     {
-        "dn: cn=testClassA,ou=system\n" + 
-        "objectClass: person\n" + 
-        "cn: testClassA\n" + 
-        "sn: sn_testClassA\n"
+        "dn: cn=testClassA,ou=system", 
+        "objectClass: person", 
+        "cn: testClassA", 
+        "sn: sn_testClassA",
+        
+        "dn: cn=testClassA2,ou=system", 
+        "objectClass: person", 
+        "cn: testClassA2", 
+        "sn: sn_testClassA2"
+        
     })
 public class TestClassA extends AbstractLdapTestUnit
 {
@@ -44,10 +50,10 @@
     @CreateDS( name="testDS" )
     @ApplyLdifs(
         {
-            "dn: cn=testMethodA,ou=system\n" + 
-            "objectClass: person\n" + 
-            "cn: testMethodA\n" + 
-            "sn: sn_testMethodA\n" 
+            "dn: cn=testMethodA,ou=system", 
+            "objectClass: person",
+            "cn: testMethodA", 
+            "sn: sn_testMethodA" 
         })
     public void testWithFactoryAnnotation() throws Exception
     {
@@ -64,10 +70,10 @@
     @Test
     @ApplyLdifs(
         {
-            "dn: cn=testMethodWithApplyLdif,ou=system\n" + 
-            "objectClass: person\n" + 
-            "cn: testMethodWithApplyLdif\n" + 
-            "sn: sn_testMethodWithApplyLdif\n" 
+            "dn: cn=testMethodWithApplyLdif,ou=system", 
+            "objectClass: person", 
+            "cn: testMethodWithApplyLdif", 
+            "sn: sn_testMethodWithApplyLdif" 
         })
     public void testWithoutFactoryAnnotation() throws Exception
     {
@@ -77,6 +83,7 @@
         }
 
         assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassA,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassA2,ou=system"
) ) );
         assertFalse( service.getAdminSession().exists( new LdapDN( "cn=testMethodA,ou=system"
) ) );
         assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testMethodWithApplyLdif,ou=system"
) ) );
     }

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=894581&r1=894580&r2=894581&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
Wed Dec 30 10:46:42 2009
@@ -30,10 +30,10 @@
 @RunWith( FrameworkRunner.class )
 @ApplyLdifs(
     {
-        "dn: cn=testClassB,ou=system\n" + 
-        "objectClass: person\n" + 
-        "cn: testClassB\n" + 
-        "sn: sn_testClassB\n"
+        "dn: cn=testClassB,ou=system", 
+        "objectClass: person", 
+        "cn: testClassB", 
+        "sn: sn_testClassB"
     })
 public class TestClassB extends AbstractLdapTestUnit
 {

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java?rev=894581&r1=894580&r2=894581&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
Wed Dec 30 10:46:42 2009
@@ -28,10 +28,10 @@
 @CreateDS( name = "SuiteDS" )
 @ApplyLdifs(
     {
-        "dn: cn=testSuite,ou=system\n" + 
-        "objectClass: person\n" + 
-        "cn: testSuite\n" + 
-        "sn: sn_testSuite\n" 
+        "dn: cn=testSuite,ou=system", 
+        "objectClass: person", 
+        "cn: testSuite", 
+        "sn: sn_testSuite" 
     })
 public class TestSuite
 {

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java?rev=894581&r1=894580&r2=894581&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
Wed Dec 30 10:46:42 2009
@@ -58,10 +58,10 @@
     })
 @ApplyLdifs(
     {
-        "dn: cn=testSuite,ou=system\n" + 
-        "objectClass: person\n" + 
-        "cn: testSuite\n" + 
-        "sn: sn_testSuite\n" 
+        "dn: cn=testSuite,ou=system",
+        "objectClass: person",
+        "cn: testSuite",
+        "sn: sn_testSuite" 
     } )
 public class TestSuiteServer
 {

Modified: directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java?rev=894581&r1=894580&r2=894581&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java
(original)
+++ directory/apacheds/branches/apacheds-schema/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java
Wed Dec 30 10:46:42 2009
@@ -26,10 +26,10 @@
 @Suite.SuiteClasses({ TestClassA.class, TestClassB.class, TestClassC.class })
 @ApplyLdifs(
     {
-        "dn: cn=testSuite,ou=system\n" + 
-        "objectClass: person\n" + 
-        "cn: testSuite\n" + 
-        "sn: sn_testSuite\n" 
+        "dn: cn=testSuite,ou=system", 
+        "objectClass: person", 
+        "cn: testSuite", 
+        "sn: sn_testSuite" 
     })
 public class TestSuiteWithoutFactory
 {



Mime
View raw message