directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r754571 - /directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
Date Sun, 15 Mar 2009 00:31:22 GMT
Author: elecharny
Date: Sun Mar 15 00:31:22 2009
New Revision: 754571

URL: http://svn.apache.org/viewvc?rev=754571&view=rev
Log:
Switched to JUNIT 4.4

Modified:
    directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java

Modified: directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java?rev=754571&r1=754570&r2=754571&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/test/java/org/apache/directory/shared/ldap/subtree/SubtreeSpecificationParserTest.java
Sun Mar 15 00:31:22 2009
@@ -25,8 +25,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
@@ -39,6 +37,12 @@
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecification;
 import org.apache.directory.shared.ldap.subtree.SubtreeSpecificationParser;
+import org.junit.Test;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -47,7 +51,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class SubtreeSpecificationParserTest extends TestCase
+public class SubtreeSpecificationParserTest
 {
     /** A valid empty specification with single white space between brackets */
     private static final String EMPTY_SPEC = "{ }";
@@ -122,7 +126,6 @@
      */
     public SubtreeSpecificationParserTest(String s)
     {
-        super( s );
         parser = new SubtreeSpecificationParser( null );
     }
 
@@ -130,6 +133,7 @@
     /**
      * Tests the parser with a valid empty specification.
      */
+    @Test
     public void testEmptySpec() throws Exception
     {
         SubtreeSpecification ss = parser.parse( EMPTY_SPEC );
@@ -148,6 +152,7 @@
     /**
      * Tests the parser with a valid specification with base set.
      */
+    @Test
     public void testSpecWithBase() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE );
@@ -161,6 +166,7 @@
      * Tests the parser with an invalid specification with missing white spaces
      * and base set.
      */
+    @Test
     public void testInvalidSpecWithBaseAndMissingWS() throws Exception
     {
         try
@@ -179,6 +185,7 @@
      * Tests the parser with a valid specification with some specific exclusions
      * set.
      */
+    @Test
     public void testSpecWithSpecificExclusions() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_SPECIFICEXCLUSIONS );
@@ -207,6 +214,7 @@
      * Tests the parser with a valid specification with an empty specific
      * exclusions set.
      */
+    @Test
     public void testSpecWithEmptySpecificExclusions() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_EMPTY_SPECIFICEXCLUSIONS );
@@ -219,6 +227,7 @@
     /**
      * Tests the parser with a valid specification with minimum and maximum set.
      */
+    @Test
     public void testSpecWithMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_MINIMUM_AND_MAXIMUM );
@@ -241,6 +250,7 @@
      * Tests the parser with a valid specification with base and minimum and
      * maximum set.
      */
+    @Test
     public void testWithBaseAndMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_MINIMUM_AND_MAXIMUM );
@@ -255,6 +265,7 @@
      * Tests the parser with a valid specification with base and specific
      * exclusions and minimum and maximum set.
      */
+    @Test
     public void testSpecWithBaseAndSpecificExclusionsAndMinimumAndMaximum() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_SPECIFICEXCLUSIONS_AND_MINIMUM_AND_MAXIMUM
);
@@ -273,6 +284,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithRefinement() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_REFINEMENT );
@@ -301,6 +313,7 @@
      * Tests the parser with a valid specification with base and empty
      * refinement set.
      */
+    @Test
     public void testSpecWithBaseAndEmptyRefinement() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_BASE_AND_EMPTY_REFINEMENT );
@@ -312,6 +325,7 @@
     /**
      * Tests the parser with a valid specification with all components set.
      */
+    @Test
     public void testSpecWithAllInOne() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_ALL_IN_ONE );
@@ -323,6 +337,7 @@
      * Tests the parser with a valid specification with unordinary component
      * order.
      */
+    @Test
     public void testSpecOrderOfComponentsDoesNotMatter() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_ORDER_OF_COMPONENTS_DOES_NOT_MATTER
);
@@ -333,6 +348,7 @@
     /**
      * Tests the parser with an invalid specification with silly things in.
      */
+    @Test
     public void testInvalidSillyThing() throws Exception
     {
         try
@@ -350,6 +366,7 @@
     /**
      * Tests the parser with a valid specification with refinement set.
      */
+    @Test
     public void testSpecWithFilter() throws Exception
     {
         SubtreeSpecification ss = parser.parse( SPEC_WITH_FILTER );
@@ -363,6 +380,7 @@
     /**
      * Test reusability, especially if the state is resetted.
      */
+    @Test
     public void testReusabiltiy() throws Exception
     {
         LdapDN firstDN = new LdapDN("k=l");
@@ -383,6 +401,7 @@
     /**
      * Tests the multithreaded use of a single parser.
      */
+    @Test
     public void testMultiThreaded() throws Exception
     {
         // start up and track all threads (40 threads)



Mime
View raw message