aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tjwat...@apache.org
Subject svn commit: r1745501 - in /aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect: Aries1522Test.java Aries1523Test.java
Date Wed, 25 May 2016 15:25:26 GMT
Author: tjwatson
Date: Wed May 25 15:25:26 2016
New Revision: 1745501

URL: http://svn.apache.org/viewvc?rev=1745501&view=rev
Log:
[ARIES-1553] Aries1522Test and Aries1523Test don't work on Windows

Modified:
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
    aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java?rev=1745501&r1=1745500&r2=1745501&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1522Test.java
Wed May 25 15:25:26 2016
@@ -117,14 +117,15 @@ public class Aries1522Test extends Subsy
 	
 	private URL createRepositoryXml(DataModelHelper helper) throws Exception {
 		File dir;
-		if (new File("").getAbsolutePath().endsWith("/target")) {
+		String cwd = new File("").getAbsolutePath();
+		if (cwd.endsWith(File.separator + "target")) {
 			dir = new File("test-classes/aries1523");
 		}
 		else {
 			dir = new File("target/test-classes/aries1523");
 		}
 		File jar = new File(dir, "aries1523fragment.jar");
-		assertTrue("The fragment jar does not exist", jar.exists());
+		assertTrue("The fragment jar does not exist: " + jar.getAbsolutePath(), jar.exists());
 		Resource resource = helper.createResource(jar.toURI().toURL());
 		Repository repository = helper.repository(new Resource[] {resource});
 		File file = new File(dir, "repository.xml");

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java?rev=1745501&r1=1745500&r2=1745501&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
(original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/defect/Aries1523Test.java
Wed May 25 15:25:26 2016
@@ -117,14 +117,15 @@ public class Aries1523Test extends Subsy
 	
 	private URL createRepositoryXml(DataModelHelper helper) throws Exception {
 		File dir;
-		if (new File("").getAbsolutePath().endsWith("/target")) {
+		String cwd = new File("").getAbsolutePath();
+		if (cwd.endsWith(File.separator + "target")) {
 			dir = new File("test-classes/aries1523");
 		}
 		else {
 			dir = new File("target/test-classes/aries1523");
 		}
 		File jar = new File(dir, "aries1523host.jar");
-		assertTrue("The host jar does not exist", jar.exists());
+		assertTrue("The host jar does not exist: " + jar.getAbsolutePath(), jar.exists());
 		Resource resource = helper.createResource(jar.toURI().toURL());
 		Repository repository = helper.repository(new Resource[] {resource});
 		File file = new File(dir, "repository.xml");



Mime
View raw message