commonjava-developer

[<joh...@co...>]

Update of /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2746/src/test/org/commonjava/opl

Modified Files:
	DocumentDriverTest.java SAXDriverTest.java OPLTestParser.java 
	OPLTestParserResult.java 
Log Message:
updated to 0.2, made method call parameter generation more robust.

Index: DocumentDriverTest.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl/DocumentDriverTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DocumentDriverTest.java	20 Feb 2004 21:16:04 -0000	1.8
+++ DocumentDriverTest.java	12 Mar 2004 19:46:53 -0000	1.9
@@ -4,39 +4,45 @@
  */
 package org.commonjava.opl;
 
+import junit.framework.TestCase;
+
 import java.util.Properties;
 
-import junit.framework.TestCase;
 
 //TODO Document SAXDriverTest.java in commonjava-opl
+
 /**
  * @author jdcasey
  *
  */
-public class DocumentDriverTest extends TestCase {
-
+public class DocumentDriverTest extends TestCase
+{
   /**
    * Constructor for SAXDriverTest.
    * @param arg0
    */
-  public DocumentDriverTest(String arg0) {
+  public DocumentDriverTest(String arg0)
+  {
     super(arg0);
   }
 
-  public static void main(String[] args) {
+  public static void main(String[] args)
+  {
     junit.textui.TestRunner.run(DocumentDriverTest.class);
   }
-  
-  public void testParseUri() throws ParseException{
+
+  public void testParseUri() throws ParseException
+  {
     System.out.println("Test 1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertFalse(result.getBooleanValue2().booleanValue());
@@ -45,24 +51,27 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 20);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 1");
   }
 
-  public void testParseUri2(){
+  public void testParseUri2()
+  {
     System.out.println("Test 2 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test2.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertTrue(result.getBooleanValue2().booleanValue());
@@ -71,28 +80,31 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 2");
   }
 
-  public void testParseUri3(){
+  public void testParseUri3()
+  {
     System.out.println("Test 3 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test3-main.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertTrue(result.getBooleanValue2().booleanValue());
@@ -101,28 +113,31 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 3");
   }
 
-  public void testParseUri4(){
+  public void testParseUri4()
+  {
     System.out.println("Test 4 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test4.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value1", props.getProperty("param1"));
       assertEquals("value2", props.getProperty("param2"));
       assertTrue(result.getBooleanValue().booleanValue());
@@ -132,28 +147,31 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 4");
   }
 
-  public void testParseUri5(){
+  public void testParseUri5()
+  {
     System.out.println("Test 5 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test5.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value1", props.getProperty("param1"));
       assertEquals("value2", props.getProperty("param2"));
       assertNull(props.getProperty("param3"));
@@ -164,29 +182,32 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 5");
   }
 
-  public void testParseUri6(){
+  public void testParseUri6()
+  {
     System.out.println("Test 6 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       GenericNamespaceResolver resolver = new GenericNamespaceResolver();
       resolver.addAlias("http://www.commonjava.org/schema/test", "opl:testlib");
-      
+
       DocumentDriver driver = new DocumentDriver();
       driver.setNamespaceResolver(resolver);
-      
+
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test6.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertFalse(result.getBooleanValue2().booleanValue());
@@ -195,31 +216,32 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 20);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 6");
   }
 
-  public void testParseUri7(){
+  public void testParseUri7()
+  {
     System.out.println("Test 7 >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+
     try {
       DocumentDriver driver = new DocumentDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test7.xml");
-      
+
       fail("Required attribute was missing and should have triggered a MissingAttributeException.");
     }
-    catch (MissingAttributeException e) {
-    }
-    catch (ParseException e)
-    {
+     catch(MissingAttributeException e) {}
+     catch(ParseException e) {
       e.printStackTrace();
       fail("Parse of test7.xml failed.");
     }
+
     System.out.println("<<<<<<<<<<<<<<<<<<<<<<<<<<<< Test 7");
   }
-
 }

Index: SAXDriverTest.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl/SAXDriverTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SAXDriverTest.java	16 Jan 2004 01:37:13 -0000	1.7
+++ SAXDriverTest.java	12 Mar 2004 19:46:54 -0000	1.8
@@ -4,48 +4,52 @@
  */
 package org.commonjava.opl;
 
+import junit.framework.TestCase;
+
 import java.util.Properties;
 
-import junit.framework.TestCase;
 
 //TODO Document SAXDriverTest.java in commonjava-opl
+
 /**
  * @author jdcasey
  *
  */
-public class SAXDriverTest extends TestCase {
-
+public class SAXDriverTest extends TestCase
+{
   /**
    * Constructor for SAXDriverTest.
    * @param arg0
    */
-  public SAXDriverTest(String arg0) {
+  public SAXDriverTest(String arg0)
+  {
     super(arg0);
   }
 
-  public static void main(String[] args) {
+  public static void main(String[] args)
+  {
     junit.textui.TestRunner.run(SAXDriverTest.class);
   }
-  
+
 //  public void testParseInputStream(){
 //  }
 //
 //  public void testParseInputSource(){
 //  }
-
-  public void testParseUri(){
+  public void testParseUri()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertFalse(result.getBooleanValue2().booleanValue());
@@ -54,26 +58,27 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 20);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
 
-  public void testParseUri2(){
+  public void testParseUri2()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test2.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertTrue(result.getBooleanValue2().booleanValue());
@@ -82,26 +87,27 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
 
-  public void testParseUri3(){
+  public void testParseUri3()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test3-main.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertTrue(result.getBooleanValue2().booleanValue());
@@ -110,26 +116,27 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
 
-  public void testParseUri4(){
+  public void testParseUri4()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test4.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value1", props.getProperty("param1"));
       assertEquals("value2", props.getProperty("param2"));
       assertTrue(result.getBooleanValue().booleanValue());
@@ -139,26 +146,27 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
 
-  public void testParseUri5(){
+  public void testParseUri5()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test5.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       System.out.println(result.getBooleanValue2());
       System.out.println(result.getIntegerValue2());
       System.out.println(result.getLongValue2());
-      
+
       assertEquals("value1", props.getProperty("param1"));
       assertEquals("value2", props.getProperty("param2"));
       assertNull(props.getProperty("param3"));
@@ -169,27 +177,28 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 2);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
 
-  public void testParseUri6(){
+  public void testParseUri6()
+  {
     try {
       GenericNamespaceResolver resolver = new GenericNamespaceResolver();
       resolver.addAlias("http://www.commonjava.org/schema/test", "opl:testlib");
-      
+
       SAXDriver driver = new SAXDriver();
       driver.setNamespaceResolver(resolver);
-      
+
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test6.xml");
-      
+
       Properties props = result.getProperties();
       props.list(System.out);
-      
+
       assertEquals("value", props.getProperty("param"));
       assertTrue(result.getBooleanValue().booleanValue());
       assertFalse(result.getBooleanValue2().booleanValue());
@@ -198,28 +207,26 @@
       assertEquals(result.getLongValue().longValue(), 2);
       assertEquals(result.getLongValue2().longValue(), 20);
     }
-    catch (Throwable e) {
+     catch(Throwable e) {
       e.printStackTrace(System.out);
       System.out.flush();
       fail(e.getMessage());
     }
   }
-  
-  public void testParseUri7(){
+
+  public void testParseUri7()
+  {
     try {
       SAXDriver driver = new SAXDriver();
       OPLEngine engine = OPLEngine.getInstance(driver);
       OPLTestParserResult result = (OPLTestParserResult)engine.parse("cprs:///test7.xml");
-      
+
       fail("Required attribute was missing and should have triggered a MissingAttributeException.");
     }
-    catch (MissingAttributeException e) {
-    }
-    catch (ParseException e)
-    {
+     catch(MissingAttributeException e) {}
+     catch(ParseException e) {
       e.printStackTrace();
       fail("Parse of test7.xml failed.");
     }
   }
-
 }

Index: OPLTestParser.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl/OPLTestParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- OPLTestParser.java	16 Jan 2004 01:37:13 -0000	1.4
+++ OPLTestParser.java	12 Mar 2004 19:46:54 -0000	1.5
@@ -4,18 +4,19 @@
  */
 package org.commonjava.opl;
 
-import java.util.Properties;
-
 import org.commonjava.opl.generics.properties.PropertiesContainer;
+
 import org.commonjava.util.Strings;
 
+import java.util.Properties;
+
+
 /**
  * @author jdcasey
  *
  */
-public class OPLTestParser extends NodeParser 
-                            implements PropertiesContainer, OPLModelRoot{
-                              
+public class OPLTestParser extends NodeParser implements PropertiesContainer, OPLModelRoot
+{
   private static final String BOOL = "bool";
   private static final String INT = "int";
   private static final String LONG = "long";
@@ -23,14 +24,14 @@
   private static final String INT2 = "int2";
   private static final String LONG2 = "long2";
   private static final String REQUIRED = "required";
-  
   private OPLTestParserResult result = new OPLTestParserResult();
 
   /**
    * @param context
    * @param parent
    */
-  public OPLTestParser(OPLContext context, NodeParser parent) {
+  public OPLTestParser(OPLContext context, NodeParser parent)
+  {
     super(context, parent);
     addRequiredAttribute(REQUIRED);
   }
@@ -38,7 +39,8 @@
   /**
    * @param context
    */
-  public OPLTestParser(OPLContext context) {
+  public OPLTestParser(OPLContext context)
+  {
     super(context);
     addRequiredAttribute(REQUIRED);
   }
@@ -47,7 +49,8 @@
    * @param properties
    * @see org.commonjava.opl.generics.properties.PropertiesContainer#setProperties(java.util.Properties)
    */
-  public void setProperties(Properties properties) {
+  public void setProperties(Properties properties)
+  {
     result.setProperties(properties);
   }
 
@@ -55,7 +58,8 @@
    * @return
    * @see org.commonjava.opl.generics.properties.PropertiesContainer#getProperties()
    */
-  public Properties getProperties() {
+  public Properties getProperties()
+  {
     return result.getProperties();
   }
 
@@ -64,11 +68,13 @@
    * @throws ParseException
    * @see org.commonjava.opl.OPLModelRoot#getParsedObject()
    */
-  public Object getParsedObject() throws ParseException {
+  public Object getParsedObject() throws ParseException
+  {
     return result;
   }
 
   //TODO Document OPLTestParser.doAfterChildren()
+
   /**
    * @param element
    * @param bodyText
@@ -76,7 +82,7 @@
    * @see org.commonjava.opl.NodeParser#doAfterChildren(org.commonjava.opl.ElementInfo, java.lang.String)
    */
   protected void doAfterChildren(ElementInfo element, String bodyText)
-  throws ParseException 
+    throws ParseException
   {
     System.out.println("1");
     System.out.flush();
@@ -87,15 +93,17 @@
   }
 
   //TODO Document OPLTestParser.doBeforeChildren()
+
   /**
    * @param element
    * @throws ParseException
    * @see org.commonjava.opl.NodeParser#doBeforeChildren(org.commonjava.opl.ElementInfo)
    */
-  protected void doBeforeChildren(ElementInfo element) throws ParseException {
+  protected void doBeforeChildren(ElementInfo element)
+    throws ParseException
+  {
     result.setBooleanValue(Strings.toBoolean(getAttribute(BOOL, element)));
     result.setIntegerValue(Strings.toInteger(getAttribute(INT, element)));
     result.setLongValue(Strings.toLong(getAttribute(LONG, element)));
   }
-
 }

Index: OPLTestParserResult.java
===================================================================
RCS file: /cvsroot/commonjava/commonjava-projects/commonjava-opl/src/test/org/commonjava/opl/OPLTestParserResult.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- OPLTestParserResult.java	10 Oct 2003 01:59:42 -0000	1.1
+++ OPLTestParserResult.java	12 Mar 2004 19:46:54 -0000	1.2
@@ -6,13 +6,15 @@
 
 import java.util.Properties;
 
+
 //TODO Document OPLTestParserResult.java in commonjava-opl
+
 /**
  * @author jdcasey
  *
  */
-public class OPLTestParserResult {
-  
+public class OPLTestParserResult
+{
   private Properties properties;
   private Boolean booleanValue;
   private Integer integerValue;
@@ -22,66 +24,79 @@
   private Long longValue2;
 
   //TODO Document OPLTestParserResult.OPLTestParserResult()
+
   /**
-   * 
+   *
    */
-  public OPLTestParserResult() {
-  }
-  
-  public void setProperties(Properties properties){
+  public OPLTestParserResult() {}
+
+  public void setProperties(Properties properties)
+  {
     this.properties = properties;
   }
-  
-  public Properties getProperties(){
+
+  public Properties getProperties()
+  {
     return properties;
   }
-  
-  public void setBooleanValue(Boolean bool){
+
+  public void setBooleanValue(Boolean bool)
+  {
     this.booleanValue = bool;
   }
-  
-  public Boolean getBooleanValue(){
+
+  public Boolean getBooleanValue()
+  {
     return booleanValue;
   }
 
-  public void setIntegerValue(Integer i){
+  public void setIntegerValue(Integer i)
+  {
     this.integerValue = i;
   }
-  
-  public Integer getIntegerValue(){
+
+  public Integer getIntegerValue()
+  {
     return integerValue;
   }
 
-  public void setLongValue(Long l){
+  public void setLongValue(Long l)
+  {
     this.longValue = l;
   }
-  
-  public Long getLongValue(){
+
+  public Long getLongValue()
+  {
     return longValue;
   }
 
-  public void setBooleanValue2(Boolean bool){
+  public void setBooleanValue2(Boolean bool)
+  {
     this.booleanValue2 = bool;
   }
-  
-  public Boolean getBooleanValue2(){
+
+  public Boolean getBooleanValue2()
+  {
     return booleanValue2;
   }
 
-  public void setIntegerValue2(Integer i){
+  public void setIntegerValue2(Integer i)
+  {
     this.integerValue2 = i;
   }
-  
-  public Integer getIntegerValue2(){
+
+  public Integer getIntegerValue2()
+  {
     return integerValue2;
   }
 
-  public void setLongValue2(Long l){
+  public void setLongValue2(Long l)
+  {
     this.longValue2 = l;
   }
-  
-  public Long getLongValue2(){
+
+  public Long getLongValue2()
+  {
     return longValue2;
   }
-
 }