This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 46940e02675c631a48caa20554b84b59ffd1bbde Author: Mark Thomas <ma...@apache.org> AuthorDate: Tue Jul 2 21:05:30 2019 +0100 Code clean-up --- test/javax/el/TestArrayELResolver.java | 2 +- test/javax/el/TestBeanELResolver.java | 2 +- test/javax/el/TestBeanNameELResolver.java | 2 +- test/javax/el/TestImportHandler.java | 4 ++-- test/javax/el/TestListELResolver.java | 2 +- test/javax/el/TestMapELResolver.java | 2 +- test/javax/el/TestResourceBundleELResolver.java | 2 +- test/javax/el/TestStaticFieldELResolver.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/javax/el/TestArrayELResolver.java b/test/javax/el/TestArrayELResolver.java index ccad23e..cea9b97 100644 --- a/test/javax/el/TestArrayELResolver.java +++ b/test/javax/el/TestArrayELResolver.java @@ -385,7 +385,7 @@ public class TestArrayELResolver { Assert.assertFalse(context.isPropertyResolved()); } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE } diff --git a/test/javax/el/TestBeanELResolver.java b/test/javax/el/TestBeanELResolver.java index 6368ad5..7bd9bce 100644 --- a/test/javax/el/TestBeanELResolver.java +++ b/test/javax/el/TestBeanELResolver.java @@ -981,7 +981,7 @@ public class TestBeanELResolver { Assert.assertFalse(context.isPropertyResolved()); } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE, INVOKE } diff --git a/test/javax/el/TestBeanNameELResolver.java b/test/javax/el/TestBeanNameELResolver.java index a7c90c6..f5ea30f 100644 --- a/test/javax/el/TestBeanNameELResolver.java +++ b/test/javax/el/TestBeanNameELResolver.java @@ -606,7 +606,7 @@ public class TestBeanNameELResolver { } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE, diff --git a/test/javax/el/TestImportHandler.java b/test/javax/el/TestImportHandler.java index 0ddf708..537d80d 100644 --- a/test/javax/el/TestImportHandler.java +++ b/test/javax/el/TestImportHandler.java @@ -203,11 +203,11 @@ public class TestImportHandler { public void testImportStatic01() { ImportHandler handler = new ImportHandler(); - handler.importStatic("org.apache.tomcat.util.buf.Constants.Package"); + handler.importStatic("org.apache.tomcat.util.scan.Constants.Package"); Class<?> result = handler.resolveStatic("Package"); - Assert.assertEquals(org.apache.tomcat.util.buf.Constants.class, result); + Assert.assertEquals(org.apache.tomcat.util.scan.Constants.class, result); } diff --git a/test/javax/el/TestListELResolver.java b/test/javax/el/TestListELResolver.java index cb9d574..60aea8c 100644 --- a/test/javax/el/TestListELResolver.java +++ b/test/javax/el/TestListELResolver.java @@ -381,7 +381,7 @@ public class TestListELResolver { Assert.assertFalse(context.isPropertyResolved()); } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE } diff --git a/test/javax/el/TestMapELResolver.java b/test/javax/el/TestMapELResolver.java index fa8bb63..1a87b7f 100644 --- a/test/javax/el/TestMapELResolver.java +++ b/test/javax/el/TestMapELResolver.java @@ -312,7 +312,7 @@ public class TestMapELResolver { Assert.assertFalse(context.isPropertyResolved()); } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE } } diff --git a/test/javax/el/TestResourceBundleELResolver.java b/test/javax/el/TestResourceBundleELResolver.java index 3f9ebc7..5acf029 100644 --- a/test/javax/el/TestResourceBundleELResolver.java +++ b/test/javax/el/TestResourceBundleELResolver.java @@ -321,7 +321,7 @@ public class TestResourceBundleELResolver { Assert.assertFalse(context.isPropertyResolved()); } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE } } diff --git a/test/javax/el/TestStaticFieldELResolver.java b/test/javax/el/TestStaticFieldELResolver.java index 7efa86d..3655865 100644 --- a/test/javax/el/TestStaticFieldELResolver.java +++ b/test/javax/el/TestStaticFieldELResolver.java @@ -483,7 +483,7 @@ public class TestStaticFieldELResolver { } } - private static enum MethodUnderTest { + private enum MethodUnderTest { GET_VALUE, SET_VALUE, GET_TYPE, INVOKE } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org