Author: violetagg
Date: Wed Sep 3 07:19:00 2014
New Revision: 1622173
URL: http://svn.apache.org/r1622173
Log:
Merged revision 1621929 from tomcat/trunk:
Fix unit test for BZ 56903
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/checkstyle/checkstyle.xml
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1621929
Modified: tomcat/tc7.0.x/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/checkstyle.xml?rev=1622173&r1=1622172&r2=1622173&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/checkstyle.xml Wed Sep 3 07:19:00 2014
@@ -57,7 +57,7 @@
<property name="illegalPkgs" value="sun,junit.framework"/>
</module>
<module name="ImportOrder">
- <property name="groups"
value="java,javax,async,jsp2,junit,org.junit,org,util"/>
+ <property name="groups"
value="java,javax,org.hamcrest,org.junit,org,async,jsp2,util"/>
<property name="ordered" value="true"/>
<property name="separated" value="true"/>
<property name="option" value="above"/>
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java?rev=1622173&r1=1622172&r2=1622173&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TestStandardContext.java
Wed Sep 3 07:19:00 2014
@@ -20,6 +20,7 @@ package org.apache.catalina.core;
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Arrays;
import java.util.Set;
import javax.servlet.Filter;
@@ -41,6 +42,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.hamcrest.CoreMatchers;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
@@ -865,8 +868,8 @@ public class TestStandardContext extends
public void testBug56903() {
Context context = new StandardContext();
- String list = "a,b,c";
- context.setResourceOnlyServlets(list);
- Assert.assertEquals(list, context.getResourceOnlyServlets());
+ context.setResourceOnlyServlets("a,b,c");
+
Assert.assertThat(Arrays.asList(context.getResourceOnlyServlets().split(",")),
+ CoreMatchers.hasItems("a", "b", "c"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
