[WebMacro-cvs] webmacro/test/unit/org/webmacro/template EncodingTestCase.java,1.5,1.6 TemplateTestCase.java,1.16,1.17

[<bri...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs1:/tmp/cvs-serv32064/test/unit/org/webmacro/template

Modified Files:
	EncodingTestCase.java TemplateTestCase.java 
Log Message:
More ripping out -- eliminate reference counting of Brokers, pooling of context and fastwriter; streamline Context; eliminate Clock thread hack; eliminate ascii fastwriter hack

Index: EncodingTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EncodingTestCase.java	8 Jul 2003 19:48:45 -0000	1.5
--- EncodingTestCase.java	16 Jul 2003 06:45:00 -0000	1.6
***************
*** 146,150 ****
                  wm.getConfig("TemplateEncoding"), encoding);
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
!         String evaluated = t.getString(getContext(wm));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  evaluated, expected);
--- 146,150 ----
                  wm.getConfig("TemplateEncoding"), encoding);
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
!         String evaluated = t.evaluateAsString(getContext(wm));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  evaluated, expected);
***************
*** 179,183 ****
                  wmUTF8.getConfig("TemplateEncoding"), "UTF8");
          Template t = wmUTF8.getTemplate(TEMPLATE_FILENAME_UTF8);
!         String evaluated = t.getString(getContext(wmUTF8));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  expected, evaluated);
--- 179,183 ----
                  wmUTF8.getConfig("TemplateEncoding"), "UTF8");
          Template t = wmUTF8.getTemplate(TEMPLATE_FILENAME_UTF8);
!         String evaluated = t.evaluateAsString(getContext(wmUTF8));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  expected, evaluated);

Index: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TemplateTestCase.java	8 Jul 2003 19:48:45 -0000	1.16
--- TemplateTestCase.java	16 Jul 2003 06:45:00 -0000	1.17
***************
*** 94,98 ****
      public String executeTemplate (Template template) throws Exception
      {
!         return template.getString(_context);
      }
  
--- 94,98 ----
      public String executeTemplate (Template template) throws Exception
      {
!         return template.evaluateAsString(_context);
      }
  
***************
*** 113,117 ****
          Template template = new StringTemplate(_wm.getBroker(), templateText);
          template.parse();
!         String output = template.getString(_context);
          return output;
      }
--- 113,117 ----
          Template template = new StringTemplate(_wm.getBroker(), templateText);
          template.parse();
!         String output = template.evaluateAsString(_context);
          return output;
      }