[WebMacro-cvs] webmacro/test/unit/org/webmacro/util TestMathTool.java,1.1,1.2 TestSettings.java,1.2,1.3

[<lan...@us...>]

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

Modified Files:
	TestMathTool.java TestSettings.java 
Log Message:
Updates include:
  RelaxedDirectiveBuilding Property.
  Test Cases for above property.
  assert() --> assertTrue() allowing compilation under java1.4
  some additions/improvements to the standard macro library
  all tests run without error under jdk 1.3, solaris 2.8.
  some work needs to be done on test cases to remove unix dependencies.


Index: TestMathTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/TestMathTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMathTool.java	10 Nov 2002 21:26:55 -0000	1.1
--- TestMathTool.java	23 Mar 2003 02:00:42 -0000	1.2
***************
*** 20,24 ****
          for (int x=0; x<1000000; x++) {
              int rnd = MathTool.random(3, 5);
!             assert (""+rnd, rnd >= 3 && rnd <=5);
          }
      }
--- 20,24 ----
          for (int x=0; x<1000000; x++) {
              int rnd = MathTool.random(3, 5);
!             assertTrue (""+rnd, rnd >= 3 && rnd <=5);
          }
      }

Index: TestSettings.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/TestSettings.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestSettings.java	4 May 2001 00:39:29 -0000	1.2
--- TestSettings.java	23 Mar 2003 02:00:42 -0000	1.3
***************
*** 23,47 ****
  //      for (int i=0; i<k.length; i++) 
  //        System.out.println("/" + k[i] + "/" + s.getSetting(k[i]) + "/");
!     assert(s.getIntegerSetting("one") == 1);
!     assert(s.getIntegerSetting("two") == 2);
!     assert(s.getIntegerSetting("three") == 3);
!     assert(s.getIntegerSetting("four") == 4);
!     assert(s.getIntegerSetting("notthere", 0) == 0);
!     assert(s.getSetting("a").equals("a"));
!     assert(s.getSetting("b").equals("b"));
!     assert(s.getSetting("c").equals("c"));
!     assert(s.getSetting("d").equals("d"));
!     assert(s.getSetting("e").equals("e"));
!     assert(s.getSetting("f").equals("f"));
  
!     assert(s.getSetting("a.b.c").equals("abc"));
!     assert(s.getSetting("a.*.c").equals("astarc"));
  
!     assert(s.getSetting("quoted").equals("quoted"));
!     assert(s.getSetting("quoted2").equals("quoted2"));
!     assert(s.getSetting("quoted3").equals(" quoted3 "));
!     assert(s.getSetting("with.spaces").equals("with spaces"));
!     assert(s.getSetting("nothing").equals(""));
!     assert(s.getSetting("alsonothing").equals(""));
    }
  
--- 23,47 ----
  //      for (int i=0; i<k.length; i++) 
  //        System.out.println("/" + k[i] + "/" + s.getSetting(k[i]) + "/");
!     assertTrue(s.getIntegerSetting("one") == 1);
!     assertTrue(s.getIntegerSetting("two") == 2);
!     assertTrue(s.getIntegerSetting("three") == 3);
!     assertTrue(s.getIntegerSetting("four") == 4);
!     assertTrue(s.getIntegerSetting("notthere", 0) == 0);
!     assertTrue(s.getSetting("a").equals("a"));
!     assertTrue(s.getSetting("b").equals("b"));
!     assertTrue(s.getSetting("c").equals("c"));
!     assertTrue(s.getSetting("d").equals("d"));
!     assertTrue(s.getSetting("e").equals("e"));
!     assertTrue(s.getSetting("f").equals("f"));
  
!     assertTrue(s.getSetting("a.b.c").equals("abc"));
!     assertTrue(s.getSetting("a.*.c").equals("astarc"));
  
!     assertTrue(s.getSetting("quoted").equals("quoted"));
!     assertTrue(s.getSetting("quoted2").equals("quoted2"));
!     assertTrue(s.getSetting("quoted3").equals(" quoted3 "));
!     assertTrue(s.getSetting("with.spaces").equals("with spaces"));
!     assertTrue(s.getSetting("nothing").equals(""));
!     assertTrue(s.getSetting("alsonothing").equals(""));
    }
  
***************
*** 52,57 ****
      s.load("org/webmacro/util/settings2.properties");
  
!     assert(s.getSetting("a").equals("aa"));
!     assert(s.getSetting("bb").equals("bb"));
    }
  
--- 52,57 ----
      s.load("org/webmacro/util/settings2.properties");
  
!     assertTrue(s.getSetting("a").equals("aa"));
!     assertTrue(s.getSetting("bb").equals("bb"));
    }
  
***************
*** 64,73 ****
      Settings ssss = new SubSettings(s, "sub.sub");
  
!     assert(s.getSetting("sub.sub.a").equals("a"));
!     assert(ss.getSetting("sub.a").equals("a"));
!     assert(ss.getSetting("a").equals("not a"));
!     assert(sss.getSetting("a").equals("a"));
!     assert(ssss.getSetting("a").equals("a"));
!     assert(sssStar.getSetting("a").equals("default"));
    }
  }
--- 64,73 ----
      Settings ssss = new SubSettings(s, "sub.sub");
  
!     assertTrue(s.getSetting("sub.sub.a").equals("a"));
!     assertTrue(ss.getSetting("sub.a").equals("a"));
!     assertTrue(ss.getSetting("a").equals("not a"));
!     assertTrue(sss.getSetting("a").equals("a"));
!     assertTrue(ssss.getSetting("a").equals("a"));
!     assertTrue(sssStar.getSetting("a").equals("default"));
    }
  }