Author: ekoneil
Date: Tue Jan 25 09:49:07 2005
New Revision: 126399
URL: http://svn.apache.org/viewcvs?view=rev&rev=126399
Log:
Fixup NetUI type conversion.
Things are cleaner now and have rational APIs for passing the Locale to a type
converter from the NetUI EL.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Added:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestException.java
- copied, changed from r126383,
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
Removed:
incubator/beehive/trunk/netui/test/src/junitTests/com/
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
incubator/beehive/trunk/netui/test/ant/junitCore.xml
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java&r1=126398&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/BaseTypeConverter.java
Tue Jan 25 09:49:07 2005
@@ -17,33 +17,17 @@
*/
package org.apache.beehive.netui.util.type;
-// java imports
-
import java.util.Locale;
-// internal imports
-
-// external imports
-
/**
* Default implementation of the [EMAIL PROTECTED] TypeConverter} interface.
*/
-public class BaseTypeConverter
- implements TypeConverter {
-
- /**
- * Convert the String to a type. The base implementation
- * delegates to the [EMAIL PROTECTED] #convertToObject(java.lang.String,
java.util.Locale)}
- * method with <code>null</code> for the locale.
- */
- public Object convertToObject(String value) {
- return convertToObject(value, null);
- }
+public class BaseTypeConverter {
/**
* Convert the String to a type, optinally using the given locale.
*/
- public Object convertToObject(String value, Locale locale) {
+ public Object convertToObject(Class type, String value, Locale locale) {
return value;
}
}
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java&r1=126398&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/DelegatingTypeConverter.java
Tue Jan 25 09:49:07 2005
@@ -17,14 +17,8 @@
*/
package org.apache.beehive.netui.util.type;
-// java imports
-
import java.util.Locale;
-// internal imports
-
-// external imports
-
/**
* Implementation of the [EMAIL PROTECTED] TypeConverter} interface that
delegates
* to a [EMAIL PROTECTED] TypeConverter} implementation which doesn't extend
@@ -41,11 +35,7 @@
_converter = converter;
}
- public Object convertToObject(String value) {
- return _converter.convertToObject(value);
- }
-
- public Object convertToObject(String value, Locale locale) {
+ public Object convertToObject(Class type, String value, Locale locale) {
return _converter.convertToObject(value);
}
}
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java&r1=126398&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeConverter.java
Tue Jan 25 09:49:07 2005
@@ -17,14 +17,6 @@
*/
package org.apache.beehive.netui.util.type;
-// java imports
-
-import java.util.Locale;
-
-// internal imports
-
-// external imports
-
/**
* Interface used to define converters for converting Strings into various
* Object types.
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java&r1=126398&p2=incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/type/TypeUtils.java
Tue Jan 25 09:49:07 2005
@@ -17,15 +17,10 @@
*/
package org.apache.beehive.netui.util.type;
-// java imports
-
import java.io.InputStream;
-
import java.math.BigDecimal;
import java.math.BigInteger;
-
import java.text.DateFormat;
-
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@@ -35,56 +30,56 @@
import java.util.Map;
import java.util.Properties;
-// internal imports
import org.apache.beehive.netui.util.Bundle;
-
import org.apache.beehive.netui.util.config.ConfigUtil;
import
org.apache.beehive.netui.util.config.bean.NetuiConfigDocument.NetuiConfig;
import org.apache.beehive.netui.util.config.bean.TypeConverters;
-
import org.apache.beehive.netui.util.logging.Logger;
-// external imports
-
/**
*
*
*/
public final class TypeUtils {
- private static final Logger logger = Logger.getInstance(TypeUtils.class);
-
+ private static final Logger LOGGER = Logger.getInstance(TypeUtils.class);
private static final String TYPE_CONVERTER_PROPERTIES =
"/properties/netui-typeconverter.properties";
private static final String EMPTY_STRING = "";
- private static final HashMap _converters = new HashMap();
- private static String _toString = null;
+ private static final HashMap<Class, BaseTypeConverter> TYPE_CONVERTERS =
new HashMap<Class, BaseTypeConverter>();
+ private static String TO_STRING = null;
static {
// initialize the default type converters
initialize();
- // read webapp converters
- loadConverters();
+ Map<String, String> map = readFromConfig();
+ if(map != null) {
+ load(map);
+ map.clear();
+ }
+
+ map = readFromProperties();
+ if(map != null)
+ load(map);
- if(logger.isInfoEnabled()) logger.info(registeredConvertersToString());
+ if(LOGGER.isInfoEnabled())
+ LOGGER.info(registeredConvertersToString());
}
- // do not construct
- private TypeUtils() {
- }
+ /* do not construct */
+ private TypeUtils() {}
/**
* Convert an object from a String to the given type.
*
+ * @deprecated
* @param value the String to convert
* @param type the type to which to convert the String
* @return the Object result of converting the String to the type.
* @throws TypeConverterNotFoundException if a TypeConverter for the
target type can not be found.
*/
public static final Object convertToObject(String value, Class type) {
- BaseTypeConverter converter = lookupTypeConverter(type);
- assert converter != null;
- return converter.convertToObject(value);
+ return convertToObject(value, type, null);
}
/**
@@ -101,71 +96,71 @@
public static final Object convertToObject(String value, Class type,
Locale locale) {
BaseTypeConverter converter = lookupTypeConverter(type);
assert converter != null;
- return converter.convertToObject(value, locale);
+ return converter.convertToObject(type, value, locale);
}
public static final byte convertToByte(String value) {
- return ((Byte)convertToObject(value, byte.class)).byteValue();
+ return ((Byte)convertToObject(value, byte.class, null)).byteValue();
}
public static final boolean convertToBoolean(String value) {
- return ((Boolean)convertToObject(value, boolean.class)).booleanValue();
+ return ((Boolean)convertToObject(value, boolean.class,
null)).booleanValue();
}
public static final char convertToChar(String value) {
- return ((Character)convertToObject(value, char.class)).charValue();
+ return ((Character)convertToObject(value, char.class,
null)).charValue();
}
public static final double convertToDouble(String value) {
- return ((Double)convertToObject(value, double.class)).doubleValue();
+ return ((Double)convertToObject(value, double.class,
null)).doubleValue();
}
public static final float convertToFloat(String value) {
- return ((Float)convertToObject(value, float.class)).floatValue();
+ return ((Float)convertToObject(value, float.class, null)).floatValue();
}
public static final int convertToInt(String value) {
- return ((Integer)convertToObject(value, int.class)).intValue();
+ return ((Integer)convertToObject(value, int.class, null)).intValue();
}
public static final long convertToLong(String value) {
- return ((Long)convertToObject(value, long.class)).longValue();
+ return ((Long)convertToObject(value, long.class, null)).longValue();
}
public static final short convertToShort(String value) {
- return ((Short)convertToObject(value, short.class)).shortValue();
+ return ((Short)convertToObject(value, short.class, null)).shortValue();
}
public static final Byte convertToByteObject(String value) {
- return (Byte)convertToObject(value, Byte.class);
+ return (Byte)convertToObject(value, Byte.class, null);
}
public static final Boolean convertToBooleanObject(String value) {
- return (Boolean)convertToObject(value, Boolean.class);
+ return (Boolean)convertToObject(value, Boolean.class, null);
}
public static final Character convertToCharacterObject(String value) {
- return (Character)convertToObject(value, Character.class);
+ return (Character)convertToObject(value, Character.class, null);
}
public static final Double convertToDoubleObject(String value) {
- return (Double)convertToObject(value, Double.class);
+ return (Double)convertToObject(value, Double.class, null);
}
public static final Float convertToFloatObject(String value) {
- return (Float)convertToObject(value, Float.class);
+ return (Float)convertToObject(value, Float.class, null);
}
public static final Integer convertToIntegerObject(String value) {
- return (Integer)convertToObject(value, Integer.class);
+ return (Integer)convertToObject(value, Integer.class, null);
}
public static final Long convertToLongObject(String value) {
- return (Long)convertToObject(value, Long.class);
+ return (Long)convertToObject(value, Long.class, null);
}
public static final Short convertToShortObject(String value) {
- return (Short)convertToObject(value, Short.class);
+ return (Short)convertToObject(value, Short.class, null);
}
/**
@@ -176,7 +171,7 @@
* @throws TypeConverterNotFoundException if a TypeConverter for the
target type can not be found.
*/
private static final BaseTypeConverter lookupTypeConverter(Class type) {
- BaseTypeConverter converter = (BaseTypeConverter)_converters.get(type);
+ BaseTypeConverter converter =
(BaseTypeConverter)TYPE_CONVERTERS.get(type);
if(converter == null) {
String msg = "Could not find a TypeConverter for converting a
String to an object of type \"" +
(type != null ? type.getName() : null) + "\"";
@@ -187,8 +182,8 @@
else
msg = Bundle.getErrorString("TypeUtils_noConverterForType",
new Object[]{type.getName()});
tcn.setLocalizedMessage(msg);
- if(logger.isInfoEnabled())
- logger.info(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg);
throw tcn;
}
@@ -197,54 +192,45 @@
}
private static String registeredConvertersToString() {
- if(_toString != null)
- return _toString;
+ if(TO_STRING != null)
+ return TO_STRING;
- StringBuilder buf = new StringBuilder(128);
- buf.append(TypeUtils.class.getName() + " regestered converters (class
name, TypeConverter implementation):\n");
- buf.append(":::::\n");
- Iterator iterator = _converters.keySet().iterator();
+ StringBuilder sb = new StringBuilder(256);
+ sb.append(TypeUtils.class.getName() + " regestered converters (class
name, TypeConverter implementation):\n");
+ sb.append(":::::\n");
+ Iterator iterator = TYPE_CONVERTERS.keySet().iterator();
while(iterator.hasNext()) {
Class key = (Class)iterator.next();
String keyName = key.getName();
- String value = (_converters.get(key) != null ?
_converters.get(key).getClass().getName() : "null");
- buf.append(keyName);
- buf.append(", ");
- buf.append(value);
- buf.append("\n");
+ String value = (TYPE_CONVERTERS.get(key) != null ?
TYPE_CONVERTERS.get(key).getClass().getName() : "null");
+ sb.append(keyName);
+ sb.append(", ");
+ sb.append(value);
+ sb.append("\n");
}
- buf.append(":::::\n");
- _toString = buf.toString();
+ sb.append(":::::\n");
+ TO_STRING = sb.toString();
- return _toString;
+ return TO_STRING;
}
- private static void loadConverters() {
- Map map = readFromConfig();
- if(map != null) {
- load(map);
- map.clear();
- }
-
- map = readFromProperties();
- if(map != null)
- load(map);
- }
-
- private static Map readFromProperties() {
+ private static Map<String, String> readFromProperties() {
Properties props = null;
InputStream is = null;
try {
is =
(TypeUtils.class).getClassLoader().getResourceAsStream(TYPE_CONVERTER_PROPERTIES);
- if(logger.isDebugEnabled()) logger.debug("InputStream: " + is);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("found type converter InputStream at " +
TYPE_CONVERTER_PROPERTIES + " " + (is != null ? "true" : "false"));
- if(is == null) return null;
+ if(is == null)
+ return null;
props = new Properties();
props.load(is);
} catch(Exception e) {
- if(logger.isWarnEnabled()) logger.warn("Error occurred reading
type converter properties file", e);
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Error occurred reading type converter properties
file", e);
} finally {
try {
if(is != null) is.close();
@@ -252,7 +238,7 @@
}
}
- LinkedHashMap map = new LinkedHashMap();
+ LinkedHashMap<String, String> map = new LinkedHashMap<String,
String>();
Enumeration e = props.propertyNames();
while(e.hasMoreElements()) {
String key = (String)e.nextElement();
@@ -262,18 +248,21 @@
return map;
}
- private static final Map readFromConfig() {
+ private static final Map<String, String> readFromConfig() {
NetuiConfig config = ConfigUtil.getConfig();
- if(config == null) return null;
+ if(config == null)
+ return null;
TypeConverters converters = config.getTypeConverters();
- if(converters == null) return null;
+ if(converters == null)
+ return null;
org.apache.beehive.netui.util.config.bean.TypeConverters.TypeConverter[]
converterArray =
converters.getTypeConverterArray();
- if(converterArray == null) return null;
+ if(converterArray == null)
+ return null;
- LinkedHashMap map = new LinkedHashMap();
+ LinkedHashMap<String, String> map = new LinkedHashMap<String,
String>();
for(int i = 0; i < converterArray.length; i++) {
map.put(converterArray[i].getType(),
converterArray[i].getConverterClass());
}
@@ -281,68 +270,71 @@
return map;
}
- private static void load(Map map) {
+ private static void load(Map<String, String> map) {
// load the properties and continue to populate the map
- Iterator iterator = map.keySet().iterator();
- while(iterator.hasNext()) {
- String key = (String)iterator.next();
- String className = (String)map.get(key);
+ for(String key : map.keySet()) {
+ String className = map.get(key);
if((key == null || key.equals(EMPTY_STRING)) || (className == null
|| className.equals(EMPTY_STRING))) {
String msg = "Could not create a TypeConverter for type \"" +
key + "\" and TypeConverter \"" + className + "\"";
- if(logger.isWarnEnabled()) logger.warn(msg);
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn(msg);
continue;
}
Class targetClazz = null;
- Class tcClazz = null;
- TypeConverter tc = null;
- // try to find the "convert-to" class
+ /* attempt to load the "convert-to" class */
try {
targetClazz = Class.forName(key);
} catch(ClassNotFoundException cnf) {
- String msg = "Could not create a TypeConverter for type \"" +
key + "\" because the target type could not be found.";
- if(logger.isWarnEnabled()) logger.warn(msg);
+ String msg = "Could not create a TypeConverter for type \"" +
key + "\" because the \"convert-to\" type could not be found.";
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn(msg);
continue;
}
+ Class tcClazz = null;
+ BaseTypeConverter tc = null;
// try to find the TypeConverter implementation
try {
tcClazz = Class.forName(className);
- tc = (TypeConverter)tcClazz.newInstance();
-
+ Object obj = tcClazz.newInstance();
+
// this supports existing TypeConverter implementations
// but allows TypeUtils make calls against the
BaseTypeConverter
// API, which supports Locale-based conversion
- if(!(tc instanceof BaseTypeConverter))
- tc = new DelegatingTypeConverter(tc);
+ if(obj instanceof TypeConverter)
+ tc = new DelegatingTypeConverter((TypeConverter)obj);
+ else if(obj instanceof BaseTypeConverter)
+ tc = (BaseTypeConverter)obj;
+ else throw new IllegalStateException("Attempt to load illegal
type converter type: " + tcClazz);
} catch(ClassNotFoundException cnf) {
- if(logger.isWarnEnabled())
- logger.warn("Could not create a TypeConverter for type \""
+ key + "\" because the TypeConverter implementation class \"" +
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Could not create a TypeConverter for type \""
+ key + "\" because the TypeConverter implementation class \"" +
(tcClazz != null ? tcClazz.getName() : null) + "\"
could not be found.");
continue;
} catch(Exception e) {
- if(logger.isWarnEnabled())
- logger.warn("Could not create a TypeConverter for type \""
+ key + "\" because the implementation class \"" +
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Could not create a TypeConverter for type \""
+ key + "\" because the implementation class \"" +
(tcClazz != null ? tcClazz.getName() : null) + "\"
could not be instantiated.");
continue;
}
- // found both classes, warn if overwriting a previous converter.
right now, there is no way to get these back
- if(_converters.containsKey(targetClazz))
- if(logger.isWarnEnabled())
- logger.warn("Overwriting a previously defined
TypeConverter named \"" + targetClazz +
+ /* found two type converters for the same class -- warn */
+ if(TYPE_CONVERTERS.containsKey(targetClazz))
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn("Overwriting a previously defined
TypeConverter named \"" + targetClazz +
"\" with a new TypeConverter implementation of type
\"" + className + "\"");
- if(logger.isInfoEnabled())
- logger.info("Adding a type converter; target type=\"" +
targetClazz.getName() +
+ if(LOGGER.isInfoEnabled())
+ LOGGER.info("Adding a type converter; target type=\"" +
targetClazz.getName() +
"\" TypeConverter implementation=\"" +
tc.getClass().getName() + "\"");
- _converters.put(targetClazz, tc);
+ TYPE_CONVERTERS.put(targetClazz, tc);
}
}
@@ -353,23 +345,23 @@
* because JDBC uses these complex types to map SQL types to Java objects.
*/
private static void initialize() {
- _converters.put(byte.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(byte.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
return (value == null || value.equals(EMPTY_STRING) ? new
Byte((byte)0) : new Byte(value.trim()));
}
});
- _converters.put(Byte.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Byte.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, byte.class);
+ return TypeUtils.convertToObject(value, byte.class, null);
}
});
- _converters.put(boolean.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(boolean.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return Boolean.FALSE;
@@ -380,119 +372,119 @@
return Boolean.FALSE;
}
});
- _converters.put(Boolean.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Boolean.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, boolean.class);
+ return TypeUtils.convertToObject(value, boolean.class,
null);
}
});
- _converters.put(char.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(char.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Character('\u0000');
else
return new Character(value.charAt(0));
}
});
- _converters.put(Character.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Character.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, char.class);
+ return TypeUtils.convertToObject(value, char.class, null);
}
});
- _converters.put(double.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(double.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Double(0.0);
else
return new Double(value.trim());
}
});
- _converters.put(Double.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Double.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, double.class);
+ return TypeUtils.convertToObject(value, double.class,
null);
}
});
- _converters.put(float.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(float.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Float(0.0);
else
return new Float(value.trim());
}
});
- _converters.put(Float.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Float.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, float.class);
+ return TypeUtils.convertToObject(value, float.class, null);
}
});
- _converters.put(int.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(int.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Integer(0);
else
return new Integer(value.trim());
}
});
- _converters.put(Integer.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Integer.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, int.class);
+ return TypeUtils.convertToObject(value, int.class, null);
}
});
- _converters.put(long.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(long.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Long(0);
else
return new Long(value.trim());
}
});
- _converters.put(Long.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Long.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, long.class);
+ return TypeUtils.convertToObject(value, long.class, null);
}
});
- _converters.put(short.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(short.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return new Short((short)0);
else
return new Short(value.trim());
}
});
- _converters.put(Short.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Short.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
- return TypeUtils.convertToObject(value, short.class);
+ return TypeUtils.convertToObject(value, short.class, null);
}
});
- _converters.put(String.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(String.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null)
return null;
else
@@ -500,8 +492,8 @@
}
});
- _converters.put(java.math.BigDecimal.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(java.math.BigDecimal.class, new
BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
@@ -509,8 +501,8 @@
}
});
- _converters.put(java.math.BigInteger.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(java.math.BigInteger.class, new
BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
@@ -518,8 +510,8 @@
}
});
- _converters.put(byte[].class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(byte[].class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else
@@ -527,12 +519,11 @@
}
});
- _converters.put(Byte[].class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ TYPE_CONVERTERS.put(Byte[].class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING))
return null;
else {
- TypeConverter primByte =
(TypeConverter)_converters.get(byte.class);
byte[] bytes = value.getBytes();
Byte[] wBytes = new Byte[bytes.length];
@@ -544,9 +535,10 @@
}
});
- _converters.put(Date.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
- if(value == null || value.equals(EMPTY_STRING)) return null;
+ TYPE_CONVERTERS.put(Date.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
+ if(value == null || value.equals(EMPTY_STRING))
+ return null;
try {
if(locale == null)
@@ -556,28 +548,27 @@
return df.parse(value);
} catch(java.text.ParseException pe) {
String msg = "Caugnt an error converting a String to a
DateFormat.SHORT formatted Date";
- if(logger.isWarnEnabled()) logger.warn(msg, pe);
- System.err.println(msg);
+ if(LOGGER.isWarnEnabled())
+ LOGGER.warn(msg, pe);
TypeConversionException tce = new
TypeConversionException(msg, pe);
tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaUtilDateConvertError",
new Object[]{pe.getMessage()}));
-
throw tce;
}
}
});
- // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Date.html
- _converters.put(java.sql.Date.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
+ /* http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Date.html */
+ TYPE_CONVERTERS.put(java.sql.Date.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
if(value == null || value.equals(EMPTY_STRING)) return null;
try {
return java.sql.Date.valueOf(value);
} catch(Exception e) {
String msg = "Caught an error converting a String to a
java.sql.Date";
- if(logger.isWarnEnabled()) logger.warn(msg, e);
- System.err.println(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
TypeConversionException tce = new
TypeConversionException(msg, e);
tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlDateConvertError",
new Object[]{e.getMessage()}));
@@ -586,17 +577,18 @@
}
});
- // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Timestamp.html
- _converters.put(java.sql.Timestamp.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
- if(value == null || value.equals(EMPTY_STRING)) return null;
+ /* http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Timestamp.html */
+ TYPE_CONVERTERS.put(java.sql.Timestamp.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
+ if(value == null || value.equals(EMPTY_STRING))
+ return null;
try {
return java.sql.Timestamp.valueOf(value);
} catch(Exception e) {
String msg = "Caught an error converting a String to a
java.sql.Timestamp";
- if(logger.isWarnEnabled()) logger.warn(msg, e);
- System.err.println(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
TypeConversionException tce = new
TypeConversionException(msg, e);
tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimestampConvertError",
new Object[]{e.getMessage()}));
@@ -605,17 +597,18 @@
}
});
- // http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Time.html
- _converters.put(java.sql.Time.class, new BaseTypeConverter() {
- public Object convertToObject(String value, Locale locale) {
- if(value == null || value.equals(EMPTY_STRING)) return null;
+ /* http://java.sun.com/j2se/1.4.1/docs/api/java/sql/Time.html */
+ TYPE_CONVERTERS.put(java.sql.Time.class, new BaseTypeConverter() {
+ public Object convertToObject(Class type, String value, Locale
locale) {
+ if(value == null || value.equals(EMPTY_STRING))
+ return null;
try {
return java.sql.Time.valueOf(value);
} catch(Exception e) {
String msg = "Caught an error converting a String to a
java.sql.Time";
- if(logger.isWarnEnabled()) logger.warn(msg, e);
- System.err.println(msg);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error(msg, e);
TypeConversionException tce = new
TypeConversionException(msg, e);
tce.setLocalizedMessage(Bundle.getString("TypeUtils_javaSqlTimeConvertError",
new Object[]{e.getMessage()}));
Modified: incubator/beehive/trunk/netui/test/ant/junitCore.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/junitCore.xml?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/ant/junitCore.xml&r1=126398&p2=incubator/beehive/trunk/netui/test/ant/junitCore.xml&r2=126399
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/junitCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/junitCore.xml Tue Jan 25
09:49:07 2005
@@ -47,7 +47,6 @@
<batchtest fork="yes" todir="${testout.dir}">
<fileset dir="${test.classes.dir}/junitTests">
<include
name="org/apache/beehive/netui/test/script/el/**/*Test.class"/>
- <exclude
name="org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.class"/>
</fileset>
</batchtest>
<batchtest fork="yes" todir="${testout.dir}">
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/databinding/expression/IndexedNameTest.java
Tue Jan 25 09:49:07 2005
@@ -17,26 +17,18 @@
*/
package org.apache.beehive.netui.test.databinding.expression;
-// java imports
-
-import java.io.InputStream;
import javax.servlet.jsp.tagext.Tag;
-// internal imports
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
import org.apache.beehive.netui.script.common.IDataAccessProvider;
import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor;
-
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.config.ConfigInitializationException;
import org.apache.beehive.netui.test.util.config.TestConfigUtil;
-
-// external imports
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
/**
* This TestCase tests the ability of the IndexedNameInterceptor to correctly
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AbstractExpressionTest.java
Tue Jan 25 09:49:07 2005
@@ -17,29 +17,25 @@
*/
package org.apache.beehive.netui.test.script;
-import java.io.InputStream;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.VariableResolver;
-import org.apache.beehive.netui.script.ExpressionEvaluator;
-import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
-import org.apache.beehive.netui.script.el.NetUIUpdateVariableResolver;
-import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
-import org.apache.beehive.netui.test.beans.ComplexTypeActionForm;
-import org.apache.beehive.netui.test.servlet.ServletFactory;
-import org.apache.beehive.netui.test.util.config.TestConfigUtil;
-import org.apache.beehive.netui.util.config.ConfigUtil;
-import org.apache.beehive.netui.util.config.ConfigInitializationException;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.struts.action.ActionForm;
import org.apache.struts.taglib.html.Constants;
+
+import org.apache.beehive.netui.script.ExpressionEvaluator;
+import org.apache.beehive.netui.script.common.ImplicitObjectUtil;
+import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
+import org.apache.beehive.netui.test.beans.ComplexTypeActionForm;
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.test.util.config.TestConfigUtil;
public abstract class AbstractExpressionTest
extends TestCase {
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/AccessTest.java
Tue Jan 25 09:49:07 2005
@@ -17,16 +17,11 @@
*/
package org.apache.beehive.netui.test.script;
-// java imports
-
import java.util.Iterator;
import java.util.HashMap;
import java.util.Map;
-// internal imports
import org.apache.beehive.netui.test.beans.IProduct;
-
-// external imports
/**
* Unit tests for XScript expression parsing.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/BundleScriptTest.java
Tue Jan 25 09:49:07 2005
@@ -17,16 +17,11 @@
*/
package org.apache.beehive.netui.test.script;
-// java imports
-
import java.util.Locale;
import javax.servlet.http.HttpServletRequest;
-// internal imports
import org.apache.beehive.netui.script.common.BundleContext;
import org.apache.beehive.netui.script.common.BundleMap;
-
-// external imports
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTest.java
Tue Jan 25 09:49:07 2005
@@ -161,7 +161,7 @@
if(_logger.isDebugEnabled()) _logger.debug("Caught
expected failure for expression \"" + expr + "\"");
continue;
} else
- throw new ExpressionTestError("An error occurred parsing
test [" + i + "] with expression \"" + expr + "\"", t);
+ throw new ExpressionTestException("An error occurred
parsing test [" + i + "] with expression \"" + expr + "\"", t);
}
}
}
@@ -209,7 +209,7 @@
throws Exception {
Object result =
evaluateExpression("{requestScope.simpleBean.charProperty}", getPageContext());
if(!(result instanceof String && ((String)result).equals("a")))
- throw new ExpressionTestError("The Character value returned from
XScript was not valid.", null);
+ throw new ExpressionTestException("The Character value returned
from XScript was not valid.", null);
}
public void testEmptyReadExpr()
@@ -293,7 +293,7 @@
}
} catch(Throwable t) {
t.printStackTrace();
- throw new ExpressionTestError("An error occurred parsing test [" +
i + "] with expression \"" + expr + "\"", t);
+ throw new ExpressionTestException("An error occurred parsing test
[" + i + "] with expression \"" + expr + "\"", t);
}
}
Deleted:
/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java?view=auto&rev=126398
==============================================================================
Copied:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestException.java
(from r126383,
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestException.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java&r1=126383&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestException.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestError.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionTestException.java
Tue Jan 25 09:49:07 2005
@@ -17,12 +17,6 @@
*/
package org.apache.beehive.netui.test.script;
-// java imports
-
-// internal imports
-
-// external imports
-
/**
* An exception that represents a failure executing an expression test.
* <br/>
@@ -31,10 +25,10 @@
* exception, error, etc in a single exception that contains the test case
* that failed with the <code>Throwable</code> cause.
*/
-public class ExpressionTestError
+public class ExpressionTestException
extends Exception {
- public ExpressionTestError(String message, Throwable cause) {
+ public ExpressionTestException(String message, Throwable cause) {
super(message, cause);
}
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ExpressionUpdateTest.java
Tue Jan 25 09:49:07 2005
@@ -23,14 +23,14 @@
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
+import junit.framework.AssertionFailedError;
+
import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
import org.apache.beehive.netui.test.beans.ComplexTypeActionForm;
import org.apache.beehive.netui.test.tools.AssertHelper;
import org.apache.beehive.netui.script.IllegalExpressionException;
import org.apache.beehive.netui.util.logging.Logger;
-import junit.framework.AssertionFailedError;
-
/**
*
*/
@@ -164,7 +164,7 @@
continue;
}
- throw new ExpressionTestError("The expression \"" + expr + "\" did
not throw an exception as expected.", null);
+ throw new ExpressionTestException("The expression \"" + expr + "\"
did not throw an exception as expected.", null);
}
}
@@ -907,7 +907,7 @@
* ===============================================================
*/
private void executeSimpleTest(String testName, Object[][] data)
- throws ExpressionTestError {
+ throws ExpressionTestException {
for(int i = 0; i < data.length; i++) {
String expr = (String)data[i][0];
Object updateData = data[i][1];
@@ -925,7 +925,7 @@
comparator.compareSimple(updatedValue, simpleBean);
} catch(Throwable e) {
- throw new ExpressionTestError("An error occurred executing " +
testName + " [" + i + "] with expression '" + expr + "'", e);
+ throw new ExpressionTestException("An error occurred executing
" + testName + " [" + i + "] with expression '" + expr + "'", e);
}
}
}
@@ -947,7 +947,7 @@
comparator.compareComplex(expected, complexBean);
} catch(Throwable t) {
- throw new ExpressionTestError("An error occurred executing " +
testName + " [" + i + "] with expression '" + expr + "'", t);
+ throw new ExpressionTestException("An error occurred executing
" + testName + " [" + i + "] with expression '" + expr + "'", t);
}
}
}
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ParsedExpressionTest.java
Tue Jan 25 09:49:07 2005
@@ -17,13 +17,7 @@
*/
package org.apache.beehive.netui.test.script;
-// java imports
-
-// internal imports
-
import org.apache.beehive.netui.script.Expression;
-
-// external imports
/**
* Unit tests for XScript expression parsing.
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/ProcessPopulateTest.java
Tue Jan 25 09:49:07 2005
@@ -17,30 +17,23 @@
*/
package org.apache.beehive.netui.test.script;
-// java imports
-
import java.lang.reflect.Proxy;
-
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-// internal imports
-import org.apache.beehive.netui.pageflow.ProcessPopulate;
-
-import org.apache.beehive.netui.pageflow.RequestParameterHandler;
-
-import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler;
-import org.apache.beehive.netui.test.servlet.ServletFactory;
-import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
-
-// external imports
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.struts.taglib.html.Constants;
+
+import org.apache.beehive.netui.pageflow.ProcessPopulate;
+import org.apache.beehive.netui.pageflow.RequestParameterHandler;
+import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler;
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELAccessTest.java
Tue Jan 25 09:49:07 2005
@@ -17,18 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
-// java imports
-
-// internal imports
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.beehive.netui.test.script.AccessTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELBundleScriptTest.java
Tue Jan 25 09:49:07 2005
@@ -17,18 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
-// java imports
-
-// internal imports
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.beehive.netui.test.script.BundleScriptTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Deleted:
/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELCustomBindingContextTest.java?view=auto&rev=126398
==============================================================================
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionObjectTest.java
Tue Jan 25 09:49:07 2005
@@ -17,25 +17,18 @@
*/
package org.apache.beehive.netui.test.script.el;
-// java imports
-
import java.util.List;
-// internal imports
-import org.apache.beehive.netui.script.Expression;
-import org.apache.beehive.netui.script.ExpressionEvaluator;
-import org.apache.beehive.netui.script.el.ExpressionEvaluatorImpl;
-import org.apache.beehive.netui.util.logging.Logger;
-
-// external imports
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.beehive.netui.script.Expression;
+import org.apache.beehive.netui.script.ExpressionEvaluator;
+import org.apache.beehive.netui.script.el.ExpressionEvaluatorImpl;
+
public class NetUIELExpressionObjectTest
extends TestCase {
-
- private static final Logger _logger =
Logger.getInstance(NetUIELExpressionObjectTest.class);
public void testSimple() {
ExpressionEvaluator ee = createExpressionEvaluator();
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionTest.java
Tue Jan 25 09:49:07 2005
@@ -17,18 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
-// java imports
-
-// internal imports
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.beehive.netui.test.script.ExpressionTest;
-
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELExpressionUpdateTest.java
Tue Jan 25 09:49:07 2005
@@ -17,12 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.beehive.netui.test.script.ExpressionUpdateTest;
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELPageInputTest.java
Tue Jan 25 09:49:07 2005
@@ -17,12 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.beehive.netui.test.script.PageInputTest;
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/el/NetUIELParsedExpressionTest.java
Tue Jan 25 09:49:07 2005
@@ -17,17 +17,12 @@
*/
package org.apache.beehive.netui.test.script.el;
-// java imports
-
-// internal imports
+import junit.framework.Test;
+import junit.framework.TestSuite;
import org.apache.beehive.netui.test.script.ParsedExpressionTest;
import org.apache.beehive.netui.script.ExpressionEvaluator;
import org.apache.beehive.netui.script.ExpressionEvaluatorFactory;
-
-// external imports
-import junit.framework.Test;
-import junit.framework.TestSuite;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/script/simpleaction/InternalExpressionUtilsTest.java
Tue Jan 25 09:49:07 2005
@@ -17,26 +17,23 @@
*/
package org.apache.beehive.netui.test.script.simpleaction;
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.pageflow.internal.InternalExpressionUtils;
-import org.apache.beehive.netui.test.servlet.ServletFactory;
-import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
-import org.apache.beehive.netui.test.beans.FooJavaBean;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.el.ELException;
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.pageflow.internal.InternalExpressionUtils;
+import org.apache.beehive.netui.test.servlet.ServletFactory;
+import org.apache.beehive.netui.test.beans.SimpleTypeActionForm;
+import org.apache.beehive.netui.test.beans.FooJavaBean;
+
public class InternalExpressionUtilsTest
extends TestCase {
-
- private static final Logger _logger =
Logger.getInstance(InternalExpressionUtilsTest.class);
private HttpServletRequest _request = null;
private ServletContext _servletContext = null;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/servlet/FauxPageContext.java
Tue Jan 25 09:49:07 2005
@@ -19,7 +19,6 @@
import java.util.Enumeration;
import java.util.Hashtable;
-
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/tools/AssertHelper.java
Tue Jan 25 09:49:07 2005
@@ -17,13 +17,8 @@
*/
package org.apache.beehive.netui.test.tools;
-// java imports
-
import java.lang.reflect.Array;
-// internal imports
-
-// external imports
import junit.framework.AssertionFailedError;
/**
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/config/ConfigTest.java
Tue Jan 25 09:49:07 2005
@@ -17,33 +17,26 @@
*/
package org.apache.beehive.netui.test.util.config;
-// java imports
-
import java.io.InputStream;
-// internal imports
-import org.apache.beehive.netui.util.config.ConfigUtil;
-import
org.apache.beehive.netui.util.config.bean.NetuiConfigDocument.NetuiConfig;
-
-import org.apache.beehive.netui.util.logging.Logger;
-
-// external imports
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.beehive.netui.util.config.ConfigUtil;
+import
org.apache.beehive.netui.util.config.bean.NetuiConfigDocument.NetuiConfig;
+import org.apache.beehive.netui.util.logging.Logger;
+
/**
*
*/
public class ConfigTest
extends TestCase {
- private static final Logger logger = Logger.getInstance(ConfigTest.class);
-
/**
- * Ensure that the default v2 NetUI config file parses.
+ * Ensure that the OOTB, Beehive V1 config file parses.
*/
- public void testValidate90Config()
+ public void testValidateBeehiveV1Config()
throws Exception {
InputStream is =
getClass().getClassLoader().getResourceAsStream("WEB-INF/netui-config.xml");
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/iterator/IteratorFactoryTest.java
Tue Jan 25 09:49:07 2005
@@ -17,19 +17,15 @@
*/
package org.apache.beehive.netui.test.util.iterator;
-// java imports
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-// internal imports
-import org.apache.beehive.netui.util.iterator.*;
-
-// external imports
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.util.iterator.*;
/**
*
Modified:
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java?view=diff&rev=126399&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java&r1=126398&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java&r2=126399
==============================================================================
---
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
(original)
+++
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/util/type/TypeUtilsTest.java
Tue Jan 25 09:49:07 2005
@@ -17,26 +17,17 @@
*/
package org.apache.beehive.netui.test.util.type;
-// java imports
-
import java.math.BigDecimal;
import java.math.BigInteger;
-// import java.sql.Date; // there are tests for this below, but the name
conflicts with java.util.Date
-import java.sql.Timestamp;
-import java.util.Date;
import java.util.Locale;
-import java.io.InputStream;
-
-// internal imports
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.util.type.TypeUtils;
-import org.apache.beehive.netui.util.config.ConfigInitializationException;
-import org.apache.beehive.netui.test.util.config.TestConfigUtil;
-// external imports
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+
+import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.type.TypeUtils;
+import org.apache.beehive.netui.test.util.config.TestConfigUtil;
/**
*
