Author: markt Date: Mon Mar 16 11:27:03 2015 New Revision: 1666964 URL: http://svn.apache.org/r1666964 Log: Follow up to r1664875. Don't depend on class in option WebSocket module for unit tests.
Added: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java - copied, changed from r1666099, tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Copied: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java (from r1666099, tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java) URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java&p1=tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java&r1=1666099&r2=1666964&rev=1666964&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/CaseInsensitiveKeyMap.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/CaseInsensitiveKeyMap.java Mon Mar 16 11:27:03 2015 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomcat.websocket; +package org.apache.catalina.startup; import java.util.AbstractMap; import java.util.AbstractSet; @@ -24,8 +24,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.apache.tomcat.util.res.StringManager; - /** * A Map implementation that uses case-insensitive (using {@link * Locale#ENGLISH}) strings as keys. @@ -39,9 +37,6 @@ import org.apache.tomcat.util.res.String */ public class CaseInsensitiveKeyMap<V> extends AbstractMap<String,V> { - private static final StringManager sm = - StringManager.getManager(Constants.PACKAGE_NAME); - private final Map<Key,V> map = new HashMap<Key,V>(); @@ -55,7 +50,7 @@ public class CaseInsensitiveKeyMap<V> ex public V put(String key, V value) { Key caseInsensitiveKey = Key.getInstance(key); if (caseInsensitiveKey == null) { - throw new NullPointerException(sm.getString("caseInsensitiveKeyMap.nullKey")); + throw new NullPointerException("Null key not permitted"); } return map.put(caseInsensitiveKey, value); } Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1666964&r1=1666963&r2=1666964&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original) +++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Mon Mar 16 11:27:03 2015 @@ -56,7 +56,6 @@ import org.apache.catalina.session.Manag import org.apache.catalina.session.StandardManager; import org.apache.catalina.valves.AccessLogValve; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.websocket.CaseInsensitiveKeyMap; /** * Base test case that provides a Tomcat instance for each test - mainly so we --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org