svn commit: r1426056 - in /incubator/jspwiki/trunk/tests/org/apache/wiki: filters/AllTests.java filters/DefaultFilterManagerTest.java filters/FilterManagerTest.java workflow/ApprovalWorkflowTest.java

[juanpablo]

Author: juanpablo
Date: Wed Dec 26 22:19:51 2012
New Revision: 1426056

URL: http://svn.apache.org/viewvc?rev=1426056&view=rev
Log:
adapted to use new Filter API

Added:
    
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java
      - copied, changed from r1423638, 
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/FilterManagerTest.java
Removed:
    incubator/jspwiki/trunk/tests/org/apache/wiki/filters/FilterManagerTest.java
Modified:
    incubator/jspwiki/trunk/tests/org/apache/wiki/filters/AllTests.java
    
incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/filters/AllTests.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/filters/AllTests.java?rev=1426056&r1=1426055&r2=1426056&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/filters/AllTests.java 
(original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/filters/AllTests.java Wed Dec 
26 22:19:51 2012
@@ -32,7 +32,7 @@ public class AllTests extends TestCase
     {
         TestSuite suite = new TestSuite("PageFilter tests");
 
-        suite.addTest( FilterManagerTest.suite() );
+        suite.addTest( DefaultFilterManagerTest.suite() );
 
         return suite;
     }

Copied: 
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java
 (from r1423638, 
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/FilterManagerTest.java)
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java?p2=incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java&p1=incubator/jspwiki/trunk/tests/org/apache/wiki/filters/FilterManagerTest.java&r1=1423638&r2=1426056&rev=1426056&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/FilterManagerTest.java 
(original)
+++ 
incubator/jspwiki/trunk/tests/org/apache/wiki/filters/DefaultFilterManagerTest.java
 Wed Dec 26 22:19:51 2012
@@ -19,20 +19,27 @@
 
 package org.apache.wiki.filters;
 
-import junit.framework.*;
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.log4j.PropertyConfigurator;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiException;
+import org.apache.wiki.api.filters.FilterManager;
+import org.apache.wiki.api.filters.PageFilter;
 
-import org.apache.log4j.*;
-
-import org.apache.wiki.*;
-
-public class FilterManagerTest extends TestCase
+public class DefaultFilterManagerTest extends TestCase
 {
     Properties props = new Properties();
 
     TestEngine engine;
 
-    public FilterManagerTest( String s )
+    public DefaultFilterManagerTest( String s )
     {
         super( s );
     }
@@ -52,7 +59,7 @@ public class FilterManagerTest extends T
     public void testInitFilters()
         throws Exception
     {
-        FilterManager m = new FilterManager( engine, props );
+        FilterManager m = new DefaultFilterManager( engine, props );
 
         List l = m.getFilterList();
 
@@ -71,7 +78,7 @@ public class FilterManagerTest extends T
     public void testInitParams()
         throws Exception
     {
-        FilterManager m = new FilterManager( engine, props );
+        FilterManager m = new DefaultFilterManager( engine, props );
 
         List l = m.getFilterList();
 
@@ -88,7 +95,7 @@ public class FilterManagerTest extends T
 
     public static Test suite()
     {
-        return new TestSuite( FilterManagerTest.class );
+        return new TestSuite( DefaultFilterManagerTest.class );
     }
 
 }

Modified: 
incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java?rev=1426056&r1=1426055&r2=1426056&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java
 (original)
+++ 
incubator/jspwiki/trunk/tests/org/apache/wiki/workflow/ApprovalWorkflowTest.java
 Wed Dec 26 22:19:51 2012
@@ -25,11 +25,14 @@ import java.util.Properties;
 
 import junit.framework.TestCase;
 
-import org.apache.wiki.*;
+import org.apache.wiki.PageManager;
+import org.apache.wiki.TestEngine;
+import org.apache.wiki.WikiContext;
+import org.apache.wiki.WikiException;
+import org.apache.wiki.api.exceptions.FilterException;
+import org.apache.wiki.api.filters.BasicPageFilter;
 import org.apache.wiki.auth.Users;
 import org.apache.wiki.auth.WikiPrincipal;
-import org.apache.wiki.filters.BasicPageFilter;
-import org.apache.wiki.filters.FilterException;
 
 public class ApprovalWorkflowTest extends TestCase
 {