projects
/
percentcodec
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fbef866
)
WIP: Versuch den StaticTest zu reparieren...
author
Kai Moritz
<kai@coolibri.de>
Mon, 18 Jun 2012 23:41:31 +0000
(
01:41
+0200)
committer
Kai Moritz
<kai@coolibri.de>
Thu, 2 Aug 2012 07:03:26 +0000
(09:03 +0200)
examples/static/src/main/webapp/WEB-INF/web.xml
patch
|
blob
|
history
examples/static/src/test/java/de/halbekunst/cachecontrol/examples/jsp/StaticTest.java
patch
|
blob
|
history
examples/static/src/test/java/org/apache/catalina/servlets/DefaultServlet.java
[new file with mode: 0644]
patch
|
blob
test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java
patch
|
blob
|
history
diff --git
a/examples/static/src/main/webapp/WEB-INF/web.xml
b/examples/static/src/main/webapp/WEB-INF/web.xml
index
288754d
..
8c1c69d
100644
(file)
--- a/
examples/static/src/main/webapp/WEB-INF/web.xml
+++ b/
examples/static/src/main/webapp/WEB-INF/web.xml
@@
-48,7
+48,7
@@
<servlet>
<servlet-name>default</servlet-name>
<servlet>
<servlet-name>default</servlet-name>
- <servlet-class>org.
eclipse.jetty.servlet
.DefaultServlet</servlet-class>
+ <servlet-class>org.
apache.catalina.servlets
.DefaultServlet</servlet-class>
</servlet>
</servlet>
diff --git
a/examples/static/src/test/java/de/halbekunst/cachecontrol/examples/jsp/StaticTest.java
b/examples/static/src/test/java/de/halbekunst/cachecontrol/examples/jsp/StaticTest.java
index
66a2826
..
67ebfa1
100644
(file)
--- a/
examples/static/src/test/java/de/halbekunst/cachecontrol/examples/jsp/StaticTest.java
+++ b/
examples/static/src/test/java/de/halbekunst/cachecontrol/examples/jsp/StaticTest.java
@@
-21,7
+21,7
@@
public class StaticTest extends HttpTestCase {
@Test
public void testStaticContent() throws Exception {
@Test
public void testStaticContent() throws Exception {
- WebResponse response = executeRequest("http://localhost:8080/
default.css
");
+ WebResponse response = executeRequest("http://localhost:8080/
static/page.html
");
log.info("Title:\t\t{}", response.getTitle());
log.debug("Text:\t\t{}", response.getText());
}
log.info("Title:\t\t{}", response.getTitle());
log.debug("Text:\t\t{}", response.getText());
}
diff --git a/examples/static/src/test/java/org/apache/catalina/servlets/DefaultServlet.java
b/examples/static/src/test/java/org/apache/catalina/servlets/DefaultServlet.java
new file mode 100644
(file)
index 0000000..
73cfe59
--- /dev/null
+++ b/
examples/static/src/test/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -0,0
+1,12
@@
+package org.apache.catalina.servlets;
+
+import javax.servlet.http.HttpServlet;
+
+/**
+ * Möglichst simple Fake-Implementierung für die Ausführung des Testfalls
+ *
+ * @author kai
+ */
+public class DefaultServlet extends HttpServlet {
+
+}
diff --git
a/test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java
b/test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java
index
cbf9946
..
76c4646
100644
(file)
--- a/
test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java
+++ b/
test/src/main/java/de/halbekunst/juplo/test/HttpTestCase.java
@@
-8,7
+8,6
@@
import java.io.File;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
import java.util.Enumeration;
import javax.servlet.http.HttpServletRequest;
import org.junit.Before;
-import org.eclipse.jetty.servlet.DefaultServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@
-39,7
+38,6
@@
public abstract class HttpTestCase {
@Before
public void init() throws Exception {
sr = new ServletRunner(config, ""); // Dies ist der einzige Konstruktor, der die Context-Root der Webapp im Testfall korrekt initialisiert :/
@Before
public void init() throws Exception {
sr = new ServletRunner(config, ""); // Dies ist der einzige Konstruktor, der die Context-Root der Webapp im Testfall korrekt initialisiert :/
- sr.registerServlet("default", DefaultServlet.class.getName());
client = sr.newClient();
}
client = sr.newClient();
}