Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8314593F4 for ; Wed, 29 Feb 2012 16:00:34 +0000 (UTC) Received: (qmail 55796 invoked by uid 500); 29 Feb 2012 16:00:34 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55764 invoked by uid 500); 29 Feb 2012 16:00:34 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 55757 invoked by uid 99); 29 Feb 2012 16:00:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 16:00:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Feb 2012 16:00:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4C75A23889E1 for ; Wed, 29 Feb 2012 16:00:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1295168 - in /directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ: TestClassA.java TestClassB.java TestSuite.java TestSuiteServer.java TestSuiteWithoutFactory.java TestWithClassLevelLdapServer.java Date: Wed, 29 Feb 2012 16:00:06 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120229160006.4C75A23889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Wed Feb 29 16:00:05 2012 New Revision: 1295168 URL: http://svn.apache.org/viewvc?rev=1295168&view=rev Log: Reformatted the code Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Wed Feb 29 16:00:05 2012 @@ -42,49 +42,48 @@ import org.junit.runner.RunWith; "objectClass: person", "cn: testClassA2", "sn: sn_testClassA2" - }) public class TestClassA extends AbstractLdapTestUnit { -@Test -@CreateDS(name = "testDS") -@ApplyLdifs( + @Test + @CreateDS(name = "testDS") + @ApplyLdifs( + { + "dn: cn=testMethodA,ou=system", + "objectClass: person", + "cn: testMethodA", + "sn: sn_testMethodA" + }) + public void testWithFactoryAnnotation() throws Exception { - "dn: cn=testMethodA,ou=system", - "objectClass: person", - "cn: testMethodA", - "sn: sn_testMethodA" -}) -public void testWithFactoryAnnotation() throws Exception -{ - if ( isRunInSuite ) - { - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + if ( isRunInSuite ) + { + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + } + + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) ); + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) ); } - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) ); - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) ); -} - -@Test -@ApplyLdifs( + @Test + @ApplyLdifs( + { + "dn: cn=testMethodWithApplyLdif,ou=system", + "objectClass: person", + "cn: testMethodWithApplyLdif", + "sn: sn_testMethodWithApplyLdif" + }) + public void testWithoutFactoryAnnotation() throws Exception { - "dn: cn=testMethodWithApplyLdif,ou=system", - "objectClass: person", - "cn: testMethodWithApplyLdif", - "sn: sn_testMethodWithApplyLdif" -}) -public void testWithoutFactoryAnnotation() throws Exception -{ - if ( isRunInSuite ) - { - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + if ( isRunInSuite ) + { + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + } + + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) ); + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA2,ou=system" ) ) ); + assertFalse( getService().getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) ); + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testMethodWithApplyLdif,ou=system" ) ) ); } - - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA,ou=system" ) ) ); - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassA2,ou=system" ) ) ); - assertFalse( getService().getAdminSession().exists( new Dn( "cn=testMethodA,ou=system" ) ) ); - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testMethodWithApplyLdif,ou=system" ) ) ); -} } Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java Wed Feb 29 16:00:05 2012 @@ -35,35 +35,34 @@ import org.junit.runner.RunWith; "objectClass: person", "cn: testClassB", "sn: sn_testClassB" -}) + }) public class TestClassB extends AbstractLdapTestUnit { - -@Test -@CreateDS(name = "testDS") -public void testWithFactoryAnnotation() throws Exception -{ - if ( isRunInSuite ) + @Test + @CreateDS(name = "testDS") + public void testWithFactoryAnnotation() throws Exception { - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + if ( isRunInSuite ) + { + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + } + + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) ); } - - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) ); -} - - -@Test -public void testWithoutFactoryAnnotation() throws Exception -{ - // this assertion will only work if ran as part of TestSuite - // commenting this to make maven report test success, uncomment in an IDE - // while running the TestSuite - // assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); - if ( isRunInSuite ) + + + @Test + public void testWithoutFactoryAnnotation() throws Exception { - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + // this assertion will only work if ran as part of TestSuite + // commenting this to make maven report test success, uncomment in an IDE + // while running the TestSuite + // assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + if ( isRunInSuite ) + { + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testSuite,ou=system" ) ) ); + } + + assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) ); } - - assertTrue( getService().getAdminSession().exists( new Dn( "cn=testClassB,ou=system" ) ) ); -} } Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java Wed Feb 29 16:00:05 2012 @@ -27,7 +27,11 @@ import org.junit.runners.Suite; @RunWith(FrameworkSuite.class) @Suite.SuiteClasses( - { TestClassA.class, TestClassB.class, TestClassC.class }) + { + TestClassA.class, + TestClassB.class, + TestClassC.class + }) @CreateDS(name = "SuiteDS") @ApplyLdifs( { @@ -35,7 +39,7 @@ import org.junit.runners.Suite; "objectClass: person", "cn: testSuite", "sn: sn_testSuite" -}) + }) public class TestSuite { } Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java Wed Feb 29 16:00:05 2012 @@ -32,7 +32,10 @@ import org.junit.runners.Suite; @RunWith(FrameworkSuite.class) @Suite.SuiteClasses( - { TestClassServer.class, TestMultiLevelDS.class }) + { + TestClassServer.class, + TestMultiLevelDS.class + }) @CreateDS( name = "SuiteDS", partitions = @@ -51,8 +54,8 @@ import org.junit.runners.Suite; @CreateIndex(attribute = "objectClass"), @CreateIndex(attribute = "dc"), @CreateIndex(attribute = "ou") - }) - }) + }) + }) @CreateLdapServer( transports = { @@ -65,7 +68,7 @@ import org.junit.runners.Suite; "objectClass: person", "cn: testSuite", "sn: sn_testSuite" -}) + }) public class TestSuiteServer { } Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java Wed Feb 29 16:00:05 2012 @@ -26,14 +26,18 @@ import org.junit.runners.Suite; @RunWith(FrameworkSuite.class) @Suite.SuiteClasses( - { TestClassA.class, TestClassB.class, TestClassC.class }) + { + TestClassA.class, + TestClassB.class, + TestClassC.class + }) @ApplyLdifs( { "dn: cn=testSuite,ou=system", "objectClass: person", "cn: testSuite", "sn: sn_testSuite" -}) + }) public class TestSuiteWithoutFactory { } Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java?rev=1295168&r1=1295167&r2=1295168&view=diff ============================================================================== --- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java (original) +++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java Wed Feb 29 16:00:05 2012 @@ -36,7 +36,7 @@ import org.junit.runner.RunWith; transports = { @CreateTransport(protocol = "LDAP") - }) + }) public class TestWithClassLevelLdapServer extends AbstractLdapTestUnit { @Test