add tests

Author: lecousin

core.loaders/maven/src/main/java/net/lecousin/core/loaders/maven/MavenPOM.java

@@ -933,50 +933,56 @@ private void resolveProperties(Map<String, String> toResolve, Map<String, String
 				if (!changed) break;
 			}
 		}
-		
-		private String resolve(String value, Map<String, String> properties) {
-			if (value == null) return null;
-			int i = value.indexOf("${");
-			if (i < 0) return value;
-			int j = value.indexOf('}', i + 2);
-			if (j < 0) return value;
-			String name = value.substring(i + 2, j).trim();
-			if (properties.containsKey(name)) {
-				StringBuilder s = new StringBuilder();
-				if (i > 0) s.append(value.substring(0, i));
-				s.append(properties.get(name));
-				if (j < value.length() - 1) s.append(value.substring(j + 1));
-				return resolve(s.toString(), properties);
-			}
-			if (name.equals("project.groupId"))
-				return groupId;
-			if (name.equals("project.artifactId"))
-				return artifactId;
-			if (name.equals("project.version"))
-				return version;
-			if (name.equals("parent.groupId")) {
-				if (parentLoading != null) return parentLoading.getResult().groupId;
-				return null;
-			}
-			if (name.equals("parent.artifactId")) {
-				if (parentLoading != null) return parentLoading.getResult().artifactId;
-				return null;
-			}
-			if (name.equals("parent.version")) {
-				if (parentLoading != null) return parentLoading.getResult().version;
-				return null;
-			}
-			if (name.startsWith("env.")) {
-				return System.getenv(name.substring(4));
-			}
-			if (name.startsWith("settings.")) {
-				// TODO
-				return null;
-			}
-			return System.getProperty(name);
-		}
+	}
+	
+	/** Resolve the given value with properties from this POM. */
+	public String resolveProperty(String value) {
+		return resolve(value, properties);
 	}
 
+	
+	private String resolve(String value, Map<String, String> properties) {
+		if (value == null) return null;
+		int i = value.indexOf("${");
+		if (i < 0) return value;
+		int j = value.indexOf('}', i + 2);
+		if (j < 0) return value;
+		String name = value.substring(i + 2, j).trim();
+		if (properties.containsKey(name)) {
+			StringBuilder s = new StringBuilder();
+			if (i > 0) s.append(value.substring(0, i));
+			s.append(properties.get(name));
+			if (j < value.length() - 1) s.append(value.substring(j + 1));
+			return resolve(s.toString(), properties);
+		}
+		if (name.equals("project.groupId"))
+			return groupId;
+		if (name.equals("project.artifactId"))
+			return artifactId;
+		if (name.equals("project.version"))
+			return version;
+		if (name.equals("parent.groupId")) {
+			if (parentLoading != null) return parentLoading.getResult().groupId;
+			return null;
+		}
+		if (name.equals("parent.artifactId")) {
+			if (parentLoading != null) return parentLoading.getResult().artifactId;
+			return null;
+		}
+		if (name.equals("parent.version")) {
+			if (parentLoading != null) return parentLoading.getResult().version;
+			return null;
+		}
+		if (name.startsWith("env.")) {
+			return System.getenv(name.substring(4));
+		}
+		if (name.startsWith("settings.")) {
+			// TODO
+			return null;
+		}
+		return System.getProperty(name);
+	}
+	
 	/** Parse a version specification in POM format. */
 	public static VersionSpecification parseVersionSpecification(String s) {
 		if (s == null) return null;

core.loaders/maven/src/test/java/net/lecousin/core/loaders/maven/tests/TestLocalRepository.java

@@ -233,6 +233,7 @@ public void testPOMWithRepositories() throws Exception {
 
 			List<LibrariesRepository> repos = pom.getDependenciesAdditionalRepositories();
 			Assert.assertEquals(2, repos.size());
+			pom.toString();
 		} finally {
 			outFile.delete();
 		}
@@ -257,6 +258,26 @@ public void testPOMWithAdditionalFields() throws Exception {
 			outFile.delete();
 		}
 	}
