openfast-commit — Publishes subversion log and diffs on each commit

[<jac...@us...>]

Revision: 81
          http://openfast.svn.sourceforge.net/openfast/?rev=81&view=rev
Author:   jacob_northey
Date:     2007-10-22 10:38:42 -0700 (Mon, 22 Oct 2007)

Log Message:
-----------
Retrofitting unit tests to XMLMessageTemplateLoader parsers

Modified Paths:
--------------
    trunk/test/unit/org/openfast/template/loader/ScalarParserTest.java
    trunk/test/unit/org/openfast/test/OpenFastTestCase.java

Added Paths:
-----------
    trunk/test/unit/org/openfast/template/loader/ComposedDecimalParserTest.java
    trunk/test/unit/org/openfast/template/loader/StringParserTest.java
    trunk/test/unit/org/openfast/template/loader/TemplateRefParserTest.java

Removed Paths:
-------------
    trunk/src/org/openfast/template/loader/ContentParser.java

Deleted: trunk/src/org/openfast/template/loader/ContentParser.java
===================================================================
--- trunk/src/org/openfast/template/loader/ContentParser.java	2007-10-22 15:11:57 UTC (rev 80)
+++ trunk/src/org/openfast/template/loader/ContentParser.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -1,5 +0,0 @@
-package org.openfast.template.loader;
-
-public interface ContentParser {
-
-}

Added: trunk/test/unit/org/openfast/template/loader/ComposedDecimalParserTest.java
===================================================================
--- trunk/test/unit/org/openfast/template/loader/ComposedDecimalParserTest.java	                        (rev 0)
+++ trunk/test/unit/org/openfast/template/loader/ComposedDecimalParserTest.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -0,0 +1,28 @@
+package org.openfast.template.loader;
+
+import org.openfast.IntegerValue;
+import org.openfast.ScalarValue;
+import org.openfast.template.ComposedScalar;
+import org.openfast.template.operator.Operator;
+import org.openfast.template.type.Type;
+import org.openfast.test.OpenFastTestCase;
+import org.w3c.dom.Element;
+
+public class ComposedDecimalParserTest extends OpenFastTestCase {
+
+	private FieldParser parser;
+	private ParsingContext context;
+
+	protected void setUp() throws Exception {
+		parser = new ComposedDecimalParser();
+		context = XMLMessageTemplateLoader.createInitialContext();
+	}
+	
+	public void testParse() throws Exception {
+		Element decimalDef = document("<decimal name=\"composed\"><mantissa><delta/></mantissa><exponent><constant value=\"-2\"/></exponent></decimal>").getDocumentElement();
+		assertTrue(parser.canParse(decimalDef, context));
+		ComposedScalar decimal = (ComposedScalar) parser.parse(decimalDef, context);
+		assertComposedScalarField(decimal, Type.DECIMAL, "composed", Operator.CONSTANT, new IntegerValue(-2), Operator.DELTA, ScalarValue.UNDEFINED);
+	}
+
+}

Modified: trunk/test/unit/org/openfast/template/loader/ScalarParserTest.java
===================================================================
--- trunk/test/unit/org/openfast/template/loader/ScalarParserTest.java	2007-10-22 15:11:57 UTC (rev 80)
+++ trunk/test/unit/org/openfast/template/loader/ScalarParserTest.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -1,13 +1,42 @@
 package org.openfast.template.loader;
 
