[java-idp-plugin-scripting] 03/03: JSCRIPTING-4 Canno feed a classpath value into #getUpdateURLs()

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-idp-plugin-scripting.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=812176442a1adae0caf76b6f5905568e740d87a7

commit 812176442a1adae0caf76b6f5905568e740d87a7
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Aug 4 13:53:07 2020 +0100

    JSCRIPTING-4 Canno feed a classpath value into  #getUpdateURLs()
    
    https://issues.shibboleth.net/jira/browse/JSCRIPTING-4
---
 .../shibboleth/idp/plugin/scripting/nashorn/PluginTest.java  | 12 ++++++------
 .../shibboleth/idp/plugin/scripting/rhino/PluginTest.java    | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
index e705118..4a021a1 100644
--- a/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
+++ b/nashorn-impl/src/test/java/net/shibboleth/idp/plugin/scripting/nashorn/PluginTest.java
@@ -31,8 +31,8 @@ import org.testng.annotations.Test;
 
 import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.idp.plugin.PluginDescription;
-import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
+import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.idp.plugin.impl.PluginState;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
@@ -60,11 +60,11 @@ public class PluginTest {
 		
 		final PluginState state = new PluginState(nashorn); 
 		state.initialize();
-		assertTrue(state.getAvailableVersions().contains(
-				new PluginVersion(nashorn.getMajorVersion(),nashorn.getMinorVersion(), nashorn.getPatchVersion())));
-		assertEquals(state.getSupportLevel(), SupportLevel.Current);
-		assertTrue(state.isSupportedWithIdPVersion("4.1.0"));
-		assertFalse(state.isSupportedWithIdPVersion("5.0.0"));
+		final PluginVersion version = new PluginVersion(nashorn.getMajorVersion(),nashorn.getMinorVersion(), nashorn.getPatchVersion()); 
+		assertTrue(state.getAvailableVersions().containsKey(version));
+		assertEquals(state.getCurrentInfo().getSupportLevel(), SupportLevel.Current);
+		assertTrue(state.isSupportedWithIdPVersion(version, new PluginVersion("4.1.0")));
+		assertFalse(state.isSupportedWithIdPVersion(version, new PluginVersion("5.0.0")));
 	}
 	
 	@Test
diff --git a/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
index 2fb6b2c..6aa66eb 100644
--- a/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
+++ b/rhino-impl/src/test/java/net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java
@@ -56,11 +56,11 @@ public class PluginTest {
 		
 		final PluginState state = new PluginState(rhino); 
 		state.initialize();
-		assertTrue(state.getAvailableVersions().contains(
-				new PluginVersion(rhino.getMajorVersion(),rhino.getMinorVersion(), rhino.getPatchVersion())));
-		assertEquals(state.getSupportLevel(), SupportLevel.Current);
-		assertTrue(state.isSupportedWithIdPVersion("4.1.0"));
-		assertFalse(state.isSupportedWithIdPVersion("5.0.0"));
+		final PluginVersion version = new PluginVersion(rhino.getMajorVersion(),rhino.getMinorVersion(), rhino.getPatchVersion()); 
+		assertTrue(state.getAvailableVersions().containsKey(version));
+		assertEquals(state.getCurrentInfo().getSupportLevel(), SupportLevel.Current);
+		assertTrue(state.isSupportedWithIdPVersion(version, new PluginVersion("4.1.0")));
+		assertFalse(state.isSupportedWithIdPVersion(version, new PluginVersion("5.0.0")));
 	}
 	
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.