commit 9f7e07ab7733324cb98ccbcfc761e36b4ebdfbb4
author Stephan Wahlbrink <sw@wahlbrink.eu> Tue Jun 11 09:09:29 2019 +0200
committer Stephan Wahlbrink <sw@wahlbrink.eu> Tue Jun 11 12:01:42 2019 +0200
tree 282078b361a137077d8da94ad69869407ba1ba78
parent 8a525153daa9b43df5d7cddb36c52dd4be3a7b7c

Bug 541791: [RJ-Server] Add release file pattern to lib path detection
tests

Change-Id: Ib93da897667dd643c2280585e52da6832525fe55

core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java

diff --git a/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java b/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
index 46d5979..76dcac1 100644
--- a/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
+++ b/core/org.eclipse.statet.rj.server-tests/src/org/eclipse/statet/rj/server/util/PathEntryProviderTest.java
@@ -56,7 +56,7 @@
 	}
 	
 	@Test
-	public void detectLibPaths_TargetJar() throws Exception {
+	public void detectLibPaths_TargetJar_Snapshot() throws Exception {
 		final PathEntryProvider provider= PathEntryProvider.detectLibPaths(
 				"jar:file:/../org.eclipse.statet-rj/core/org.eclipse.statet.rj.server/target/org.eclipse.statet.rj.server-4.0.0-SNAPSHOT.jar!/",
 				null );
@@ -69,6 +69,19 @@
 	}
 	
 	@Test
+	public void detectLibPaths_TargetJar_Release() throws Exception {
+		final PathEntryProvider provider= PathEntryProvider.detectLibPaths(
+				"jar:file:/../org.eclipse.statet-rj/core/org.eclipse.statet.rj.server/target/org.eclipse.statet.rj.server-4.0.0.201906060800-r.jar!/",
+				null );
+		
+		assertEquals(JarFilePathEntryProvider.class, provider.getClass());
+		
+		final JarFilePathEntryProvider jarProvider= (JarFilePathEntryProvider) provider;
+		assertEquals("org.eclipse.statet.rj.server",
+				jarProvider.getBundleId("org.eclipse.statet.rj.server-4.0.0.201906060800-r.jar") );
+	}
+	
+	@Test
 	public void detectLibPaths_NexusJar() throws Exception {
 		final PathEntryProvider provider= PathEntryProvider.detectLibPaths(
 				"jar:file:/../WEB-INF/lib/org.eclipse.statet.rj.server-4.0.0-20190529.154707-7.jar!/",
@@ -82,7 +95,7 @@
 	}
 	
 	@Test
-	public void detectLibPaths_NestedJar_1() throws Exception { // e.g. R help server
+	public void detectLibPaths_NestedJar_Snapshot() throws Exception { // e.g. R help server
 		final String folder= System.getenv("STATET_TEST_FILES");
 		Assume.assumeTrue(folder != null);
 		
@@ -98,7 +111,7 @@
 	}
 	
 	@Test
-	public void detectLibPaths_NestedJar_2() throws Exception { // e.g. R help server
+	public void detectLibPaths_NestedJar_Nexus() throws Exception { // e.g. R help server
 		final String folder= System.getenv("STATET_TEST_FILES");
 		Assume.assumeTrue(folder != null);
 		
@@ -113,4 +126,20 @@
 				jarProvider.getBundleId("org.eclipse.statet.rj.server-4.0.0-20190529.154707-7.jar") );
 	}
 	
+	@Test
+	public void detectLibPaths_NestedJar_Release() throws Exception { // e.g. R help server
+		final String folder= System.getenv("STATET_TEST_FILES");
+		Assume.assumeTrue(folder != null);
+		
+		final PathEntryProvider provider= PathEntryProvider.detectLibPaths(
+				"jar:file:/" + folder.replace('\\', '/') + "/org.eclipse.statet.rhelp.server.jar!/BOOT-INF/lib/org.eclipse.statet.rj.server-4.0.0.201906060800-r.jar!/",
+				null );
+		
+		assertEquals(JarFilePathEntryProvider.class, provider.getClass());
+		
+		final JarFilePathEntryProvider jarProvider= (JarFilePathEntryProvider) provider;
+		assertEquals("org.eclipse.statet.rj.server",
+				jarProvider.getBundleId("org.eclipse.statet.rj.server-4.0.0.201906060800-r.jar") );
+	}
+	
 }