Author: markt
Date: Wed May 2 15:30:19 2018
New Revision: 1830772
URL: http://svn.apache.org/viewvc?rev=1830772&view=rev
Log:
Fix failing tests now mappedName in @Resource does not set the value for
env-entry resources.
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java?rev=1830772&r1=1830771&r2=1830772&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestContextConfig.java Wed
May 2 15:30:19 2018
@@ -138,7 +138,7 @@ public class TestContextConfig extends T
tomcat.start();
assertPageContains("/test/testServlet",
- "envEntry1: 1 envEntry2: 2 envEntry3: 33 envEntry4: 4
envEntry5: 55 envEntry6: 66");
+ "envEntry1: 0 envEntry2: 2 envEntry3: 33 envEntry4: 0
envEntry5: 55 envEntry6: 66");
}
@Test
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java?rev=1830772&r1=1830771&r2=1830772&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/startup/TesterServletWithAnnotations.java
Wed May 2 15:30:19 2018
@@ -29,7 +29,7 @@ public class TesterServletWithAnnotation
private static final long serialVersionUID = 1L;
- @Resource(mappedName = "1")
+ @Resource
private int envEntry1;
private int envEntry2;
@@ -38,7 +38,7 @@ public class TesterServletWithAnnotation
private int envEntry4;
- @Resource(name = "envEntry5", mappedName = "5")
+ @Resource(name = "envEntry5")
private int envEntry5;
private int envEntry6;
@@ -59,17 +59,17 @@ public class TesterServletWithAnnotation
this.envEntry2 = envEntry2;
}
- @Resource(mappedName = "3")
+ @Resource
public void setEnvEntry3(int envEntry3) {
this.envEntry3 = envEntry3;
}
- @Resource(mappedName = "4")
+ @Resource
public void setEnvEntry4(int envEntry4) {
this.envEntry4 = envEntry4;
}
- @Resource(name = "envEntry6", mappedName = "6")
+ @Resource(name = "envEntry6")
public void setEnvEntry6(int envEntry6) {
this.envEntry6 = envEntry6;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