+import org.openfast.DecimalValue;
+import org.openfast.Dictionary;
+import org.openfast.ScalarValue;
+import org.openfast.template.Scalar;
+import org.openfast.template.operator.Operator;
+import org.openfast.template.type.Type;
 import org.openfast.test.OpenFastTestCase;
 import org.w3c.dom.Element;
 
 public class ScalarParserTest extends OpenFastTestCase {
 
-	public void testParseElementBooleanParsingContext() throws Exception {
-		Element scalar = document("<int32 name=\"value\"><copy/></int32>").getDocumentElement();
-		new ScalarParser().parse(scalar, XMLMessageTemplateLoader.createInitialContext());
+	private ScalarParser parser;
+	private ParsingContext context;
+
+	protected void setUp() throws Exception {
+		parser = new ScalarParser();
+		context = XMLMessageTemplateLoader.createInitialContext();
 	}
+	
+	public void testParseCopyInt() throws Exception {
+		Element int32Def = document("<int32 name=\"value\"><copy/></int32>").getDocumentElement();
+		assertTrue(parser.canParse(int32Def, context));
+		Scalar int32 = (Scalar) parser.parse(int32Def, context);
+		assertScalarField(int32, Type.I32, "value", null, "", Dictionary.GLOBAL, "value", Operator.COPY, ScalarValue.UNDEFINED, false);
+	}
+	
+	public void testParseDeltaDecimal() throws Exception {
+		Element decimalDef = document("<decimal name=\"price\"><delta value=\"1.2\" key=\"decimalValue\" dictionary=\"marketData\"/></decimal>").getDocumentElement();
+		assertTrue(parser.canParse(decimalDef, context));
+		Scalar decimal = (Scalar) parser.parse(decimalDef, context);
+		assertScalarField(decimal, Type.DECIMAL, "price", null, "", "marketData", "decimalValue", Operator.DELTA, new DecimalValue(1.2), false);
+	}
 
+	public void testParseStringDefaultWithNamespace() throws Exception {
+		Element stringDef = document("<string name=\"text\" ns=\"http://openfast.org/data/\" presence=\"optional\"><default/></string>").getDocumentElement();
+		assertTrue(parser.canParse(stringDef, context));
+		Scalar string = (Scalar) parser.parse(stringDef, context);
+		assertScalarField(string, Type.STRING, "text", null, "http://openfast.org/data/", Dictionary.GLOBAL, "text", Operator.DEFAULT, ScalarValue.UNDEFINED, true);
+	}
 }

Added: trunk/test/unit/org/openfast/template/loader/StringParserTest.java
===================================================================
--- trunk/test/unit/org/openfast/template/loader/StringParserTest.java	                        (rev 0)
+++ trunk/test/unit/org/openfast/template/loader/StringParserTest.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -0,0 +1,28 @@
+package org.openfast.template.loader;
+
+import org.openfast.Dictionary;
+import org.openfast.ScalarValue;
+import org.openfast.template.Scalar;
+import org.openfast.template.operator.Operator;
+import org.openfast.template.type.Type;
+import org.openfast.test.OpenFastTestCase;
+import org.w3c.dom.Element;
+
+public class StringParserTest extends OpenFastTestCase {
+
+	private ScalarParser parser;
+	private ParsingContext context;
+
+	protected void setUp() throws Exception {
+		parser = new ScalarParser();
+		context = XMLMessageTemplateLoader.createInitialContext();
+	}
+	
+	public void testParse() throws Exception {
+		Element unicodeDef = document("<string name=\"message\" charset=\"unicode\"/>").getDocumentElement();
+		assertTrue(parser.canParse(unicodeDef, context));
+		Scalar unicode = (Scalar) parser.parse(unicodeDef, context);
+		assertScalarField(unicode, Type.UNICODE, "message", null, "", Dictionary.GLOBAL, "message", Operator.NONE, ScalarValue.UNDEFINED, false);
+	}
+
+}

Added: trunk/test/unit/org/openfast/template/loader/TemplateRefParserTest.java
===================================================================
--- trunk/test/unit/org/openfast/template/loader/TemplateRefParserTest.java	                        (rev 0)
+++ trunk/test/unit/org/openfast/template/loader/TemplateRefParserTest.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -0,0 +1,32 @@
+package org.openfast.template.loader;
+
+import org.openfast.template.DynamicTemplateReference;
+import org.openfast.template.Field;
+import org.openfast.template.MessageTemplate;
+import org.openfast.template.StaticTemplateReference;
+import org.openfast.test.OpenFastTestCase;
+import org.w3c.dom.Element;
+
+public class TemplateRefParserTest extends OpenFastTestCase {
+
+	private TemplateRefParser parser;
+	private ParsingContext context;
+
+	protected void setUp() throws Exception {
+		parser = new TemplateRefParser();
+		context = XMLMessageTemplateLoader.createInitialContext();
+	}
+	
+	public void testParseDynamic() throws Exception {
+		 Element dynTempRefDef = document("<templateRef/>").getDocumentElement();
+		 assertEquals(DynamicTemplateReference.INSTANCE, parser.parse(dynTempRefDef, context));
+	}
+	
+	public void testParseStatic() throws Exception {
+		Element statTempRefDef = document("<templateRef name=\"base\"/>").getDocumentElement();
+		MessageTemplate base = new MessageTemplate("base", new Field[] {});
+		context.getTemplateRegistry().define(base);
+		StaticTemplateReference statTempRef = (StaticTemplateReference) parser.parse(statTempRefDef, context);
+		assertEquals(base, statTempRef.getTemplate());
+	}
+}

Modified: trunk/test/unit/org/openfast/test/OpenFastTestCase.java
===================================================================
--- trunk/test/unit/org/openfast/test/OpenFastTestCase.java	2007-10-22 15:11:57 UTC (rev 80)
+++ trunk/test/unit/org/openfast/test/OpenFastTestCase.java	2007-10-22 17:38:42 UTC (rev 81)
@@ -22,6 +22,13 @@
 
 package org.openfast.test;
 
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Date;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
 import junit.framework.TestCase;
 
 import org.openfast.ByteUtil;
@@ -29,9 +36,9 @@
 import org.openfast.Context;
 import org.openfast.DecimalValue;
 import org.openfast.IntegerValue;
+import org.openfast.QName;
 import org.openfast.ScalarValue;
 import org.openfast.StringValue;
-
 import org.openfast.codec.FastDecoder;
 import org.openfast.codec.FastEncoder;
 import org.openfast.template.ComposedScalar;
@@ -49,20 +56,9 @@
 import org.openfast.template.type.Type;
 import org.openfast.template.type.codec.TypeCodec;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Date;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-
 public abstract class OpenFastTestCase extends TestCase {
     public static DecimalValue d(double value) {
         return new DecimalValue(value);
@@ -180,6 +176,17 @@
 	    assertEquals(mantissaValue, fields[1].getDefaultValue());
 	}
 
+	protected void assertComposedScalarField(ComposedScalar field, Type type, String name, Operator exponentOp, ScalarValue exponentValue, Operator mantissaOp, ScalarValue mantissaValue) {
+	    assertEquals(type, field.getType());
+	    assertEquals(name, field.getName());
+	    Scalar[] fields = field.getFields();
+	    assertEquals(exponentOp, fields[0].getOperator());
+	    assertEquals(exponentValue, fields[0].getDefaultValue());
+
+	    assertEquals(mantissaOp, fields[1].getOperator());
+	    assertEquals(mantissaValue, fields[1].getDefaultValue());
+	}
+
 	protected void assertScalarField(FieldSet fieldSet, int fieldIndex, Type type, String name, Operator operator) {
 	    Scalar field = (Scalar) fieldSet.getField(fieldIndex);
 	    assertScalarField(field, type, name);
@@ -218,4 +225,17 @@
 		Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new ByteArrayInputStream(string.getBytes())));
 		return doc;
 	}
+
+	protected void assertScalarField(Scalar scalar, Type type, String name, String id, String namespace, String dictionary, String key, Operator op, ScalarValue defaultVal, boolean optional) {
+		QName qname = new QName(name, namespace);
+		assertEquals(type, scalar.getType());
+		assertEquals(op, scalar.getOperator());
+		assertEquals(qname, scalar.getQName());
+		QName keyName = new QName(key, namespace);
+		assertEquals(keyName, scalar.getKey());
+		assertEquals(id, scalar.getId());
+		assertEquals(dictionary, scalar.getDictionary());
+		assertEquals(defaultVal, scalar.getDefaultValue());
+		assertEquals(optional, scalar.isOptional());
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.