Return-Path: X-Original-To: apmail-ace-commits-archive@www.apache.org Delivered-To: apmail-ace-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 40B80C415 for ; Wed, 17 Jul 2013 10:12:32 +0000 (UTC) Received: (qmail 96693 invoked by uid 500); 17 Jul 2013 10:12:32 -0000 Delivered-To: apmail-ace-commits-archive@ace.apache.org Received: (qmail 96634 invoked by uid 500); 17 Jul 2013 10:12:28 -0000 Mailing-List: contact commits-help@ace.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ace.apache.org Delivered-To: mailing list commits@ace.apache.org Received: (qmail 96626 invoked by uid 99); 17 Jul 2013 10:12:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jul 2013 10:12:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 17 Jul 2013 10:12:24 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5996E23889EC; Wed, 17 Jul 2013 10:12:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1504069 - /ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Date: Wed, 17 Jul 2013 10:12:03 -0000 To: commits@ace.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130717101203.5996E23889EC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Wed Jul 17 10:12:02 2013 New Revision: 1504069 URL: http://svn.apache.org/r1504069 Log: ACE-370 Broke some unit tests when fixing this. Modified: ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Modified: ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java?rev=1504069&r1=1504068&r2=1504069&view=diff ============================================================================== --- ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java (original) +++ ace/trunk/org.apache.ace.obr/test/org/apache/ace/obr/storage/file/BundleFileStoreTest.java Wed Jul 17 10:12:02 2013 @@ -249,7 +249,7 @@ public class BundleFileStoreTest { public void putBundle() throws Exception { File bundle = createTmpResource("foo.bar", "1.0.0"); String filePath = m_bundleStore.put(new FileInputStream(bundle), null); - assert filePath.equals("foo/bar/foo.bar-1.0.0.jar") : "Path should be 'foo/bar/foo.bar-1.0.0.jar', was " + filePath; + assert filePath.equals("foo/foo.bar-1.0.0.jar") : "Path should be 'foo/foo.bar-1.0.0.jar', was " + filePath; File file = new File(m_directory, filePath); assert file.exists(); } @@ -275,7 +275,7 @@ public class BundleFileStoreTest { public void putRemoveArtifact() throws Exception { File bundle = createTmpResource(null, null); String filePath = m_bundleStore.put(new FileInputStream(bundle), "foo.bar-2.3.7.test1.xxx"); - assert filePath.equals("foo/bar/foo.bar-2.3.7.test1.xxx"); + assert filePath.equals("foo/foo.bar-2.3.7.test1.xxx"); File file = new File(m_directory, filePath); assert file.exists(); } @@ -284,7 +284,7 @@ public class BundleFileStoreTest { public void putArtifactDefaultVersion() throws Exception { File bundle = createTmpResource(null, null); String filePath = m_bundleStore.put(new FileInputStream(bundle), "foo.bar.xxx"); - assert filePath.equals("foo/bar/foo.bar-0.0.0.xxx"); + assert filePath.equals("foo/foo.bar.xxx"); File file = new File(m_directory, filePath); assert file.exists(); } @@ -293,7 +293,7 @@ public class BundleFileStoreTest { public void putArtifactMavenVersion() throws Exception { File bundle = createTmpResource(null, null); String filePath = m_bundleStore.put(new FileInputStream(bundle), "foo.bar-2.3.7-test1.xxx"); - assert filePath.equals("foo/bar/foo.bar-2.3.7-test1.xxx"); + assert filePath.equals("foo/foo.bar-2.3.7-test1.xxx"); File file = new File(m_directory, filePath); assert file.exists(); } @@ -331,10 +331,10 @@ public class BundleFileStoreTest { public void removeArtifact() throws Exception { File bundle = createTmpResource(null, null); String filePath = m_bundleStore.put(new FileInputStream(bundle), "foo.bar-2.3.7.test1.xxx"); - assert filePath.equals("foo/bar/foo.bar-2.3.7.test1.xxx"); + assert filePath.equals("foo/foo.bar-2.3.7.test1.xxx"); File file = new File(m_directory, filePath); assert file.exists(); - assert m_bundleStore.remove("foo/bar/foo.bar-2.3.7.test1.xxx"); + assert m_bundleStore.remove("foo/foo.bar-2.3.7.test1.xxx"); assert !file.exists(); }