You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2020/07/16 12:14:43 UTC

svn commit: r1879947 - in /jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server: RemotingTest.java WebDAVTestBase.java

Author: reschke
Date: Thu Jul 16 12:14:43 2020
New Revision: 1879947

URL: http://svn.apache.org/viewvc?rev=1879947&view=rev
Log:
JCR-4615: jcr-server: add minimal test coverage for remoting WebDAV servlet

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java?rev=1879947&r1=1879946&r2=1879947&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/RemotingTest.java Thu Jul 16 12:14:43 2020
@@ -37,7 +37,7 @@ public class RemotingTest extends WebDAV
     // simple test the verifies that we are indeed talking to the remoting
     // servlet
     public void testRoot() throws IOException, DavException {
-        String testuri = this.remotingUri.toASCIIString() + "jcr:root";
+        String testuri = this.remotingUri.toASCIIString() + "default/jcr:root";
         DavPropertyName pntn = DavPropertyName.create("primarynodetype", ObservationConstants.NAMESPACE);
         DavPropertyNameSet names = new DavPropertyNameSet();
         names.add(pntn);

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java?rev=1879947&r1=1879946&r2=1879947&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/server/WebDAVTestBase.java Thu Jul 16 12:14:43 2020
@@ -65,7 +65,8 @@ import junit.framework.TestResult;
 public class WebDAVTestBase extends AbstractJCRTest {
 
     private static final String SIMPLE_WEBDAV_SERVLET_PATH_MAPPING = "/*";
-    private static final String REMOTING_WEBDAV_SERVLET_PATH_MAPPING = "/remoting/*";
+    private static final String REMOTING_PREFIX = "/remoting";
+    private static final String REMOTING_WEBDAV_SERVLET_PATH_MAPPING = REMOTING_PREFIX + "/*";
 
     private static ServerConnector httpConnector;
     private static ServerConnector httpsConnector;
@@ -73,10 +74,12 @@ public class WebDAVTestBase extends Abst
     private static RepositoryContext repoContext;
 
     public URI uri;
-    public URI remotingUri;
     public URI httpsUri;
     public String root;
 
+    // URI for remoting servlet, does not include workspace name
+    public URI remotingUri;
+
     public HttpClient client;
     public HttpClientContext context;
 
@@ -164,7 +167,7 @@ public class WebDAVTestBase extends Abst
         }
 
         this.uri = new URI("http", null, "localhost", httpConnector.getLocalPort(), "/default/", null, null);
-        this.remotingUri = new URI("http", null, "localhost", httpConnector.getLocalPort(), "/remoting/default/", null, null);
+        this.remotingUri = new URI("http", null, "localhost", httpConnector.getLocalPort(), REMOTING_PREFIX + "/", null, null);
         this.httpsUri = new URI("https", null, "localhost", httpsConnector.getLocalPort(), "/default/", null, null);
         this.root = this.uri.toASCIIString();