Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-06-11 04:07:00 +0000
committerGreg Wilkins2013-06-11 04:07:00 +0000
commit06d3fbe5aac4ef19faa0eb483960a0505cae6977 (patch)
treea958ecbefd48117ee2f2958be6f6a01d523d7c99 /jetty-deploy/src
parent5d17bdcc2753374cb8e3653e645e4cca9bd25891 (diff)
parent3db9299369c510551ddc6f9c12ea687a108fe68f (diff)
downloadorg.eclipse.jetty.project-06d3fbe5aac4ef19faa0eb483960a0505cae6977.tar.gz
org.eclipse.jetty.project-06d3fbe5aac4ef19faa0eb483960a0505cae6977.tar.xz
org.eclipse.jetty.project-06d3fbe5aac4ef19faa0eb483960a0505cae6977.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java10
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java3
2 files changed, 12 insertions, 1 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
index 513a8c91df..bcdd4e2cdb 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
@@ -25,10 +25,12 @@ import org.eclipse.jetty.deploy.AppProvider;
import org.eclipse.jetty.deploy.DeploymentManager;
import org.eclipse.jetty.deploy.test.XmlConfiguredJetty;
import org.eclipse.jetty.toolchain.test.OS;
+import org.eclipse.jetty.toolchain.test.TestTracker;
import org.eclipse.jetty.toolchain.test.TestingDir;
import org.eclipse.jetty.util.Scanner;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
+import org.eclipse.jetty.util.resource.Resource;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
@@ -44,6 +46,9 @@ public class ScanningAppProviderRuntimeUpdatesTest
private static final Logger LOG = Log.getLogger(ScanningAppProviderRuntimeUpdatesTest.class);
@Rule
+ public TestTracker tracker = new TestTracker();
+
+ @Rule
public TestingDir testdir = new TestingDir();
private static XmlConfiguredJetty jetty;
private final AtomicInteger _scans = new AtomicInteger();
@@ -52,6 +57,9 @@ public class ScanningAppProviderRuntimeUpdatesTest
@Before
public void setupEnvironment() throws Exception
{
+ testdir.ensureEmpty();
+ Resource.setDefaultUseCaches(false);
+
jetty = new XmlConfiguredJetty(testdir);
jetty.addConfiguration("jetty.xml");
jetty.addConfiguration("jetty-http.xml");
@@ -91,7 +99,7 @@ public class ScanningAppProviderRuntimeUpdatesTest
public void waitForDirectoryScan()
{
- int scan=_scans.get()+2*_providers;
+ int scan=_scans.get()+(2*_providers);
do
{
try
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index fdc8092b4c..a14facc8e7 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -18,6 +18,8 @@
package org.eclipse.jetty.deploy.test;
+import static org.hamcrest.Matchers.*;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -207,6 +209,7 @@ public class XmlConfiguredJetty
if (context.getContextPath().equals(expectedPath))
{
found = true;
+ Assert.assertThat("Context[" + context.getContextPath() + "].state", context.getState(), is("STARTED"));
break;
}
}

Back to the top