svn commit: r439400 - in /incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering: plugins/ plugins/SmileysTest.java velocity/plugins/smileys/ velocity/plugins/textile/

[ag...@apache.org]

Author: agilliland
Date: Fri Sep  1 11:02:32 2006
New Revision: 439400

URL: http://svn.apache.org/viewvc?rev=439400&view=rev
Log:
fixing up Simleys plugin test and relocating it, and removing textile plugin test because that plugin is no longer truly supported.



Added:
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java
      - copied, changed from r439082, incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.java
Removed:
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/smileys/
    incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/textile/

Copied: incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java (from r439082, incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java?p2=incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java&p1=incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.java&r1=439082&r2=439400&rev=439400&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/velocity/plugins/smileys/SmileysTest.java (original)
+++ incubator/roller/branches/roller_3.0/tests/org/apache/roller/ui/rendering/plugins/SmileysTest.java Fri Sep  1 11:02:32 2006
@@ -15,34 +15,40 @@
  * copyright in this work, please see the NOTICE file in the top level
  * directory of this distribution.
  */
-/*
- * Created on Jun 8, 2004
- */
-package org.apache.roller.ui.rendering.velocity.plugins.smileys;
-
 
-import com.mockrunner.mock.web.MockHttpServletRequest;
-import com.mockrunner.mock.web.MockServletContext;
+package org.apache.roller.ui.rendering.plugins;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.roller.TestUtils;
 import org.apache.roller.pojos.UserData;
 import org.apache.roller.pojos.WebsiteData;
-import org.apache.roller.presentation.velocity.plugins.smileys.SmileysPlugin;
 import org.apache.roller.ui.authoring.struts.actions.WeblogEntryActionTest;
 import org.apache.roller.ui.ServletTestBase;
 
+
 /**
- * @author lance.lavandowska
+ * Test smileys plugin.
  */
 public class SmileysTest extends ServletTestBase {
+    
+    private static Log log = LogFactory.getLog(WeblogEntryActionTest.class);
+    
     private WebsiteData testWeblog = null;
     private UserData testUser = null;
-    public static Log log = LogFactory.getLog(WeblogEntryActionTest.class);
+    
+    
+    public SmileysTest() {
+        super();
+    }
+    
+    
+    public static Test suite() {
+        return new TestSuite(SmileysTest.class);
+    }
+    
     
     /**
      * All tests in this suite require a user and a weblog.
@@ -59,6 +65,7 @@
         }
     }
     
+    
     public void tearDown() throws Exception {
         super.tearDown();
         try {
@@ -71,6 +78,7 @@
         }
     }
     
+    
     public void testSmileEmoticon() throws Exception {
         doFilters();
         
@@ -86,11 +94,4 @@
         assertEquals(expected, result);
     }
     
-    public SmileysTest() {
-        super();
-    }
-    
-    public static Test suite() {
-        return new TestSuite(SmileysTest.class);
-    }
 }