Author: markt
Date: Thu Feb 7 11:16:27 2013
New Revision: 1443414
URL: http://svn.apache.org/viewvc?rev=1443414&view=rev
Log:
Whoops.
Fix porting to Tomcat 7 issues in unit test
Added:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
- copied, changed from r1441881,
tomcat/trunk/test/org/apache/catalina/core/TesterContext.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java?rev=1443414&r1=1443413&r2=1443414&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/catalina/authenticator/TestDigestAuthenticator.java
Thu Feb 7 11:16:27 2013
@@ -68,7 +68,7 @@ public class TestDigestAuthenticator ext
Request request = new TesterRequest();
final int count = 1000;
- Set<String> nonces = new HashSet<>();
+ Set<String> nonces = new HashSet<String>();
for (int i = 0; i < count; i++) {
nonces.add(digestAuthenticator.generateNonce(request));
Copied: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
(from r1441881, tomcat/trunk/test/org/apache/catalina/core/TesterContext.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java?p2=tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java&p1=tomcat/trunk/test/org/apache/catalina/core/TesterContext.java&r1=1441881&r2=1443414&rev=1443414&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/core/TesterContext.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java Thu
Feb 7 11:16:27 2013
@@ -17,16 +17,17 @@
package org.apache.catalina.core;
import java.beans.PropertyChangeListener;
-import java.io.File;
+import java.io.IOException;
import java.net.URL;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import javax.management.ObjectName;
+import javax.naming.directory.DirContext;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
-import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletSecurityElement;
import javax.servlet.descriptor.JspConfigDescriptor;
@@ -44,7 +45,6 @@ import org.apache.catalina.Loader;
import org.apache.catalina.Manager;
import org.apache.catalina.Pipeline;
import org.apache.catalina.Realm;
-import org.apache.catalina.WebResourceRoot;
import org.apache.catalina.Wrapper;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -55,8 +55,10 @@ import org.apache.catalina.deploy.Filter
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.NamingResources;
import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.catalina.util.CharsetMapper;
import org.apache.juli.logging.Log;
import org.apache.tomcat.JarScanner;
+import org.apache.tomcat.util.http.mapper.Mapper;
/**
* Minimal implementation for use in unit tests.
@@ -74,16 +76,6 @@ public class TesterContext implements Co
}
@Override
- public String getDomain() {
- return null;
- }
-
- @Override
- public String getMBeanKeyProperties() {
- return null;
- }
-
- @Override
public Pipeline getPipeline() {
return null;
}
@@ -110,7 +102,7 @@ public class TesterContext implements Co
@Override
public String getName() {
- return null;
+ return "/test";
}
@Override
@@ -225,11 +217,6 @@ public class TesterContext implements Co
}
@Override
- public File getCatalinaBase() {
- return null;
- }
-
- @Override
public void addLifecycleListener(LifecycleListener listener) {
// NO-OP
}
@@ -1009,12 +996,6 @@ public class TesterContext implements Co
}
@Override
- public Set<String> addServletSecurity(Dynamic registration,
- ServletSecurityElement servletSecurityElement) {
- return null;
- }
-
- @Override
public void setResourceOnlyServlets(String resourceOnlyServlets) {
// NO-OP
}
@@ -1085,16 +1066,6 @@ public class TesterContext implements Co
}
@Override
- public WebResourceRoot getResources() {
- return null;
- }
-
- @Override
- public void setResources(WebResourceRoot resources) {
- // NO-OP
- }
-
- @Override
public Manager getManager() {
return null;
}
@@ -1105,16 +1076,6 @@ public class TesterContext implements Co
}
@Override
- public void setAddWebinfClassesResources(boolean
addWebinfClassesResources) {
- // NO-OP
- }
-
- @Override
- public boolean getAddWebinfClassesResources() {
- return false;
- }
-
- @Override
public void addPostConstructMethod(String clazz, String method) {
// NO-OP
}
@@ -1153,4 +1114,66 @@ public class TesterContext implements Co
public Map<String,String> findPreDestroyMethods() {
return null;
}
+
+ @Override
+ public String getInfo() {
+ return null;
+ }
+
+ @Override
+ @Deprecated
+ public Object getMappingObject() {
+ return null;
+ }
+
+ @Override
+ public DirContext getResources() {
+ return null;
+ }
+
+ @Override
+ public void setResources(DirContext resources) {
+ //NO-OP
+ }
+
+ @Override
+ @Deprecated
+ public void invoke(Request request, Response response) throws IOException,
+ ServletException {
+ // NO-OP
+ }
+
+ @Override
+ @Deprecated
+ public boolean getAvailable() {
+ return false;
+ }
+
+ @Override
+ @Deprecated
+ public CharsetMapper getCharsetMapper() {
+ return null;
+ }
+
+ @Override
+ @Deprecated
+ public void setCharsetMapper(CharsetMapper mapper) {
+ // NO-OP
+ }
+
+ @Override
+ public Mapper getMapper() {
+ return null;
+ }
+
+ @Override
+ public void addResourceJarUrl(URL url) {
+ }
+
+ @Override
+ public Set<String> addServletSecurity(
+ ApplicationServletRegistration registration,
+ ServletSecurityElement servletSecurityElement) {
+ return null;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
