From ee291c06f49cbaf9e4378ed7748b7766c730396b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 8 Nov 2013 11:44:00 +0100
Subject: [PATCH] OO-797: use the right class for the unit tests
---
.../olat/dispatcher/CatalogExportModuleDispatcher.java | 1 -
.../core/commons/services/webdav/WebDAVCommandsTest.java | 6 ++++--
.../core/commons/services/webdav/WebDAVConnection.java | 8 --------
.../olat/core/commons/services/webdav/WebDAVTestCase.java | 2 --
src/test/java/org/olat/test/AllTestsJunit4.java | 2 +-
5 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/olat/dispatcher/CatalogExportModuleDispatcher.java b/src/main/java/org/olat/dispatcher/CatalogExportModuleDispatcher.java
index ef017ee40aa..10d02c88e3d 100644
--- a/src/main/java/org/olat/dispatcher/CatalogExportModuleDispatcher.java
+++ b/src/main/java/org/olat/dispatcher/CatalogExportModuleDispatcher.java
@@ -59,7 +59,6 @@ import org.olat.basesecurity.SecurityGroup;
import org.olat.catalog.CatalogEntry;
import org.olat.catalog.CatalogManager;
import org.olat.core.dispatcher.Dispatcher;
-import org.olat.core.dispatcher.DispatcherModule;
import org.olat.core.gui.media.FileMediaResource;
import org.olat.core.gui.media.NotFoundMediaResource;
import org.olat.core.gui.media.ServletUtil;
diff --git a/src/test/java/org/olat/core/commons/services/webdav/WebDAVCommandsTest.java b/src/test/java/org/olat/core/commons/services/webdav/WebDAVCommandsTest.java
index 9a097ca9186..c8c8e8e96fc 100644
--- a/src/test/java/org/olat/core/commons/services/webdav/WebDAVCommandsTest.java
+++ b/src/test/java/org/olat/core/commons/services/webdav/WebDAVCommandsTest.java
@@ -54,12 +54,14 @@ public class WebDAVCommandsTest extends WebDAVTestCase {
//list root content of its webdav folder
WebDAVConnection conn = new WebDAVConnection();
conn.setCredentials(user.getName(), "A6B7C8");
- URI uri = conn.getContextURI().build();
+ URI uri = conn.getBaseURI().build();
HttpResponse response = conn.propfind(uri);
assertEquals(207, response.getStatusLine().getStatusCode());
String xml = EntityUtils.toString(response.getEntity());
- Assert.assertTrue(xml.indexOf("/webdav/coursefolders/") > 0);
+ Assert.assertTrue(xml.indexOf("<D:multistatus") > 0);//Windows need the D namespace
+ Assert.assertTrue(xml.indexOf("<D:href>/</D:href>") > 0);//check the root
+ Assert.assertTrue(xml.indexOf("<D:href>/webdav/</D:href>") > 0);//check the webdav folder
IOUtils.closeQuietly(conn);
}
diff --git a/src/test/java/org/olat/core/commons/services/webdav/WebDAVConnection.java b/src/test/java/org/olat/core/commons/services/webdav/WebDAVConnection.java
index 1cb4f20fec4..c15a1a8f7ce 100644
--- a/src/test/java/org/olat/core/commons/services/webdav/WebDAVConnection.java
+++ b/src/test/java/org/olat/core/commons/services/webdav/WebDAVConnection.java
@@ -55,7 +55,6 @@ public class WebDAVConnection implements Closeable {
private int port = WebDAVTestCase.PORT;
private String host = WebDAVTestCase.HOST;
private String protocol = WebDAVTestCase.PROTOCOL;
- private String contextPath = WebDAVTestCase.CONTEXT_PATH;
private final BasicCookieStore cookieStore = new BasicCookieStore();
private final CredentialsProvider provider = new BasicCredentialsProvider();
@@ -104,11 +103,4 @@ public class WebDAVConnection implements Closeable {
URI uri = new URI(protocol, null, host, port, null, null, null);
return UriBuilder.fromUri(uri);
}
-
- /**
- * @return http://localhost:9997/webdav
- */
- public UriBuilder getContextURI() throws URISyntaxException {
- return getBaseURI().path(contextPath);
- }
}
diff --git a/src/test/java/org/olat/core/commons/services/webdav/WebDAVTestCase.java b/src/test/java/org/olat/core/commons/services/webdav/WebDAVTestCase.java
index f5fada09399..a92b8025362 100644
--- a/src/test/java/org/olat/core/commons/services/webdav/WebDAVTestCase.java
+++ b/src/test/java/org/olat/core/commons/services/webdav/WebDAVTestCase.java
@@ -54,7 +54,6 @@ public abstract class WebDAVTestCase extends OlatTestCase {
public final static int PORT = 9997;
public final static String HOST = "localhost";
public final static String PROTOCOL = "http";
- public final static String CONTEXT_PATH = "webdav";
private static GrizzlyWebServer webServer;
@@ -77,7 +76,6 @@ public abstract class WebDAVTestCase extends OlatTestCase {
sa.addInitParameter("output", "32768");
sa.addInitParameter("listings", "true");
sa.addInitParameter("readonly", "false");
- sa.setContextPath("/" + CONTEXT_PATH);
webServer.addGrizzlyAdapter(sa, new String[]{""});
log.info("Starting the Grizzly Web Container for WebDAV...");
diff --git a/src/test/java/org/olat/test/AllTestsJunit4.java b/src/test/java/org/olat/test/AllTestsJunit4.java
index a2a1ed717dc..584b1533647 100644
--- a/src/test/java/org/olat/test/AllTestsJunit4.java
+++ b/src/test/java/org/olat/test/AllTestsJunit4.java
@@ -77,7 +77,7 @@ import org.junit.runners.Suite;
org.olat.commons.coordinate.cluster.jms.JMSTest.class,//ok
org.olat.commons.coordinate.cluster.lock.LockTest.class,//ok
org.olat.commons.coordinate.CoordinatorTest.class,//ok
- org.olat.core.commons.services.webdav.WebDAVTestCase.class,//ok
+ org.olat.core.commons.services.webdav.WebDAVCommandsTest.class,//ok
org.olat.core.commons.services.webdav.manager.WebDAVManagerTest.class,//ok
org.olat.core.commons.taskExecutor.PersistentTaskDAOTest.class,//ok
org.olat.core.commons.taskExecutor.TaskExecutorManagerTest.class,//ok
--
GitLab