Author: elecharny
Date: Fri Dec 18 16:04:37 2009
New Revision: 892290

URL: http://svn.apache.org/viewvc?rev=892290&view=rev
Log:
Added Asserts and easy to read labels

Modified:
    directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
    directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
    directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java

Modified: directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?rev=892290&r1=892289&r2=892290&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java Fri Dec 18 16:04:37 2009
@@ -1,20 +1,23 @@
 package org.apache.directory.server.core.integ;
 
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith( FrameworkRunner.class )
-@Factory( "TestClassAFactory" )
+@Factory( "ClassAFactory" )
 public class TestClassA
 {
 
     public static String factoryLabel;
     
     @Test
-    @Factory( "testDummyFactory" )
+    @Factory( "ClassATestFactory" )
     public void testWithFactoryAnnotation()
     {
+        assertEquals( "ClassATestFactory", factoryLabel );
         System.out.println( "factoryLabel = " + factoryLabel );
     }
     
@@ -22,6 +25,7 @@
     @Test
     public void testWithoutFactoryAnnotation()
     {
+        assertEquals( "ClassAFactory", factoryLabel );
         System.out.println( "factoryLabel = " + factoryLabel );
     }
 }

Modified: directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=892290&r1=892289&r2=892290&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java Fri Dec 18 16:04:37 2009
@@ -1,6 +1,8 @@
 package org.apache.directory.server.core.integ;
 
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -11,9 +13,10 @@
     public static String factoryLabel;
     
     @Test
-    @Factory( "TestClassBMethodFactory" )
+    @Factory( "ClassBTestFactory" )
     public void testWithFactoryAnnotation()
     {
+        assertEquals( "ClassBTestFactory", factoryLabel );
         System.out.println( "factoryLabel = " + factoryLabel );
     }
     
@@ -23,6 +26,7 @@
     {
         // FIXME this gives a null factoryLabel cause of the bug in FrameworkRunner
         // in accessing the suite class's annotation
+        assertEquals( "SuiteFactory", factoryLabel );
         System.out.println( "factoryLabel = " + factoryLabel );
     }
 }

Modified: directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
URL: http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java?rev=892290&r1=892289&r2=892290&view=diff
==============================================================================
--- directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java (original)
+++ directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java Fri Dec 18 16:04:37 2009
@@ -5,7 +5,7 @@
 
 @RunWith( FrameworkSuite.class )
 @Suite.SuiteClasses({ TestClassA.class, TestClassB.class })
-@Factory( "suitlevelFactory" )
+@Factory( "SuiteFactory" )
 public class TestSuite
 {
 }