Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenTestCase.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenTestCase.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/TexenTestCase.java Thu Sep 22 06:32:34 2005 @@ -16,10 +16,6 @@ * limitations under the License. */ -import java.io.File; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.util.StringUtils; -import junit.framework.TestCase; /** * This is a test case for Texen. Simply executes a simple @@ -69,7 +65,7 @@ try { assureResultsDirectoryExists(RESULTS_DIR); - + if (!isMatch(RESULTS_DIR,COMPARE_DIR,"TurbineWeather","java","java") || !isMatch(RESULTS_DIR,COMPARE_DIR,"TurbineWeatherService","java","java") || !isMatch(RESULTS_DIR,COMPARE_DIR,"WeatherService","java","java") || @@ -78,7 +74,7 @@ { fail("Output is incorrect!"); } - } + } catch(Exception e) { /*
Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocimacroTestCase.java Thu Sep 22 06:32:34 2005 @@ -16,35 +16,24 @@ * limitations under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; import java.io.StringWriter; -import java.util.Vector; +import junit.framework.TestCase; import org.apache.velocity.VelocityContext; - -import org.apache.velocity.Template; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.provider.TestProvider; -import org.apache.velocity.util.StringUtils; - import org.apache.velocity.app.Velocity; -import junit.framework.TestCase; - /** * This class tests strange Velocimacro issues. * * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a> * @version $Id$ */ -public class VelocimacroTestCase extends TestCase +public class VelocimacroTestCase extends TestCase { private String template1 = "#macro(foo $a)$a#end #macro(bar $b)#foo($b)#end #foreach($i in [1..3])#bar($i)#end"; private String result1 = " 123"; - + public VelocimacroTestCase() { super("VelocimacroTestCase"); Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityAppTestCase.java Thu Sep 22 06:32:34 2005 @@ -16,24 +16,11 @@ * limitations under the License. */ -import java.io.BufferedWriter; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; import java.io.StringWriter; -import java.util.Vector; - import org.apache.velocity.VelocityContext; - -import org.apache.velocity.Template; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.test.provider.TestProvider; -import org.apache.velocity.util.StringUtils; - import org.apache.velocity.app.Velocity; -import junit.framework.TestCase; - /** * This class is intended to test the app.Velocity.java class. * @@ -55,7 +42,7 @@ { Velocity.setProperty( Velocity.FILE_RESOURCE_LOADER_PATH, FILE_RESOURCE_LOADER_PATH); - + Velocity.init(); } catch (Exception e) @@ -86,12 +73,12 @@ /* FIXME: Not tested right now. - + StringWriter result2 = new StringWriter(); Velocity.mergeTemplate("mergethis.vm", context, result2); StringWriter result3 = new StringWriter(); - Velocity.invokeVelocimacro("floog", "test", new String[2], + Velocity.invokeVelocimacro("floog", "test", new String[2], context, result3); */ if (!result1.equals(compare1.toString())) Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityServletTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityServletTestCase.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityServletTestCase.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/VelocityServletTestCase.java Thu Sep 22 06:32:34 2005 @@ -16,13 +16,14 @@ * limitations under the License. */ -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.util.Enumeration; import java.util.Properties; import java.util.Set; + import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletConfig; @@ -31,13 +32,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.velocity.app.Velocity; -import org.apache.velocity.runtime.RuntimeSingleton; +import junit.framework.TestCase; + import org.apache.velocity.runtime.RuntimeConstants; +import org.apache.velocity.runtime.RuntimeSingleton; import org.apache.velocity.servlet.VelocityServlet; -import junit.framework.TestCase; - /** * Tests our VelocityServlet implementation. @@ -128,7 +128,7 @@ public String getServletName() { return "VelocityServlet"; - } + } } static class MockServletContext implements ServletContext @@ -333,7 +333,7 @@ } - // ---- HttpServletResponse implementation ------------------------- + // ---- HttpServletResponse implementation ------------------------- public void addCookie(javax.servlet.http.Cookie c) { Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/eventhandler/Handler1.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/eventhandler/Handler1.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/eventhandler/Handler1.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/eventhandler/Handler1.java Thu Sep 22 06:32:34 2005 @@ -74,4 +74,4 @@ } -} \ No newline at end of file +} Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/misc/Test.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/misc/Test.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/misc/Test.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/misc/Test.java Thu Sep 22 06:32:34 2005 @@ -54,7 +54,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a> * @version $Id$ */ -public class Test implements ReferenceInsertionEventHandler, +public class Test implements ReferenceInsertionEventHandler, NullSetEventHandler, MethodExceptionEventHandler { @@ -70,14 +70,14 @@ TestProvider provider = new TestProvider(); ArrayList al = provider.getCustomers(); Hashtable h = new Hashtable(); - + /* * put this in to test introspection $h.Bar or $h.get("Bar") etc */ - + h.put("Bar", "this is from a hashtable!"); h.put("Foo", "this is from a hashtable too!"); - + /* * adding simple vector with strings for testing late introspection stuff */ @@ -94,7 +94,7 @@ { /* * this is another way to do properties when initializing Runtime. - * make a Properties + * make a Properties */ Properties p = new Properties(); @@ -102,12 +102,12 @@ /* * now, if you want to, load it from a file (or whatever) */ - + try { - FileInputStream fis = new FileInputStream( + FileInputStream fis = new FileInputStream( new File("velocity.properties" )); - + if( fis != null) p.load( fis ); } @@ -139,11 +139,11 @@ /* * use an alternative logger. Set it up here and pass it in. */ - + // SimpleLogSystem sls = new SimpleLogSystem("velocity_simple.log"); - + // Velocity.setProperty(Velocity.RUNTIME_LOG_LOGSYSTEM, sls ); - + /* * and now call init */ @@ -157,12 +157,12 @@ if (templateFile == null) { templateFile = "examples/example.vm"; - } - + } + Template template = null; - try + try { template = RuntimeSingleton.getTemplate(templateFile, encoding); } @@ -199,22 +199,22 @@ context.put("Floog", "floogie woogie"); context.put("geirstring", str ); context.put("mylong", new Long(5) ); - + /* * we want to make sure we test all types of iterative objects * in #foreach() */ - + int intarr[] = { 10, 20, 30, 40, 50 }; Object[] oarr = { "a","b","c","d" } ; - + context.put( "collection", v ); context.put("iterator", v.iterator()); context.put("map", h ); context.put("obarr", oarr ); context.put("intarr", intarr ); - + String stest = " My name is $name -> $Floog"; StringWriter w = new StringWriter(); // Velocity.evaluate( context, w, "evaltest",stest ); @@ -250,7 +250,7 @@ writer.flush(); writer.close(); } - + } catch( MethodInvocationException mie ) { @@ -283,7 +283,7 @@ if (lhs.equals("$woogie")) return false; - + return true; } Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Child.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Child.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Child.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Child.java Thu Sep 22 06:32:34 2005 @@ -29,5 +29,5 @@ public String getName() { return "Child"; - } + } } Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/ForeachMethodCallHelper.java Thu Sep 22 06:32:34 2005 @@ -21,7 +21,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Will Glass-Husain</a> * @version $Id$ */ -public class ForeachMethodCallHelper +public class ForeachMethodCallHelper { public String getFoo(Integer v) { return "int "+v; } public String getFoo(String v) { return "str "+v; } Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/NumberMethods.java Thu Sep 22 06:32:34 2005 @@ -16,7 +16,8 @@ * limitations under the License. */ -import java.math.*; +import java.math.BigDecimal; +import java.math.BigInteger; /** Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Person.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Person.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Person.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/Person.java Thu Sep 22 06:32:34 2005 @@ -32,5 +32,5 @@ public String getName() { return "Person"; - } + } } Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestNumber.java Thu Sep 22 06:32:34 2005 @@ -29,7 +29,7 @@ private Number n; - public TestNumber(double val) + public TestNumber(double val) { n = new Double(val); } @@ -40,4 +40,4 @@ } -} \ No newline at end of file +} Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/provider/TestProvider.java Thu Sep 22 06:32:34 2005 @@ -16,7 +16,11 @@ * limitations under the License. */ -import java.util.*; +import java.util.ArrayList; +import java.util.Hashtable; +import java.util.List; +import java.util.Stack; +import java.util.Vector; /** * This class is used by the testbed. Instances of the class @@ -63,10 +67,10 @@ list.add("list element 1"); list.add("list element 2"); list.add("list element 3"); - + return list; } - + public Hashtable getSearch() { Hashtable h = new Hashtable(); @@ -78,11 +82,11 @@ ArrayList al = new ArrayList(); al.add(h); - + h.put("RelatedLinks", al); return h; - } + } public Hashtable getHashtable() { @@ -90,17 +94,17 @@ h.put("key0", "value0"); h.put("key1", "value1"); h.put("key2", "value2"); - + return h; - } + } public ArrayList getRelSearches() { ArrayList al = new ArrayList(); al.add(getSearch()); - + return al; - } + } public String getTitle() { @@ -124,8 +128,8 @@ item.put("label", "label" + Integer.toString(i+1)); //al.add(item); menu[i] = item; - } - + } + //return al; return menu; } @@ -157,12 +161,12 @@ public Object me() { return this; - } + } public String toString() { return ("test provider"); - } + } public Vector getVector() { @@ -170,7 +174,7 @@ list.addElement("vector element 1"); list.addElement("vector element 2"); - + return list; } @@ -191,11 +195,11 @@ { return true; } - + public boolean getStateFalse() { return false; - } + } public String objectArrayMethod(Object[] o) { @@ -205,24 +209,24 @@ public String concat(Object[] strings) { StringBuffer result = new StringBuffer(); - + for (int i = 0; i < strings.length; i++) { result.append((String) strings[i]).append(' '); } - + return result.toString(); } public String concat(List strings) { StringBuffer result = new StringBuffer(); - + for (int i = 0; i < strings.size(); i++) { result.append((String) strings.get(i)).append(' '); } - + return result.toString(); } @@ -246,7 +250,7 @@ public String concat(String a, String b) { return a + b; - } + } // These two are for testing subclasses. @@ -254,16 +258,16 @@ { return new Person(); } - + public Child getChild() { return new Child(); - } + } public String showPerson(Person person) { return person.getName(); - } + } /** * Chop i characters off the end of a string. @@ -280,28 +284,28 @@ public boolean allEmpty(Object[] list) { int size = list.length; - + for (int i = 0; i < size; i++) if (list[i].toString().length() > 0) return false; - + return true; } /* * This can't have the signature - + public void setState(boolean state) - + or dynamically invoking the method doesn't work ... you would have to put a wrapper around a method for a - real boolean property that takes a + real boolean property that takes a Boolean object if you wanted this to work. Not really sure how useful it is anyway. Who cares about boolean values you can just set a variable. - + */ public void setState(Boolean state) @@ -329,7 +333,7 @@ public String get(String key) { return key; - } + } /** * Test the ability of vel to use a put(key) @@ -340,7 +344,7 @@ { ob = o; return key; - } + } public String getFoo() throws Exception Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/test/view/TemplateNodeView.java Thu Sep 22 06:32:34 2005 @@ -16,16 +16,14 @@ * limitations under the License. */ -import java.io.IOException; -import java.io.PrintWriter; -import java.io.FileInputStream; import java.io.BufferedReader; +import java.io.FileInputStream; import java.io.InputStreamReader; +import java.io.PrintWriter; import org.apache.velocity.runtime.RuntimeSingleton; - -import org.apache.velocity.runtime.visitor.NodeViewMode; import org.apache.velocity.runtime.parser.node.SimpleNode; +import org.apache.velocity.runtime.visitor.NodeViewMode; /** * Simple class for dumping the AST for a template. @@ -33,12 +31,12 @@ */ public class TemplateNodeView { - /** + /** * Root of the AST node structure that results from * parsing a template. */ private SimpleNode document; - + /** * Visitor used to traverse the AST node structure * and produce a visual representation of the @@ -64,7 +62,7 @@ RuntimeSingleton.getString(RuntimeSingleton.INPUT_ENCODING)); BufferedReader br = new BufferedReader( isr ); - + document = RuntimeSingleton.parse( br, template); visitor = new NodeViewMode(); @@ -83,5 +81,5 @@ public static void main(String args[]) { TemplateNodeView v = new TemplateNodeView(args[0]); - } + } } Modified: jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java?rev=290942&r1=290941&r2=290942&view=diff ============================================================================== --- jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java (original) +++ jakarta/velocity/core/trunk/src/test/org/apache/velocity/util/SimplePoolTestCase.java Thu Sep 22 06:32:34 2005 @@ -16,14 +16,14 @@ package org.apache.velocity.util; -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; /** * Simpletest for the SimplePool * - * @version $Id$ + * @version $Id$ */ public class SimplePoolTestCase extends TestCase { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
