You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2003/08/24 18:15:22 UTC
cvs commit: incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/config StringValueParserTest.java
jdillon 2003/08/24 09:15:22
Modified: modules/twiddle/src/java/org/apache/geronimo/twiddle/config
StringValueParser.java
Added: modules/twiddle/src/test/org/apache/geronimo/twiddle/config
StringValueParserTest.java
Log:
o Added test for StringValueParser
o Added variable helpers to StringValueParser
Revision Changes Path
1.7 +50 -1 incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/config/StringValueParser.java
Index: StringValueParser.java
===================================================================
RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/java/org/apache/geronimo/twiddle/config/StringValueParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StringValueParser.java 24 Aug 2003 15:06:02 -0000 1.6
+++ StringValueParser.java 24 Aug 2003 16:15:22 -0000 1.7
@@ -82,6 +82,10 @@
public StringValueParser(final Map vars)
{
+ if (vars == null) {
+ throw new NullArgumentException("vars");
+ }
+
context = JexlHelper.createContext();
context.setVars(vars);
@@ -100,10 +104,47 @@
return context.getVars();
}
+ public Object getVariable(final Object name)
+ {
+ if (name == null) {
+ throw new NullArgumentException("name");
+ }
+
+ return getVariables().get(name);
+ }
+
+ public Object setVariable(final Object name, final Object value)
+ {
+ if (name == null) {
+ throw new NullArgumentException("name");
+ }
+
+ return getVariables().put(name, value);
+ }
+
+ public Object unsetVariable(final Object name)
+ {
+ if (name == null) {
+ throw new NullArgumentException("name");
+ }
+
+ return getVariables().remove(name);
+ }
+
+ public void addVariables(final Map map)
+ {
+ if (map == null) {
+ throw new NullArgumentException("map");
+ }
+
+ getVariables().putAll(map);
+ }
+
private FlatResolver resolver = new FlatResolver(true);
protected Expression createExpression(final String expression) throws Exception
{
+ assert expression != null;
Expression expr = ExpressionFactory.createExpression(expression);
expr.addPreResolver(resolver);
return expr;
@@ -111,6 +152,10 @@
public Object evaluate(final String expression) throws Exception
{
+ if (expression == null) {
+ throw new NullArgumentException("expression");
+ }
+
boolean trace = log.isTraceEnabled();
if (trace) {
log.trace("Evaluating expression: " + expression);
@@ -127,6 +172,10 @@
public String parse(final String input)
{
+ if (input == null) {
+ throw new NullArgumentException("input");
+ }
+
boolean trace = log.isTraceEnabled();
if (trace) {
log.trace("Parsing input: " + input);
1.1 incubator-geronimo/modules/twiddle/src/test/org/apache/geronimo/twiddle/config/StringValueParserTest.java
Index: StringValueParserTest.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Geronimo" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Geronimo", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
* ====================================================================
*/
package org.apache.geronimo.twiddle.config;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.framework.Assert;
/**
* Tests for <code>Configuration</code>.
*
* @version <code>$Revision: 1.1 $ $Date: 2003/08/24 16:15:22 $</code>
*/
public class StringValueParserTest
extends TestCase
{
/**
* Return the tests included in this test suite.
*/
public static Test suite()
{
return new TestSuite(StringValueParserTest.class);
}
/**
* Construct a new instance of this test case.
*
* @param name Name of the test case
*/
public StringValueParserTest(final String name)
{
super(name);
}
protected StringValueParser parser;
/**
* Set up instance variables required by this test case.
*/
protected void setUp()
{
parser = new StringValueParser();
}
/**
* Tear down instance variables required by this test case.
*/
protected void tearDown()
{
parser = null;
}
/////////////////////////////////////////////////////////////////////////
// Tests //
/////////////////////////////////////////////////////////////////////////
public void testDefault() throws Exception
{
String value = "${java.home}";
String result = parser.parse(value);
assertEquals(result, System.getProperty("java.home"));
}
public void testSubst() throws Exception
{
String value = "BEFORE${java.home}AFTER";
String result = parser.parse(value);
assertEquals(result, "BEFORE" + System.getProperty("java.home") + "AFTER");
}
public void testVariable() throws Exception
{
String myvar = "this is my variable";
parser.getVariables().put("my.var", myvar);
String value = "${my.var}";
String result = parser.parse(value);
assertEquals(result, myvar);
}
public void testFlatVariable() throws Exception
{
String myvar = "this is my variable";
parser.getVariables().put("my.var", myvar);
parser.getVariables().put("my", "not used");
String value = "${my.var}";
String result = parser.parse(value);
assertEquals(result, myvar);
}
public void testSyntax() throws Exception
{
String value = "${java.home";
try {
String result = parser.parse(value);
assertTrue("Should have thrown an exception", false);
}
catch (Exception ignore) {}
}
}