Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 51261 invoked from network); 3 Jun 2008 07:57:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jun 2008 07:57:49 -0000 Received: (qmail 79311 invoked by uid 500); 3 Jun 2008 07:57:52 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 79272 invoked by uid 500); 3 Jun 2008 07:57:52 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 79248 invoked by uid 99); 3 Jun 2008 07:57:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2008 00:57:51 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jun 2008 07:57:11 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5116B2388A26; Tue, 3 Jun 2008 00:57:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r662682 - /archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java Date: Tue, 03 Jun 2008 07:57:28 -0000 To: commits@archiva.apache.org From: jdumay@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080603075728.5116B2388A26@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdumay Date: Tue Jun 3 00:57:27 2008 New Revision: 662682 URL: http://svn.apache.org/viewvc?rev=662682&view=rev Log: Actually fixing the failing test. Turns out I mixed up the file and logical paths in the DavResourceTest Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java?rev=662682&r1=662681&r2=662682&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/DavResourceTest.java Tue Jun 3 00:57:27 2008 @@ -65,7 +65,7 @@ myResource = new File(baseDir, "myresource.jar"); assertTrue("Could not create " + myResource.getAbsolutePath(), myResource.createNewFile()); resourceLocator = (ArchivaDavResourceLocator)new ArchivaDavLocatorFactory().createResourceLocator("/", REPOPATH); - resource = getDavResource(REPOPATH, myResource); + resource = getDavResource(resourceLocator.getHref(false), myResource); lockManager = new SimpleLockManager(); resource.addLockManager(lockManager); } @@ -81,7 +81,7 @@ private DavResource getDavResource(String logicalPath, File file) { - return new ArchivaDavResource(logicalPath, file.getAbsolutePath(), mimeTypes, session, resourceLocator, null); + return new ArchivaDavResource(file.getAbsolutePath(), logicalPath, mimeTypes, session, resourceLocator, null); } public void testIsLockable()