Re-factor to make upcoming changes easier to understand

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@959233 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/org/apache/el/TestMethodExpressionImpl.java b/test/org/apache/el/TestMethodExpressionImpl.java
index 0bbedf2..c7c4682 100644 (file)
--- a/test/org/apache/el/TestMethodExpressionImpl.java
+++ b/test/org/apache/el/TestMethodExpressionImpl.java
@@ -88,10 +88,10 @@ public class TestMethodExpressionImpl extends TestCase {
             factory.createValueExpression(beanA, TesterBeanA.class);
         context.getVariableMapper().setVariable("beanA", varA);
         
-        TesterBeanC beanC = new TesterBeanC();        
+        TesterBeanBB beanC = new TesterBeanBB();        
         beanC.setName("Tomcat");
         ValueExpression varC =
-            factory.createValueExpression(beanC, TesterBeanC.class);
+            factory.createValueExpression(beanC, TesterBeanBB.class);
         context.getVariableMapper().setVariable("beanC", varC);
         
         MethodExpression me1 = factory.createMethodExpression(context,

diff --git a/test/org/apache/el/TesterBeanBB.java b/test/org/apache/el/TesterBeanBB.java
new file mode 100644 (file)
index 0000000..1681b98
--- /dev/null
+++ b/test/org/apache/el/TesterBeanBB.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.el;
+
+public class TesterBeanBB extends TesterBeanB {
+
+    private String extra;
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+}

diff --git a/test/org/apache/el/TesterBeanC.java b/test/org/apache/el/TesterBeanC.java
deleted file mode 100644 (file)
index 061f478..0000000
--- a/test/org/apache/el/TesterBeanC.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.el;
-
-public class TesterBeanC extends TesterBeanB {
-
-    private String extra;
-
-    public String getExtra() {
-        return extra;
-    }
-
-    public void setExtra(String extra) {
-        this.extra = extra;
-    }
-}