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();
}
