You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/01/23 07:32:46 UTC
svn commit: r736963 [20/21] - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-compat/src/main/java/com/ibatis/common/resources/
ibatis-3-compat/src/main/java/com/ibatis/common/util/
ibatis-3-compat/src/mai...
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/QuotingTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/QuotingTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/QuotingTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/QuotingTest.java Thu Jan 22 22:32:36 2009
@@ -32,66 +32,59 @@
import junit.framework.TestSuite;
-public class QuotingTest extends OgnlTestCase
-{
- private static Object[][] TESTS = {
- // Quoting
- { null, "`c`", new Character('c') },
- { null, "'s'", new Character('s') },
- { null, "'string'", "string" },
- { null, "\"string\"", "string" },
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- if (TESTS[i].length == 3) {
- result.addTest(new QuotingTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2]));
- } else {
- if (TESTS[i].length == 4) {
- result.addTest(new QuotingTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3]));
- } else {
- if (TESTS[i].length == 5) {
- result.addTest(new QuotingTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
- } else {
- throw new RuntimeException("don't understand TEST format");
- }
- }
- }
+public class QuotingTest extends OgnlTestCase {
+ private static Object[][] TESTS = {
+ // Quoting
+ {null, "`c`", new Character('c')},
+ {null, "'s'", new Character('s')},
+ {null, "'string'", "string"},
+ {null, "\"string\"", "string"},
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+
+ for (int i = 0; i < TESTS.length; i++) {
+ if (TESTS[i].length == 3) {
+ result.addTest(new QuotingTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2]));
+ } else {
+ if (TESTS[i].length == 4) {
+ result.addTest(new QuotingTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3]));
+ } else {
+ if (TESTS[i].length == 5) {
+ result.addTest(new QuotingTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
+ } else {
+ throw new RuntimeException("don't understand TEST format");
+ }
}
- return result;
+ }
}
+ return result;
+ }
- /*===================================================================
- Constructors
- ===================================================================*/
- public QuotingTest()
- {
- super();
- }
-
- public QuotingTest(String name)
- {
- super(name);
- }
-
- public QuotingTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
-
- public QuotingTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
- }
-
- public QuotingTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public QuotingTest() {
+ super();
+ }
+
+ public QuotingTest(String name) {
+ super(name);
+ }
+
+ public QuotingTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public QuotingTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public QuotingTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterTest.java Thu Jan 22 22:32:36 2009
@@ -30,90 +30,82 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl;
-import java.util.*;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.NoSuchPropertyException;
-import org.apache.ibatis.ognl.InappropriateExpressionException;
import org.apache.ibatis.ognl.objects.Root;
-public class SetterTest extends OgnlTestCase
-{
- private static Root ROOT = new Root();
-
- private static Object[][] TESTS = {
- // Setting values
- { ROOT.getMap(), "newValue", null, new Integer(101) },
- { ROOT, "settableList[0]", "foo", "quux" }, /* absolute indexes */
- { ROOT, "settableList[0]", "quux" },
- { ROOT, "settableList[2]", "baz", "quux" },
- { ROOT, "settableList[2]", "quux" },
- { ROOT, "settableList[$]", "quux", "oompa" }, /* special indexes */
- { ROOT, "settableList[$]", "oompa" },
- { ROOT, "settableList[^]", "quux", "oompa" },
- { ROOT, "settableList[^]", "oompa" },
- { ROOT, "settableList[|]", "bar", "oompa" },
- { ROOT, "settableList[|]", "oompa" },
- { ROOT, "map.newValue", new Integer(101), new Integer(555) },
- { ROOT, "map", ROOT.getMap(), new HashMap(), NoSuchPropertyException.class },
- { ROOT.getMap(), "newValue2 || put(\"newValue2\",987), newValue2", new Integer(987), new Integer(1002) },
- { ROOT, "map.(someMissingKey || newValue)", new Integer(555), new Integer(666) },
- { ROOT.getMap(), "newValue || someMissingKey", new Integer(666), new Integer(666) }, // no setting happens!
- { ROOT, "map.(newValue && aKey)", null, new Integer(54321) },
- { ROOT, "map.(someMissingKey && newValue)", null, null }, // again, no setting
- { null, "0", new Integer(0), null, InappropriateExpressionException.class }, // illegal for setting, no property
- { ROOT, "map[0]=\"map.newValue\", map[0](#this)", new Integer(666), new Integer(888) },
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- if (TESTS[i].length == 3) {
- result.addTest(new SetterTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2]));
- } else {
- if (TESTS[i].length == 4) {
- result.addTest(new SetterTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3]));
- } else {
- if (TESTS[i].length == 5) {
- result.addTest(new SetterTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
- } else {
- throw new RuntimeException("don't understand TEST format");
- }
- }
- }
- }
- return result;
- }
+import java.util.HashMap;
- /*===================================================================
- Constructors
- ===================================================================*/
- public SetterTest()
- {
- super();
- }
-
- public SetterTest(String name)
- {
- super(name);
- }
-
- public SetterTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class SetterTest extends OgnlTestCase {
+ private static Root ROOT = new Root();
- public SetterTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ private static Object[][] TESTS = {
+ // Setting values
+ {ROOT.getMap(), "newValue", null, new Integer(101)},
+ {ROOT, "settableList[0]", "foo", "quux"}, /* absolute indexes */
+ {ROOT, "settableList[0]", "quux"},
+ {ROOT, "settableList[2]", "baz", "quux"},
+ {ROOT, "settableList[2]", "quux"},
+ {ROOT, "settableList[$]", "quux", "oompa"}, /* special indexes */
+ {ROOT, "settableList[$]", "oompa"},
+ {ROOT, "settableList[^]", "quux", "oompa"},
+ {ROOT, "settableList[^]", "oompa"},
+ {ROOT, "settableList[|]", "bar", "oompa"},
+ {ROOT, "settableList[|]", "oompa"},
+ {ROOT, "map.newValue", new Integer(101), new Integer(555)},
+ {ROOT, "map", ROOT.getMap(), new HashMap(), NoSuchPropertyException.class},
+ {ROOT.getMap(), "newValue2 || put(\"newValue2\",987), newValue2", new Integer(987), new Integer(1002)},
+ {ROOT, "map.(someMissingKey || newValue)", new Integer(555), new Integer(666)},
+ {ROOT.getMap(), "newValue || someMissingKey", new Integer(666), new Integer(666)}, // no setting happens!
+ {ROOT, "map.(newValue && aKey)", null, new Integer(54321)},
+ {ROOT, "map.(someMissingKey && newValue)", null, null}, // again, no setting
+ {null, "0", new Integer(0), null, InappropriateExpressionException.class}, // illegal for setting, no property
+ {ROOT, "map[0]=\"map.newValue\", map[0](#this)", new Integer(666), new Integer(888)},
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+
+ for (int i = 0; i < TESTS.length; i++) {
+ if (TESTS[i].length == 3) {
+ result.addTest(new SetterTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2]));
+ } else {
+ if (TESTS[i].length == 4) {
+ result.addTest(new SetterTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3]));
+ } else {
+ if (TESTS[i].length == 5) {
+ result.addTest(new SetterTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
+ } else {
+ throw new RuntimeException("don't understand TEST format");
+ }
+ }
+ }
}
+ return result;
+ }
- public SetterTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public SetterTest() {
+ super();
+ }
+
+ public SetterTest(String name) {
+ super(name);
+ }
+
+ public SetterTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public SetterTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public SetterTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterWithConversionTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterWithConversionTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterWithConversionTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SetterWithConversionTest.java Thu Jan 22 22:32:36 2009
@@ -33,76 +33,69 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Root;
-public class SetterWithConversionTest extends OgnlTestCase
-{
- private static Root ROOT = new Root();
-
- private static Object[][] TESTS = {
- // Property set with conversion
- { ROOT, "intValue", new Integer(0), new Double(6.5), new Integer(6) },
- { ROOT, "intValue", new Integer(6), new Double(1025.87645), new Integer(1025) },
- { ROOT, "intValue", new Integer(1025), "654", new Integer(654) },
- { ROOT, "stringValue", null, new Integer(25), "25" },
- { ROOT, "stringValue", "25", new Float(100.25), "100.25" },
- { ROOT, "anotherStringValue", "foo", new Integer(0), "0" },
- { ROOT, "anotherStringValue", "0", new Double(0.5), "0.5" },
- { ROOT, "anotherIntValue", new Integer(123), "5", new Integer(5) },
- { ROOT, "anotherIntValue", new Integer(5), new Double(100.25), new Integer(100) },
- // { ROOT, "anotherIntValue", new Integer(100), new String[] { "55" }, new Integer(55)},
- // { ROOT, "yetAnotherIntValue", new Integer(46), new String[] { "55" }, new Integer(55)},
-
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- if (TESTS[i].length == 3) {
- result.addTest(new SetterWithConversionTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2]));
- } else {
- if (TESTS[i].length == 4) {
- result.addTest(new SetterWithConversionTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3]));
- } else {
- if (TESTS[i].length == 5) {
- result.addTest(new SetterWithConversionTest((String)TESTS[i][1], TESTS[i][0], (String)TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
- } else {
- throw new RuntimeException("don't understand TEST format");
- }
- }
- }
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public SetterWithConversionTest()
- {
- super();
- }
-
- public SetterWithConversionTest(String name)
- {
- super(name);
- }
-
- public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class SetterWithConversionTest extends OgnlTestCase {
+ private static Root ROOT = new Root();
- public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ private static Object[][] TESTS = {
+ // Property set with conversion
+ {ROOT, "intValue", new Integer(0), new Double(6.5), new Integer(6)},
+ {ROOT, "intValue", new Integer(6), new Double(1025.87645), new Integer(1025)},
+ {ROOT, "intValue", new Integer(1025), "654", new Integer(654)},
+ {ROOT, "stringValue", null, new Integer(25), "25"},
+ {ROOT, "stringValue", "25", new Float(100.25), "100.25"},
+ {ROOT, "anotherStringValue", "foo", new Integer(0), "0"},
+ {ROOT, "anotherStringValue", "0", new Double(0.5), "0.5"},
+ {ROOT, "anotherIntValue", new Integer(123), "5", new Integer(5)},
+ {ROOT, "anotherIntValue", new Integer(5), new Double(100.25), new Integer(100)},
+ // { ROOT, "anotherIntValue", new Integer(100), new String[] { "55" }, new Integer(55)},
+ // { ROOT, "yetAnotherIntValue", new Integer(46), new String[] { "55" }, new Integer(55)},
+
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
+
+ for (int i = 0; i < TESTS.length; i++) {
+ if (TESTS[i].length == 3) {
+ result.addTest(new SetterWithConversionTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2]));
+ } else {
+ if (TESTS[i].length == 4) {
+ result.addTest(new SetterWithConversionTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3]));
+ } else {
+ if (TESTS[i].length == 5) {
+ result.addTest(new SetterWithConversionTest((String) TESTS[i][1], TESTS[i][0], (String) TESTS[i][1], TESTS[i][2], TESTS[i][3], TESTS[i][4]));
+ } else {
+ throw new RuntimeException("don't understand TEST format");
+ }
+ }
+ }
}
+ return result;
+ }
- public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public SetterWithConversionTest() {
+ super();
+ }
+
+ public SetterWithConversionTest(String name) {
+ super(name);
+ }
+
+ public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public SetterWithConversionTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ShortCircuitingExpressionTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ShortCircuitingExpressionTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ShortCircuitingExpressionTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/ShortCircuitingExpressionTest.java Thu Jan 22 22:32:36 2009
@@ -31,60 +31,51 @@
package org.apache.ibatis.ognl;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.OgnlException;
-import org.apache.ibatis.ognl.NoSuchPropertyException;
-public class ShortCircuitingExpressionTest extends OgnlTestCase
-{
- private static Object[][] TESTS = {
- { "#root ? someProperty : 99", new Integer(99) },
- { "#root ? 99 : someProperty", OgnlException.class },
- { "(#x=99)? #x.someProperty : #x", NoSuchPropertyException.class },
- { "#xyzzy.doubleValue()", NullPointerException.class },
- { "#xyzzy && #xyzzy.doubleValue()", null },
- { "(#x=99) && #x.doubleValue()", new Double(99) },
- { "#xyzzy || 101", new Integer(101) },
- { "99 || 101", new Integer(99) },
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- result.addTest(new ShortCircuitingExpressionTest((String)TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String)TESTS[i][0], TESTS[i][1]));
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public ShortCircuitingExpressionTest()
- {
- super();
- }
-
- public ShortCircuitingExpressionTest(String name)
- {
- super(name);
- }
-
- public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class ShortCircuitingExpressionTest extends OgnlTestCase {
+ private static Object[][] TESTS = {
+ {"#root ? someProperty : 99", new Integer(99)},
+ {"#root ? 99 : someProperty", OgnlException.class},
+ {"(#x=99)? #x.someProperty : #x", NoSuchPropertyException.class},
+ {"#xyzzy.doubleValue()", NullPointerException.class},
+ {"#xyzzy && #xyzzy.doubleValue()", null},
+ {"(#x=99) && #x.doubleValue()", new Double(99)},
+ {"#xyzzy || 101", new Integer(101)},
+ {"99 || 101", new Integer(99)},
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
- public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ for (int i = 0; i < TESTS.length; i++) {
+ result.addTest(new ShortCircuitingExpressionTest((String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String) TESTS[i][0], TESTS[i][1]));
}
+ return result;
+ }
- public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public ShortCircuitingExpressionTest() {
+ super();
+ }
+
+ public ShortCircuitingExpressionTest(String name) {
+ super(name);
+ }
+
+ public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public ShortCircuitingExpressionTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimpleNavigationChainTreeTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimpleNavigationChainTreeTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimpleNavigationChainTreeTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimpleNavigationChainTreeTest.java Thu Jan 22 22:32:36 2009
@@ -31,63 +31,54 @@
package org.apache.ibatis.ognl;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.Ognl;
-public class SimpleNavigationChainTreeTest extends OgnlTestCase
-{
- private static Object[][] TESTS = {
- { "name", Boolean.TRUE },
- { "name[i]", Boolean.FALSE },
- { "name + foo", Boolean.FALSE },
- { "name.foo", Boolean.TRUE }
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- result.addTest(new SimpleNavigationChainTreeTest((String)TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String)TESTS[i][0], TESTS[i][1]));
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public SimpleNavigationChainTreeTest()
- {
- super();
- }
-
- public SimpleNavigationChainTreeTest(String name)
- {
- super(name);
- }
-
- public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class SimpleNavigationChainTreeTest extends OgnlTestCase {
+ private static Object[][] TESTS = {
+ {"name", Boolean.TRUE},
+ {"name[i]", Boolean.FALSE},
+ {"name + foo", Boolean.FALSE},
+ {"name.foo", Boolean.TRUE}
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
- public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ for (int i = 0; i < TESTS.length; i++) {
+ result.addTest(new SimpleNavigationChainTreeTest((String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String) TESTS[i][0], TESTS[i][1]));
}
+ return result;
+ }
- public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
-
- /*===================================================================
- Overridden methods
- ===================================================================*/
- protected void runTest() throws Exception
- {
- assertTrue(Ognl.isSimpleNavigationChain(getExpression(), context) == ((Boolean)getExpectedResult()).booleanValue());
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public SimpleNavigationChainTreeTest() {
+ super();
+ }
+
+ public SimpleNavigationChainTreeTest(String name) {
+ super(name);
+ }
+
+ public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public SimpleNavigationChainTreeTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
+
+ /*===================================================================
+ Overridden methods
+ ===================================================================*/
+ protected void runTest() throws Exception {
+ assertTrue(Ognl.isSimpleNavigationChain(getExpression(), context) == ((Boolean) getExpectedResult()).booleanValue());
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimplePropertyTreeTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimplePropertyTreeTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimplePropertyTreeTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/SimplePropertyTreeTest.java Thu Jan 22 22:32:36 2009
@@ -31,67 +31,58 @@
package org.apache.ibatis.ognl;
import junit.framework.TestSuite;
-import org.apache.ibatis.ognl.Ognl;
-public class SimplePropertyTreeTest extends OgnlTestCase
-{
- private static Object[][] TESTS = {
- { "name", Boolean.TRUE },
- { "foo", Boolean.TRUE },
- { "name[i]", Boolean.FALSE },
- { "name + foo", Boolean.FALSE },
- { "name.foo", Boolean.FALSE },
- { "name.foo.bar", Boolean.FALSE },
- { "name.{? foo }", Boolean.FALSE },
- { "name.( foo )", Boolean.FALSE }
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- result.addTest(new SimplePropertyTreeTest((String)TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String)TESTS[i][0], TESTS[i][1]));
- }
- return result;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public SimplePropertyTreeTest()
- {
- super();
- }
-
- public SimplePropertyTreeTest(String name)
- {
- super(name);
- }
-
- public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+public class SimplePropertyTreeTest extends OgnlTestCase {
+ private static Object[][] TESTS = {
+ {"name", Boolean.TRUE},
+ {"foo", Boolean.TRUE},
+ {"name[i]", Boolean.FALSE},
+ {"name + foo", Boolean.FALSE},
+ {"name.foo", Boolean.FALSE},
+ {"name.foo.bar", Boolean.FALSE},
+ {"name.{? foo }", Boolean.FALSE},
+ {"name.( foo )", Boolean.FALSE}
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
- public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ for (int i = 0; i < TESTS.length; i++) {
+ result.addTest(new SimplePropertyTreeTest((String) TESTS[i][0] + " (" + TESTS[i][1] + ")", null, (String) TESTS[i][0], TESTS[i][1]));
}
+ return result;
+ }
- public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
-
- /*===================================================================
- Overridden methods
- ===================================================================*/
- protected void runTest() throws Exception
- {
- assertTrue(Ognl.isSimpleProperty(getExpression(), context) == ((Boolean)getExpectedResult()).booleanValue());
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public SimplePropertyTreeTest() {
+ super();
+ }
+
+ public SimplePropertyTreeTest(String name) {
+ super(name);
+ }
+
+ public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public SimplePropertyTreeTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
+
+ /*===================================================================
+ Overridden methods
+ ===================================================================*/
+ protected void runTest() throws Exception {
+ assertTrue(Ognl.isSimpleProperty(getExpression(), context) == ((Boolean) getExpectedResult()).booleanValue());
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/StaticsAndConstructorsTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/StaticsAndConstructorsTest.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/StaticsAndConstructorsTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/StaticsAndConstructorsTest.java Thu Jan 22 22:32:36 2009
@@ -33,65 +33,58 @@
import junit.framework.TestSuite;
import org.apache.ibatis.ognl.objects.Root;
-public class StaticsAndConstructorsTest extends OgnlTestCase
-{
- private static Root ROOT = new Root();
-
- private static Object[][] TESTS = {
- { "@java.lang.Class@forName(\"java.lang.Object\")", Object.class },
- { "@java.lang.Integer@MAX_VALUE", new Integer(Integer.MAX_VALUE) },
- { "@@max(3,4)", new Integer(4) },
- { "new java.lang.StringBuffer().append(55).toString()", "55" },
- { "class", ROOT.getClass() },
- { "@org.apache.ibatis.ognl.objects.Root@class", ROOT.getClass() },
- { "class.getName()", ROOT.getClass().getName() },
- { "@org.apache.ibatis.ognl.objects.Root@class.getName()", ROOT.getClass().getName() },
- { "@org.apache.ibatis.ognl.objects.Root@class.name", ROOT.getClass().getName() },
- { "class.getSuperclass()", ROOT.getClass().getSuperclass() },
- { "class.superclass", ROOT.getClass().getSuperclass() },
- { "class.name", ROOT.getClass().getName() },
- { "getStaticInt()", new Integer(Root.getStaticInt()) },
- { "@org.apache.ibatis.ognl.objects.Root@getStaticInt()", new Integer(Root.getStaticInt()) },
- };
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static TestSuite suite()
- {
- TestSuite result = new TestSuite();
-
- for (int i = 0; i < TESTS.length; i++) {
- result.addTest(new StaticsAndConstructorsTest((String)TESTS[i][0] + " (" + TESTS[i][1] + ")", ROOT, (String)TESTS[i][0], TESTS[i][1]));
- }
- return result;
- }
+public class StaticsAndConstructorsTest extends OgnlTestCase {
+ private static Root ROOT = new Root();
- /*===================================================================
- Constructors
- ===================================================================*/
- public StaticsAndConstructorsTest()
- {
- super();
- }
-
- public StaticsAndConstructorsTest(String name)
- {
- super(name);
- }
-
- public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult)
- {
- super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
- }
+ private static Object[][] TESTS = {
+ {"@java.lang.Class@forName(\"java.lang.Object\")", Object.class},
+ {"@java.lang.Integer@MAX_VALUE", new Integer(Integer.MAX_VALUE)},
+ {"@@max(3,4)", new Integer(4)},
+ {"new java.lang.StringBuffer().append(55).toString()", "55"},
+ {"class", ROOT.getClass()},
+ {"@org.apache.ibatis.ognl.objects.Root@class", ROOT.getClass()},
+ {"class.getName()", ROOT.getClass().getName()},
+ {"@org.apache.ibatis.ognl.objects.Root@class.getName()", ROOT.getClass().getName()},
+ {"@org.apache.ibatis.ognl.objects.Root@class.name", ROOT.getClass().getName()},
+ {"class.getSuperclass()", ROOT.getClass().getSuperclass()},
+ {"class.superclass", ROOT.getClass().getSuperclass()},
+ {"class.name", ROOT.getClass().getName()},
+ {"getStaticInt()", new Integer(Root.getStaticInt())},
+ {"@org.apache.ibatis.ognl.objects.Root@getStaticInt()", new Integer(Root.getStaticInt())},
+ };
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static TestSuite suite() {
+ TestSuite result = new TestSuite();
- public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue)
- {
- super(name, root, expressionString, expectedResult, setValue);
+ for (int i = 0; i < TESTS.length; i++) {
+ result.addTest(new StaticsAndConstructorsTest((String) TESTS[i][0] + " (" + TESTS[i][1] + ")", ROOT, (String) TESTS[i][0], TESTS[i][1]));
}
+ return result;
+ }
- public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult)
- {
- super(name, root, expressionString, expectedResult);
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public StaticsAndConstructorsTest() {
+ super();
+ }
+
+ public StaticsAndConstructorsTest(String name) {
+ super(name);
+ }
+
+ public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue, Object expectedAfterSetResult) {
+ super(name, root, expressionString, expectedResult, setValue, expectedAfterSetResult);
+ }
+
+ public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult, Object setValue) {
+ super(name, root, expressionString, expectedResult, setValue);
+ }
+
+ public StaticsAndConstructorsTest(String name, Object root, String expressionString, Object expectedResult) {
+ super(name, root, expressionString, expectedResult);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/BaseObjectIndexed.java Thu Jan 22 22:32:36 2009
@@ -30,47 +30,40 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
-public class BaseObjectIndexed extends Object
-{
- private Map attributes = new HashMap();
-
- public BaseObjectIndexed()
- {
- super();
- }
-
- public Map getAttributes()
- {
- return attributes;
- }
-
- public Object getAttribute(String name)
- {
- return attributes.get(name);
- }
-
- public void setAttribute(String name, Object value)
- {
- attributes.put(name, value);
- }
-
- /* allow testing property name where types do not match */
- public Object getOtherAttribute(String name)
- {
- return null;
- }
-
- public void setOtherAttribute(Object someObject, Object foo)
- {
- /* do nothing */
- }
-
-
- /* test whether get only is found */
- public Object getSecondaryAttribute(Object name)
- {
- return attributes.get(name);
- }
+public class BaseObjectIndexed extends Object {
+ private Map attributes = new HashMap();
+
+ public BaseObjectIndexed() {
+ super();
+ }
+
+ public Map getAttributes() {
+ return attributes;
+ }
+
+ public Object getAttribute(String name) {
+ return attributes.get(name);
+ }
+
+ public void setAttribute(String name, Object value) {
+ attributes.put(name, value);
+ }
+
+ /* allow testing property name where types do not match */
+ public Object getOtherAttribute(String name) {
+ return null;
+ }
+
+ public void setOtherAttribute(Object someObject, Object foo) {
+ /* do nothing */
+ }
+
+
+ /* test whether get only is found */
+ public Object getSecondaryAttribute(Object name) {
+ return attributes.get(name);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean1.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean1.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean1.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean1.java Thu Jan 22 22:32:36 2009
@@ -30,12 +30,10 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class Bean1 extends Object
-{
- private Bean2 bean2 = new Bean2();
+public class Bean1 extends Object {
+ private Bean2 bean2 = new Bean2();
- public Bean2 getBean2()
- {
- return bean2;
- }
+ public Bean2 getBean2() {
+ return bean2;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean2.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean2.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean2.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean2.java Thu Jan 22 22:32:36 2009
@@ -30,12 +30,10 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class Bean2 extends Object
-{
- private Bean3 bean3 = new Bean3();
+public class Bean2 extends Object {
+ private Bean3 bean3 = new Bean3();
- public Bean3 getBean3()
- {
- return bean3;
- }
+ public Bean3 getBean3() {
+ return bean3;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean3.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean3.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean3.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Bean3.java Thu Jan 22 22:32:36 2009
@@ -30,40 +30,35 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
-public class Bean3 extends Object
-{
- private int value = 100;
- private Map map;
-
- {
- map = new HashMap();
- map.put("foo", "bar");
- map.put("bar", "baz");
- }
-
- public int getValue()
- {
- return value;
- }
-
- public void setValue(int value)
- {
- this.value = value;
- }
-
- public Object getIndexedValue(int index)
- {
- return null;
- }
-
- public void setIndexedValue(int index, Object value)
- {
- }
-
- public Map getMap()
- {
- return map;
- }
+public class Bean3 extends Object {
+ private int value = 100;
+ private Map map;
+
+ {
+ map = new HashMap();
+ map.put("foo", "bar");
+ map.put("bar", "baz");
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public Object getIndexedValue(int index) {
+ return null;
+ }
+
+ public void setIndexedValue(int index, Object value) {
+ }
+
+ public Map getMap() {
+ return map;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Component.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Component.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Component.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Component.java Thu Jan 22 22:32:36 2009
@@ -30,56 +30,45 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class Component extends Object
-{
- private URLStorage toDisplay = new URLStorage();
- private Page page = new Page();
-
- public static class URLStorage extends Object
- {
- private String pictureUrl = "http://www.picturespace.com/pictures/100";
-
- public String getPictureUrl()
- {
- return pictureUrl;
- }
-
- public void setPictureUrl(String value)
- {
- pictureUrl = value;
- }
- }
+public class Component extends Object {
+ private URLStorage toDisplay = new URLStorage();
+ private Page page = new Page();
- public static class Page extends Object
- {
- public Object createRelativeAsset(String value)
- {
- return "/toplevel/" + value;
- }
- }
+ public static class URLStorage extends Object {
+ private String pictureUrl = "http://www.picturespace.com/pictures/100";
- public Component()
- {
- super();
+ public String getPictureUrl() {
+ return pictureUrl;
}
- public Page getPage()
- {
- return page;
+ public void setPictureUrl(String value) {
+ pictureUrl = value;
}
+ }
- public void setPage(Page value)
- {
- page = value;
+ public static class Page extends Object {
+ public Object createRelativeAsset(String value) {
+ return "/toplevel/" + value;
}
+ }
- public URLStorage getToDisplay()
- {
- return toDisplay;
- }
+ public Component() {
+ super();
+ }
- public void setToDisplay(URLStorage value)
- {
- toDisplay = value;
- }
+ public Page getPage() {
+ return page;
+ }
+
+ public void setPage(Page value) {
+ page = value;
+ }
+
+ public URLStorage getToDisplay() {
+ return toDisplay;
+ }
+
+ public void setToDisplay(URLStorage value) {
+ toDisplay = value;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/CorrectedObject.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/CorrectedObject.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/CorrectedObject.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/CorrectedObject.java Thu Jan 22 22:32:36 2009
@@ -30,28 +30,22 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class CorrectedObject extends Object
-{
- public CorrectedObject()
- {
- super();
- }
+public class CorrectedObject extends Object {
+ public CorrectedObject() {
+ super();
+ }
- public void setStringValue(String value)
- {
- }
+ public void setStringValue(String value) {
+ }
- public String getStringValue()
- {
- return null;
- }
+ public String getStringValue() {
+ return null;
+ }
- public String getIndexedStringValue(String key)
- {
- return null;
- }
+ public String getIndexedStringValue(String key) {
+ return null;
+ }
- public void setIndexedStringValue(String key, String value)
- {
- }
+ public void setIndexedStringValue(String key, String value) {
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Indexed.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Indexed.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Indexed.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Indexed.java Thu Jan 22 22:32:36 2009
@@ -30,47 +30,40 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class Indexed extends Object
-{
- private String[] values = new String[] { "foo", "bar", "baz" };
-
- public Indexed()
- {
- super();
- }
-
- public Indexed(String[] values)
- {
- super();
- this.values = values;
- }
-
- /* Indexed property "values" */
- public String[] getValues()
- {
- return values;
- }
-
- public void setValues(String[] value)
- {
- values = value;
- }
-
- /**
- This method returns the string from the array and appends "xxx" to
- distinguish the "get" method from the direct array access.
- */
- public String getValues(int index)
- {
- return values[index] + "xxx";
- }
+public class Indexed extends Object {
+ private String[] values = new String[]{"foo", "bar", "baz"};
- public void setValues(int index, String value)
- {
- if (value.endsWith("xxx")) {
- values[index] = value.substring(0, value.length() - 3);
- } else {
- values[index] = value;
- }
+ public Indexed() {
+ super();
+ }
+
+ public Indexed(String[] values) {
+ super();
+ this.values = values;
+ }
+
+ /* Indexed property "values" */
+ public String[] getValues() {
+ return values;
+ }
+
+ public void setValues(String[] value) {
+ values = value;
+ }
+
+ /**
+ * This method returns the string from the array and appends "xxx" to
+ * distinguish the "get" method from the direct array access.
+ */
+ public String getValues(int index) {
+ return values[index] + "xxx";
+ }
+
+ public void setValues(int index, String value) {
+ if (value.endsWith("xxx")) {
+ values[index] = value.substring(0, value.length() - 3);
+ } else {
+ values[index] = value;
}
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMap.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMap.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMap.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMap.java Thu Jan 22 22:32:36 2009
@@ -30,13 +30,12 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
+import java.util.Map;
/**
- This tests the interface inheritence test. This is a subinterface
- of Map and therefore should inherit the Map property accessor.
+ * This tests the interface inheritence test. This is a subinterface
+ * of Map and therefore should inherit the Map property accessor.
*/
-public interface MyMap extends Map
-{
- public String getDescription();
+public interface MyMap extends Map {
+ public String getDescription();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMapImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMapImpl.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMapImpl.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/MyMapImpl.java Thu Jan 22 22:32:36 2009
@@ -30,89 +30,76 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
/**
- This tests the interface inheritence test. This test implements
- MyMap->Map but extends Object, therefore should be coded using
- MapPropertyAccessor instead of ObjectPropertyAccessor.
+ * This tests the interface inheritence test. This test implements
+ * MyMap->Map but extends Object, therefore should be coded using
+ * MapPropertyAccessor instead of ObjectPropertyAccessor.
*/
-public class MyMapImpl extends Object implements MyMap
-{
- private Map map = new HashMap();
-
- public void clear()
- {
- map.clear();
- }
-
- public boolean containsKey(Object key)
- {
- return map.containsKey(key);
- }
-
- public boolean containsValue(Object value)
- {
- return map.containsValue(value);
- }
-
- public Set entrySet()
- {
- return map.entrySet();
- }
-
- public boolean equals(Object o)
- {
- return map.equals(o);
- }
-
- public Object get(Object key)
- {
- return map.get(key);
- }
-
- public int hashCode()
- {
- return map.hashCode();
- }
-
- public boolean isEmpty()
- {
- return map.isEmpty();
- }
-
- public Set keySet()
- {
- return map.keySet();
- }
-
- public Object put(Object key, Object value)
- {
- return map.put(key, value);
- }
-
- public void putAll(Map t)
- {
- map.putAll(t);
- }
-
- public Object remove(Object key)
- {
- return map.remove(key);
- }
-
- public int size()
- {
- return map.size();
- }
-
- public Collection values()
- {
- return map.values();
- }
-
- public String getDescription()
- {
- return "MyMap implementation";
- }
+public class MyMapImpl extends Object implements MyMap {
+ private Map map = new HashMap();
+
+ public void clear() {
+ map.clear();
+ }
+
+ public boolean containsKey(Object key) {
+ return map.containsKey(key);
+ }
+
+ public boolean containsValue(Object value) {
+ return map.containsValue(value);
+ }
+
+ public Set entrySet() {
+ return map.entrySet();
+ }
+
+ public boolean equals(Object o) {
+ return map.equals(o);
+ }
+
+ public Object get(Object key) {
+ return map.get(key);
+ }
+
+ public int hashCode() {
+ return map.hashCode();
+ }
+
+ public boolean isEmpty() {
+ return map.isEmpty();
+ }
+
+ public Set keySet() {
+ return map.keySet();
+ }
+
+ public Object put(Object key, Object value) {
+ return map.put(key, value);
+ }
+
+ public void putAll(Map t) {
+ map.putAll(t);
+ }
+
+ public Object remove(Object key) {
+ return map.remove(key);
+ }
+
+ public int size() {
+ return map.size();
+ }
+
+ public Collection values() {
+ return map.values();
+ }
+
+ public String getDescription() {
+ return "MyMap implementation";
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/ObjectIndexed.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/ObjectIndexed.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/ObjectIndexed.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/ObjectIndexed.java Thu Jan 22 22:32:36 2009
@@ -30,13 +30,11 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class ObjectIndexed extends BaseObjectIndexed
-{
- public ObjectIndexed()
- {
- super();
- setAttribute("foo", "bar");
- setAttribute("bar", "baz");
- setAttribute("other", new OtherObjectIndexed());
- }
+public class ObjectIndexed extends BaseObjectIndexed {
+ public ObjectIndexed() {
+ super();
+ setAttribute("foo", "bar");
+ setAttribute("bar", "baz");
+ setAttribute("other", new OtherObjectIndexed());
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/OtherObjectIndexed.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/OtherObjectIndexed.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/OtherObjectIndexed.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/OtherObjectIndexed.java Thu Jan 22 22:32:36 2009
@@ -30,12 +30,10 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-public class OtherObjectIndexed extends BaseObjectIndexed
-{
- public OtherObjectIndexed()
- {
- super();
- setAttribute("foo", "bar");
- setAttribute("bar", "baz");
- }
+public class OtherObjectIndexed extends BaseObjectIndexed {
+ public OtherObjectIndexed() {
+ super();
+ setAttribute("foo", "bar");
+ setAttribute("bar", "baz");
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Root.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Root.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Root.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Root.java Thu Jan 22 22:32:36 2009
@@ -30,167 +30,144 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.util.*;
import org.apache.ibatis.ognl.DynamicSubscript;
-public class Root extends Object
-{
- public static final String SIZE_STRING = "size";
- public static final int STATIC_INT = 23;
-
- private int[] array = { 1, 2, 3, 4 };
- private Map map = new HashMap(23);
- private MyMap myMap = new MyMapImpl();
- private List list = Arrays.asList(new Object[] { null, this, array });
- private List settableList = new ArrayList(Arrays.asList(new Object[] { "foo", "bar", "baz" }));
- private int index = 1;
- private int intValue = 0;
- private String stringValue;
- private int yetAnotherIntValue = 46;
- private boolean privateAccessorBooleanValue = true;
- private int privateAccessorIntValue = 67;
- private int privateAccessorIntValue2 = 67;
- private int privateAccessorIntValue3 = 67;
- public String anotherStringValue = "foo";
- public int anotherIntValue = 123;
- public int six = 6;
-
- /*===================================================================
- Public static methods
- ===================================================================*/
- public static int getStaticInt()
- {
- return STATIC_INT;
- }
-
- /*===================================================================
- Constructors
- ===================================================================*/
- public Root()
- {
- super();
- }
-
- /*===================================================================
- Private methods
- ===================================================================*/
- {
- map.put( "test", this );
- map.put( "array", array );
- map.put( "list", list );
- map.put( "size", new Integer(5000) );
- map.put( DynamicSubscript.first, new Integer(99) );
-
- /* make myMap identical */
- myMap.putAll( map );
- }
-
- private boolean isPrivateAccessorBooleanValue()
- {
- return privateAccessorBooleanValue;
- }
-
- private void setPrivateAccessorBooleanValue(boolean value)
- {
- privateAccessorBooleanValue = value;
- }
-
- private int getPrivateAccessorIntValue()
- {
- return privateAccessorIntValue;
- }
-
- private void setPrivateAccessorIntValue(int value)
- {
- privateAccessorIntValue = value;
- }
-
- /*===================================================================
- Protected methods
- ===================================================================*/
- protected int getPrivateAccessorIntValue2()
- {
- return privateAccessorIntValue2;
- }
-
- protected void setPrivateAccessorIntValue2(int value)
- {
- privateAccessorIntValue2 = value;
- }
-
- /*===================================================================
- Package protected methods
- ===================================================================*/
- int getPrivateAccessorIntValue3()
- {
- return privateAccessorIntValue3;
- }
-
- void setPrivateAccessorIntValue3(int value)
- {
- privateAccessorIntValue3 = value;
- }
-
- /*===================================================================
- Public methods
- ===================================================================*/
- public int[] getArray()
- {
- return array;
- }
-
- public void setArray(int[] value)
- {
- array = value;
- }
-
- public Map getMap()
- {
- return map;
- }
-
- public MyMap getMyMap()
- {
- return myMap;
- }
-
- public List getList()
- {
- return list;
- }
-
- public List getSettableList()
- {
- return settableList;
- }
-
- public int getIndex()
- {
- return index;
- }
-
- public int getIntValue()
- {
- return intValue;
- }
-
- public void setIntValue(int value)
- {
- intValue = value;
- }
-
- public String getStringValue()
- {
- return stringValue;
- }
-
- public void setStringValue(String value)
- {
- stringValue = value;
- }
-
- public Object getNullObject()
- {
- return null;
- }
+import java.util.*;
+
+public class Root extends Object {
+ public static final String SIZE_STRING = "size";
+ public static final int STATIC_INT = 23;
+
+ private int[] array = {1, 2, 3, 4};
+ private Map map = new HashMap(23);
+ private MyMap myMap = new MyMapImpl();
+ private List list = Arrays.asList(new Object[]{null, this, array});
+ private List settableList = new ArrayList(Arrays.asList(new Object[]{"foo", "bar", "baz"}));
+ private int index = 1;
+ private int intValue = 0;
+ private String stringValue;
+ private int yetAnotherIntValue = 46;
+ private boolean privateAccessorBooleanValue = true;
+ private int privateAccessorIntValue = 67;
+ private int privateAccessorIntValue2 = 67;
+ private int privateAccessorIntValue3 = 67;
+ public String anotherStringValue = "foo";
+ public int anotherIntValue = 123;
+ public int six = 6;
+
+ /*===================================================================
+ Public static methods
+ ===================================================================*/
+ public static int getStaticInt() {
+ return STATIC_INT;
+ }
+
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public Root() {
+ super();
+ }
+
+ /*===================================================================
+ Private methods
+ ===================================================================*/ {
+ map.put("test", this);
+ map.put("array", array);
+ map.put("list", list);
+ map.put("size", new Integer(5000));
+ map.put(DynamicSubscript.first, new Integer(99));
+
+ /* make myMap identical */
+ myMap.putAll(map);
+ }
+
+ private boolean isPrivateAccessorBooleanValue() {
+ return privateAccessorBooleanValue;
+ }
+
+ private void setPrivateAccessorBooleanValue(boolean value) {
+ privateAccessorBooleanValue = value;
+ }
+
+ private int getPrivateAccessorIntValue() {
+ return privateAccessorIntValue;
+ }
+
+ private void setPrivateAccessorIntValue(int value) {
+ privateAccessorIntValue = value;
+ }
+
+ /*===================================================================
+ Protected methods
+ ===================================================================*/
+ protected int getPrivateAccessorIntValue2() {
+ return privateAccessorIntValue2;
+ }
+
+ protected void setPrivateAccessorIntValue2(int value) {
+ privateAccessorIntValue2 = value;
+ }
+
+ /*===================================================================
+ Package protected methods
+ ===================================================================*/
+ int getPrivateAccessorIntValue3() {
+ return privateAccessorIntValue3;
+ }
+
+ void setPrivateAccessorIntValue3(int value) {
+ privateAccessorIntValue3 = value;
+ }
+
+ /*===================================================================
+ Public methods
+ ===================================================================*/
+ public int[] getArray() {
+ return array;
+ }
+
+ public void setArray(int[] value) {
+ array = value;
+ }
+
+ public Map getMap() {
+ return map;
+ }
+
+ public MyMap getMyMap() {
+ return myMap;
+ }
+
+ public List getList() {
+ return list;
+ }
+
+ public List getSettableList() {
+ return settableList;
+ }
+
+ public int getIndex() {
+ return index;
+ }
+
+ public int getIntValue() {
+ return intValue;
+ }
+
+ public void setIntValue(int value) {
+ intValue = value;
+ }
+
+ public String getStringValue() {
+ return stringValue;
+ }
+
+ public void setStringValue(String value) {
+ stringValue = value;
+ }
+
+ public Object getNullObject() {
+ return null;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Simple.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Simple.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Simple.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/objects/Simple.java Thu Jan 22 22:32:36 2009
@@ -30,112 +30,96 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.objects;
-import java.math.*;
import org.apache.ibatis.ognl.OgnlTestCase;
-public class Simple extends Object
-{
- private String stringValue;
- private float floatValue;
- private int intValue;
- private boolean booleanValue;
- private BigInteger bigIntValue = BigInteger.valueOf(0);
- private BigDecimal bigDecValue = new BigDecimal(0.0);
-
- public Simple()
- {
- super();
- }
-
- public Simple(Object[] values)
- {
- super();
- }
-
- public Simple(String stringValue, float floatValue, int intValue)
- {
- super();
- this.stringValue = stringValue;
- this.floatValue = floatValue;
- this.intValue = intValue;
- }
-
- public void setValues(String stringValue, float floatValue, int intValue)
- {
- this.stringValue = stringValue;
- this.floatValue = floatValue;
- this.intValue = intValue;
- }
+import java.math.BigDecimal;
+import java.math.BigInteger;
- public String getStringValue()
- {
- return stringValue;
- }
+public class Simple extends Object {
+ private String stringValue;
+ private float floatValue;
+ private int intValue;
+ private boolean booleanValue;
+ private BigInteger bigIntValue = BigInteger.valueOf(0);
+ private BigDecimal bigDecValue = new BigDecimal(0.0);
+
+ public Simple() {
+ super();
+ }
+
+ public Simple(Object[] values) {
+ super();
+ }
+
+ public Simple(String stringValue, float floatValue, int intValue) {
+ super();
+ this.stringValue = stringValue;
+ this.floatValue = floatValue;
+ this.intValue = intValue;
+ }
+
+ public void setValues(String stringValue, float floatValue, int intValue) {
+ this.stringValue = stringValue;
+ this.floatValue = floatValue;
+ this.intValue = intValue;
+ }
+
+ public String getStringValue() {
+ return stringValue;
+ }
+
+ public void setStringValue(String value) {
+ stringValue = value;
+ }
+
+ public float getFloatValue() {
+ return floatValue;
+ }
+
+ public void setFloatValue(float value) {
+ floatValue = value;
+ }
+
+ public int getIntValue() {
+ return intValue;
+ }
+
+ public void setIntValue(int value) {
+ intValue = value;
+ }
+
+ public boolean getBooleanValue() {
+ return booleanValue;
+ }
+
+ public void setBooleanValue(boolean value) {
+ booleanValue = value;
+ }
+
+ public BigInteger getBigIntValue() {
+ return bigIntValue;
+ }
+
+ public void setBigIntValue(BigInteger value) {
+ bigIntValue = value;
+ }
+
+ public BigDecimal getBigDecValue() {
+ return bigDecValue;
+ }
+
+ public void setBigDecValue(BigDecimal value) {
+ bigDecValue = value;
+ }
+
+ public boolean equals(Object other) {
+ boolean result = false;
- public void setStringValue(String value)
- {
- stringValue = value;
- }
-
- public float getFloatValue()
- {
- return floatValue;
- }
-
- public void setFloatValue(float value)
- {
- floatValue = value;
- }
-
- public int getIntValue()
- {
- return intValue;
- }
-
- public void setIntValue(int value)
- {
- intValue = value;
- }
-
- public boolean getBooleanValue()
- {
- return booleanValue;
- }
-
- public void setBooleanValue(boolean value)
- {
- booleanValue = value;
- }
-
- public BigInteger getBigIntValue()
- {
- return bigIntValue;
- }
-
- public void setBigIntValue(BigInteger value)
- {
- bigIntValue = value;
- }
-
- public BigDecimal getBigDecValue()
- {
- return bigDecValue;
- }
-
- public void setBigDecValue(BigDecimal value)
- {
- bigDecValue = value;
- }
+ if (other instanceof Simple) {
+ Simple os = (Simple) other;
- public boolean equals(Object other)
- {
- boolean result = false;
-
- if (other instanceof Simple) {
- Simple os = (Simple)other;
-
- result = OgnlTestCase.isEqual(os.getStringValue(), getStringValue()) && (os.getIntValue() == getIntValue());
- }
- return result;
+ result = OgnlTestCase.isEqual(os.getStringValue(), getStringValue()) && (os.getIntValue() == getIntValue());
}
+ return result;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/ContextClassLoader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/ContextClassLoader.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/ContextClassLoader.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/ContextClassLoader.java Thu Jan 22 22:32:36 2009
@@ -32,28 +32,25 @@
import org.apache.ibatis.ognl.OgnlContext;
-public class ContextClassLoader extends ClassLoader
-{
- private OgnlContext context;
+public class ContextClassLoader extends ClassLoader {
+ private OgnlContext context;
- /*===================================================================
- Constructors
- ===================================================================*/
- public ContextClassLoader(ClassLoader parentClassLoader, OgnlContext context)
- {
- super(parentClassLoader);
- this.context = context;
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public ContextClassLoader(ClassLoader parentClassLoader, OgnlContext context) {
+ super(parentClassLoader);
+ this.context = context;
+ }
- /*===================================================================
- Overridden methods
- ===================================================================*/
- protected Class findClass(String name) throws ClassNotFoundException
- {
- if ((context != null) && (context.getClassResolver() != null)) {
- return context.getClassResolver().classForName(name, context);
- }
- return super.findClass(name);
+ /*===================================================================
+ Overridden methods
+ ===================================================================*/
+ protected Class findClass(String name) throws ClassNotFoundException {
+ if ((context != null) && (context.getClassResolver() != null)) {
+ return context.getClassResolver().classForName(name, context);
}
+ return super.findClass(name);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/EnhancedClassLoader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/EnhancedClassLoader.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/EnhancedClassLoader.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/EnhancedClassLoader.java Thu Jan 22 22:32:36 2009
@@ -30,21 +30,18 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.util;
-public class EnhancedClassLoader extends ClassLoader
-{
- /*===================================================================
- Constructors
- ===================================================================*/
- public EnhancedClassLoader(ClassLoader parentClassLoader)
- {
- super(parentClassLoader);
- }
+public class EnhancedClassLoader extends ClassLoader {
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public EnhancedClassLoader(ClassLoader parentClassLoader) {
+ super(parentClassLoader);
+ }
- /*===================================================================
- Overridden methods
- ===================================================================*/
- public Class defineClass(String enhancedClassName, byte[] byteCode)
- {
- return defineClass(enhancedClassName, byteCode, 0, byteCode.length);
- }
+ /*===================================================================
+ Overridden methods
+ ===================================================================*/
+ public Class defineClass(String enhancedClassName, byte[] byteCode) {
+ return defineClass(enhancedClassName, byteCode, 0, byteCode.length);
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/NameFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/NameFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/NameFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/ognl/util/NameFactory.java Thu Jan 22 22:32:36 2009
@@ -30,33 +30,29 @@
//--------------------------------------------------------------------------
package org.apache.ibatis.ognl.util;
-public class NameFactory extends Object
-{
- private String classBaseName;
- private int classNameCounter = 0;
- private String variableBaseName;
- private int variableNameCounter = 0;
+public class NameFactory extends Object {
+ private String classBaseName;
+ private int classNameCounter = 0;
+ private String variableBaseName;
+ private int variableNameCounter = 0;
- /*===================================================================
- Constructors
- ===================================================================*/
- public NameFactory(String classBaseName, String variableBaseName)
- {
- super();
- this.classBaseName = classBaseName;
- this.variableBaseName = variableBaseName;
- }
+ /*===================================================================
+ Constructors
+ ===================================================================*/
+ public NameFactory(String classBaseName, String variableBaseName) {
+ super();
+ this.classBaseName = classBaseName;
+ this.variableBaseName = variableBaseName;
+ }
- /*===================================================================
- Public methods
- ===================================================================*/
- public String getNewClassName()
- {
- return classBaseName + classNameCounter++;
- }
+ /*===================================================================
+ Public methods
+ ===================================================================*/
+ public String getNewClassName() {
+ return classBaseName + classNameCounter++;
+ }
- public String getNewVariableName()
- {
- return variableBaseName + variableNameCounter++;
- }
+ public String getNewVariableName() {
+ return variableBaseName + variableNameCounter++;
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/AuthorMapper.xml Thu Jan 22 22:32:36 2009
@@ -8,26 +8,26 @@
<parameterMap id="selectAuthor"
type="domain.blog.Author">
- <parameter property="id" />
+ <parameter property="id"/>
</parameterMap>
<resultMap id="selectAuthor" type="domain.blog.Author">
- <id column="id" property="id" />
- <result property="username" column="username" />
- <result property="password" column="password" />
- <result property="email" column="email" />
- <result property="bio" column="bio" />
- <result property="favouriteSection" column="favourite_section" />
+ <id column="id" property="id"/>
+ <result property="username" column="username"/>
+ <result property="password" column="password"/>
+ <result property="email" column="email"/>
+ <result property="bio" column="bio"/>
+ <result property="favouriteSection" column="favourite_section"/>
</resultMap>
<resultMap id="selectImmutableAuthor" type="domain.blog.ImmutableAuthor">
<constructor>
- <id column="id" property="id" />
- <result property="username" column="username" />
- <result property="password" column="password" />
- <result property="email" column="email" />
- <result property="bio" column="bio" />
- <result property="favouriteSection" column="favourite_section" />
+ <id column="id" property="id"/>
+ <result property="username" column="username"/>
+ <result property="password" column="password"/>
+ <result property="email" column="email"/>
+ <result property="bio" column="bio"/>
+ <result property="favouriteSection" column="favourite_section"/>
</constructor>
</resultMap>