cvs commit: jakarta-velocity/src/java/org/apache/velocity/test Test.java VelocityTest.java

[dlr]

dlr         00/10/22 15:47:38

  Modified:    src/java/org/apache/velocity/test Test.java
                        VelocityTest.java
  Log:
  Corrected compile errors by commenting out references to TestProvider instance, and 
removing the import for it.  It no longer exists.  Data probably still needs to get 
into the context somehow.
  
  Revision  Changes    Path
  1.5       +11 -14    jakarta-velocity/src/java/org/apache/velocity/test/Test.java
  
  Index: Test.java
  ===================================================================
  RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/Test.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Test.java 2000/10/22 16:00:02     1.4
  +++ Test.java 2000/10/22 22:47:38     1.5
  @@ -67,42 +67,39 @@
   
   import org.apache.velocity.runtime.Runtime;
   
  -import org.apache.velocity.test.provider.TestProvider;
  -
   /**
    * This class the testbed for Velocity. It is used to
    * test all the directives support by Velocity.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  - * @version $Id: Test.java,v 1.4 2000/10/22 16:00:02 jvanzyl Exp $
  + * @version $Id: Test.java,v 1.5 2000/10/22 22:47:38 dlr Exp $
    */
   public class Test
   {
       public Test(String templateFile)
       {
  -        TestProvider provider = new TestProvider();
  -        ArrayList al = provider.getCustomers();
  +        //TestProvider provider = new TestProvider();
  +        //ArrayList al = provider.getCustomers();
           Hashtable h = new Hashtable();
           
           h.put("Bar", "this is from a hashtable!");
   
           try
           {
  -            
               Runtime.init("velocity.properties");
               Template template = Runtime.getTemplate(templateFile);
               
               Context context = new Context();
  -            context.put("provider", provider);
  +            //context.put("provider", provider);
               context.put("name", "jason");
  -            context.put("providers", provider.getCustomers2());
  -            context.put("list", al);
  +            //context.put("providers", provider.getCustomers2());
  +            //context.put("list", al);
               context.put("hashtable", h);
  -            context.put("search", provider.getSearch());
  -            context.put("relatedSearches", provider.getRelSearches());
  -            context.put("searchResults", provider.getRelSearches());
  -            context.put("menu", provider.getMenu());
  -            context.put("stringarray", provider.getArray());
  +            //context.put("search", provider.getSearch());
  +            //context.put("relatedSearches", provider.getRelSearches());
  +            //context.put("searchResults", provider.getRelSearches());
  +            //context.put("menu", provider.getMenu());
  +            //context.put("stringarray", provider.getArray());
               
               FastWriter fw = new FastWriter(
                   System.out, Runtime.getString(
  
  
  
  1.5       +11 -13    
jakarta-velocity/src/java/org/apache/velocity/test/VelocityTest.java
  
  Index: VelocityTest.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/VelocityTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VelocityTest.java 2000/10/22 22:08:31     1.4
  +++ VelocityTest.java 2000/10/22 22:47:38     1.5
  @@ -63,13 +63,11 @@
   import org.apache.velocity.Template;
   import org.apache.velocity.runtime.Runtime;
   
  -import org.apache.velocity.test.provider.TestProvider;
  -
   /**
    * Automated test case for Apache Velocity.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
  - * @version $Id: VelocityTest.java,v 1.4 2000/10/22 22:08:31 dlr Exp $
  + * @version $Id: VelocityTest.java,v 1.5 2000/10/22 22:47:38 dlr Exp $
    */
   public class VelocityTest extends TemplateTestCase
   {
  @@ -78,8 +76,8 @@
        */
       private static final String TEMPLATE_FILE_NAME = "test.vm";
   
  -    private TestProvider provider;
  -    private ArrayList al;
  +    //private TestProvider provider;
  +    //private ArrayList al;
       private Hashtable h;
   
       /**
  @@ -89,8 +87,8 @@
       {
           super(name);
   
  -        provider = new TestProvider();
  -        al = provider.getCustomers();
  +        //provider = new TestProvider();
  +        //al = provider.getCustomers();
           h = new Hashtable();
       }
   
  @@ -120,14 +118,14 @@
           try
           {
               Context context = new Context();
  -            context.put("provider", provider);
  +            //context.put("provider", provider);
               context.put("name", "jason");
  -            context.put("providers", provider.getCustomers2());
  -            context.put("list", al);
  +            //context.put("providers", provider.getCustomers2());
  +            //context.put("list", al);
               context.put("hashtable", h);
  -            context.put("search", provider.getSearch());
  -            context.put("relatedSearches", provider.getRelSearches());
  -            context.put("searchResults", provider.getRelSearches());
  +            //context.put("search", provider.getSearch());
  +            //context.put("relatedSearches", provider.getRelSearches());
  +            //context.put("searchResults", provider.getRelSearches());
               
               Template template = Runtime.getTemplate(TEMPLATE_FILE_NAME);
               template.merge(context, getWriter(System.out));