[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestParseIncludeMacroDistribution.java, 1.2, 1.3 TestDirectiveParser.java, 1.8, 1.9 TemplateTestCase.java, 1.24, 1.25

[Tim P <ti...@us...>]

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30935/test/unit/org/webmacro/template

Modified Files:
	TestParseIncludeMacroDistribution.java 
	TestDirectiveParser.java TemplateTestCase.java 
Log Message:
It appears that Maven sometimes fails to call setup

Index: TestDirectiveParser.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestDirectiveParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** TestDirectiveParser.java	17 Jul 2003 15:18:29 -0000	1.8
--- TestDirectiveParser.java	18 Feb 2010 22:57:48 -0000	1.9
***************
*** 23,33 ****
  
  
-     public void init () throws Exception
-     {
-         System.getProperties().setProperty("org.webmacro.LogLevel", "NONE");
-         super.init();
-     }
- 
- 
      public void stuffContext (Context context) throws Exception
      {
--- 23,26 ----

Index: TestParseIncludeMacroDistribution.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestParseIncludeMacroDistribution.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestParseIncludeMacroDistribution.java	14 Mar 2008 17:13:02 -0000	1.2
--- TestParseIncludeMacroDistribution.java	18 Feb 2010 22:57:48 -0000	1.3
***************
*** 26,29 ****
--- 26,30 ----
  
  
+ 
      /** executes out of the standard macro/ distribution. */
      public void testEcommMacros () throws Exception

Index: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** TemplateTestCase.java	12 Nov 2008 23:41:31 -0000	1.24
--- TemplateTestCase.java	18 Feb 2010 22:57:49 -0000	1.25
***************
*** 29,40 ****
  
  
      protected void setUp () throws Exception
      {
!         init();
      }
  
  
      /**
!      * create a default-configured instance of WebMacro.  Subclasses may
       * override if WM needs to be created/configured differently.
       */
--- 29,51 ----
  
  
+     /**
+      * Initialize this TemplateTester by creating a WebMacro instance
+      * and a default Context.
+      */
      protected void setUp () throws Exception
      {
!         //if (System.getProperties().getProperty("org.webmacro.LogLevel") == null)
!         //    System.getProperties().setProperty("org.webmacro.LogLevel", "NONE");
!         _wm = createWebMacro();
!         _context = _wm.getContext();
! 
!         // let subclasses stuff the context with custom data
!         stuffContext(_context);
!         System.err.println("Called :" + _wm.getBroker());
      }
  
  
      /**
!      * Create a default-configured instance of WebMacro.  Subclasses may
       * override if WM needs to be created/configured differently.
       */
***************
*** 45,62 ****
  
  
-     /**
-      * initialize this TemplateTester by creating a WebMacro instance
-      * and a default Context.
-      */
-     public void init () throws Exception
-     {
-         if (System.getProperties().getProperty("org.webmacro.LogLevel") == null)
-             System.getProperties().setProperty("org.webmacro.LogLevel", "NONE");
-         _wm = createWebMacro();
-         _context = _wm.getContext();
- 
-         // let subclasses stuff the context with custom data
-         stuffContext(_context);
-     }
  
  
--- 56,59 ----
***************
*** 243,246 ****
--- 240,244 ----
          {
              caught = e;
+             e.printStackTrace();
          }
          if (caught == null)