You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/02/29 17:00:06 UTC
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
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