+
+	@Test
+	public void testPOMWithProperties() throws Exception {
+		File outFile = new File("./test-properties.pom.xml");
+		outFile.createNewFile();
+		outFile.deleteOnExit();
+		try {
+			new File("./target/test-out").mkdir();
+			FileIO.WriteOnly out = new FileIO.WriteOnly(outFile, Task.PRIORITY_NORMAL);
+			IOUtil.copy(
+				((IOProvider.Readable)IOProviderFromURI.getInstance().get(new URI("classpath:test-maven/test-properties.pom.xml"))).provideIOReadable(Task.PRIORITY_NORMAL),
+				out,
+				-1, true, null, 0).blockThrow(15000);
+			
+			AsyncSupplier<MavenPOM, LibraryManagementException> load = MavenPOM.load(new File("./test-properties.pom.xml").toURI(), Task.PRIORITY_NORMAL, pomLoader, false);
+			load.blockResult(30000);
+		} finally {
+			outFile.delete();
+		}
+	}
 
 	private void testError(String errorName) throws IOException, CancelException, URISyntaxException {
 		File outFile = new File("./test-error-" + errorName + ".pom.xml");
@@ -287,6 +308,9 @@ public void testErrors() throws Exception {
 		testError("invalid-root");
 		testError("invalid-xml");
 		testError("invalid-xml2");
+		testError("invalid-xml3");
+		testError("invalid-xml4");
+		testError("invalid-xml5");
 		testError("empty");
 	}
 

core.loaders/maven/src/test/resources/test-maven/error/test-invalid-xml3.pom.xml

@@ -0,0 +1,11 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>test</groupId>
+	<artifactId>maven</artifactId>
+	<version>1</version>
+	<packaging>bundle</packaging>
+	
+	<repositories>
+		<repository>

core.loaders/maven/src/test/resources/test-maven/error/test-invalid-xml4.pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>test</groupId>
+	<artifactId>maven</artifactId>
+	<version>1</version>
+	<packaging>bundle</packaging>
+	
+	<repositories>
+		<repository>
+			<releases>

core.loaders/maven/src/test/resources/test-maven/error/test-invalid-xml5.pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>test</groupId>
+	<artifactId>maven</artifactId>
+	<version>1</version>
+	<packaging>bundle</packaging>
+	
+	<repositories>
+		<repository>
+			<snapshots>

core.loaders/maven/src/test/resources/test-maven/test-properties.pom.xml

@@ -0,0 +1,24 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>test</groupId>
+	<artifactId>maven</artifactId>
+	<version>1</version>
+	<packaging>bundle</packaging>
+	
+	<parent>
+		<groupId>junit</groupId>
+		<artifactId>junit</artifactId>
+		<version>4.12</version>
+	</parent>
+	
+	<properties>
+		<test-junit-version>${parent.version}</test-junit-version>
+		<test-junit-groupId>${parent.groupId}</test-junit-groupId>
+		<test-junit-artifactId>${parent.artifactId}</test-junit-artifactId>
+		<test-env>${env.user}</test-env>
+		<test-settings>${settings.test}</test-settings>
+	</properties>
+
+</project>

core.loaders/maven/src/test/resources/test-maven/test-repositories.pom.xml

@@ -30,5 +30,10 @@
 			<releases>true</releases>
 			<snapshots>false</snapshots>
 		</repository>
+		<repository>
+			<id>closed</id>
+			<releases/>
+		</repository>
+		<repository/>
 	</repositories>
 </project>

net.lecousin.core/src/main/java/net/lecousin/framework/application/libraries/classpath/DefaultLibrariesManager.java

@@ -63,6 +63,23 @@ public DefaultApplicationClassLoader start(Application app) {
 	private File[] additionalClassPath;
 	private ArrayList<File> classPath;
 
+	private static BufferedReadableCharacterStream loadNextFile(Enumeration<URL> urls, Async<Exception> sp) {
+		if (!urls.hasMoreElements()) {
+			sp.unblock();
+			return null;
+		}
+		URL url = urls.nextElement();
+		InputStream input;
+		try { input = url.openStream(); }
+		catch (IOException e) {
+			sp.error(e);
+			return null;
+		}
+		IOFromInputStream io = new IOFromInputStream(
+			input, url.toString(), Threading.getUnmanagedTaskManager(), Task.PRIORITY_IMPORTANT);
+		return new BufferedReadableCharacterStream(io, StandardCharsets.UTF_8, 256, 32);
+	}
+	
 	private class Start extends Task.Cpu<Void, NoException> {
 		private Start() {
 			super("Start DefaultLibrariesManager", Task.PRIORITY_IMPORTANT);
@@ -111,20 +128,8 @@ private Async<Exception> loadExtensionPoints() {
 		}
 
 		private void loadExtensionPoints(Enumeration<URL> urls, Async<Exception> sp) {
-			if (!urls.hasMoreElements()) {
-				sp.unblock();
-				return;
-			}
-			URL url = urls.nextElement();
-			InputStream input;
-			try { input = url.openStream(); }
-			catch (IOException e) {
-				sp.error(e);
-				return;
-			}
-			IOFromInputStream io = new IOFromInputStream(
-				input, url.toString(), Threading.getUnmanagedTaskManager(), Task.PRIORITY_IMPORTANT);
-			BufferedReadableCharacterStream stream = new BufferedReadableCharacterStream(io, StandardCharsets.UTF_8, 256, 32);
+			BufferedReadableCharacterStream stream = loadNextFile(urls, sp);
+			if (stream == null) return;
 			LoadLibraryExtensionPointsFile load = new LoadLibraryExtensionPointsFile(stream, acl);
 			load.start().onDone(() -> loadExtensionPoints(urls, sp), sp);
 			stream.closeAfter(sp);
@@ -182,20 +187,8 @@ private void loadPlugins(Async<Exception> sp) {
 		}
 
 		private void loadPlugins(Enumeration<URL> urls, Async<Exception> sp) {
-			if (!urls.hasMoreElements()) {
-				sp.unblock();
-				return;
-			}
-			URL url = urls.nextElement();
-			InputStream input;
-			try { input = url.openStream(); }
-			catch (IOException e) {
-				sp.error(e);
-				return;
-			}
-			IOFromInputStream io = new IOFromInputStream(
-				input, url.toString(), Threading.getUnmanagedTaskManager(), Task.PRIORITY_IMPORTANT);
-			BufferedReadableCharacterStream stream = new BufferedReadableCharacterStream(io, StandardCharsets.UTF_8, 256, 32);
+			BufferedReadableCharacterStream stream = loadNextFile(urls, sp);
+			if (stream == null) return;
 			LoadLibraryPluginsFile load = new LoadLibraryPluginsFile(stream, acl);
 			load.start().onDone(() -> loadPlugins(urls, sp), sp);
 			stream.closeAfter(sp);

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/runners/LCConcurrentRunner.java

@@ -68,9 +68,15 @@ public long getMaxBlockingTimeInNanoBeforeToLog() {
 			@Override
 	        public void finished() {
 				jp.start();
-				jp.block(10L * 60 * 1000);
+				int lastNb = jp.getToJoin();
+				do {
+					jp.block(10L * 60 * 1000);
+					if (lastNb == jp.getToJoin())
+						break;
+					lastNb = jp.getToJoin();
+				} while (!jp.isDone());
 				if (!jp.isDone())
-					throw new RuntimeException("Some tests are not finished after 10 minutes");
+					throw new RuntimeException("Some tests are not finished after 10 minutes: still waiting for " + jp.getToJoin());
 	        }
 	    };
 	};