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

[<dr...@us...>]

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

Modified Files:
	TestMathTool.java TestSettings.java TestTextTool.java 
Log Message:
If this doesn't drive our SF "activity" stats through the roof, I don't know what will.

Mass re-formatting of all code, following (to the best of my interpertation) the Sun (w/ jakarta tweaks) coding style guidelines defined here: http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html  and here: http://jakarta.apache.org/turbine/common/code-standards.html

I did this reformatting with IDEA 3.0.5, and I am going to commit the style configuration for IDEA (if I can find it).



Index: TestMathTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/TestMathTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMathTool.java	23 Mar 2003 02:00:42 -0000	1.2
--- TestMathTool.java	12 Jun 2003 00:47:50 -0000	1.3
***************
*** 12,24 ****
  import org.webmacro.servlet.MathTool;
  
! public class TestMathTool extends TestCase {
!     public TestMathTool(String s) {
          super(s);
      }
  
!     public void testRandom () {
!         for (int x=0; x<1000000; x++) {
              int rnd = MathTool.random(3, 5);
!             assertTrue (""+rnd, rnd >= 3 && rnd <=5);
          }
      }
--- 12,29 ----
  import org.webmacro.servlet.MathTool;
  
! public class TestMathTool extends TestCase
! {
!     public TestMathTool (String s)
!     {
          super(s);
      }
  
! 
!     public void testRandom ()
!     {
!         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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestSettings.java	23 Mar 2003 02:00:42 -0000	1.3
--- TestSettings.java	12 Jun 2003 00:47:50 -0000	1.4
***************
*** 1,74 ****
  package org.webmacro.util;
  
! import java.io.*;
  
! import org.webmacro.*;
! import org.webmacro.util.*;
  
- import junit.framework.*;
  
! public class TestSettings extends TestCase {
!   public TestSettings(String name) {
!     super(name);
!   }
  
-   protected void setUp() {
-   }
-   
-   public void testSimple() throws Exception {
-     Settings s = new Settings();
  
!     s.load("org/webmacro/util/settings1.properties");
  //      String k[] = s.getKeys();
  //      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(""));
!   }
  
-   public void testOcclude() throws Exception {
-     Settings s = new Settings();
  
!     s.load("org/webmacro/util/settings1.properties");
!     s.load("org/webmacro/util/settings2.properties");
  
!     assertTrue(s.getSetting("a").equals("aa"));
!     assertTrue(s.getSetting("bb").equals("bb"));
!   }
  
!   public void testSubsettings() throws Exception {
!     Settings s = new Settings();
!     s.load("org/webmacro/util/settings1.properties");
!     Settings ss = new SubSettings(s, "sub");
!     Settings sss = new SubSettings(ss, "sub");
!     Settings sssStar = new SubSettings(ss, "*");
!     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"));
!   }
  }
  
--- 1,79 ----
  package org.webmacro.util;
  
! import junit.framework.TestCase;
  
! public class TestSettings extends TestCase
! {
!     public TestSettings (String name)
!     {
!         super(name);
!     }
  
  
!     protected void setUp ()
!     {
!     }
  
  
!     public void testSimple () throws Exception
!     {
!         Settings s = new Settings();
! 
!         s.load("org/webmacro/util/settings1.properties");
  //      String k[] = s.getKeys();
  //      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(""));
!     }
  
  
!     public void testOcclude () throws Exception
!     {
!         Settings s = new Settings();
  
!         s.load("org/webmacro/util/settings1.properties");
!         s.load("org/webmacro/util/settings2.properties");
  
!         assertTrue(s.getSetting("a").equals("aa"));
!         assertTrue(s.getSetting("bb").equals("bb"));
!     }
  
! 
!     public void testSubsettings () throws Exception
!     {
!         Settings s = new Settings();
!         s.load("org/webmacro/util/settings1.properties");
!         Settings ss = new SubSettings(s, "sub");
!         Settings sss = new SubSettings(ss, "sub");
!         Settings sssStar = new SubSettings(ss, "*");
!         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"));
!     }
  }
  

Index: TestTextTool.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/util/TestTextTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTextTool.java	10 Nov 2002 21:11:28 -0000	1.1
--- TestTextTool.java	12 Jun 2003 00:47:50 -0000	1.2
***************
*** 12,29 ****
  import org.webmacro.servlet.TextTool;
  
! public class TestTextTool extends TestCase {
!     public TestTextTool(String s) {
          super(s);
      }
  
!     public void testRTrim() {
          String toTrim = "This is a test     ";
          String expected = "This is a test";
!         assertEquals (expected, TextTool.rtrim(toTrim));
      }
!     public void testLTrim() {
          String toTrim = "      This is a test     ";
          String expected = "This is a test     ";
!         assertEquals (expected, TextTool.ltrim(toTrim));
      }
  }
--- 12,36 ----
  import org.webmacro.servlet.TextTool;
  
! public class TestTextTool extends TestCase
! {
!     public TestTextTool (String s)
!     {
          super(s);
      }
  
! 
!     public void testRTrim ()
!     {
          String toTrim = "This is a test     ";
          String expected = "This is a test";
!         assertEquals(expected, TextTool.rtrim(toTrim));
      }
! 
! 
!     public void testLTrim ()
!     {
          String toTrim = "      This is a test     ";
          String expected = "This is a test     ";
!         assertEquals(expected, TextTool.ltrim(toTrim));
      }
  }