[java-idp-plugin-scripting] branch master updated: Reenable Plugin Version testsing

[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=ae2da1e1771aad90d7d560cade43105b4ae62fbd

The following commit(s) were added to refs/heads/master by this push:
       new  ae2da1e   Reenable Plugin Version testsing
ae2da1e is described below

commit ae2da1e1771aad90d7d560cade43105b4ae62fbd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Aug 7 14:46:42 2020 +0100

    Reenable Plugin Version testsing
    
    Requires a fix to the test and a change to the properties
---
 .../shibboleth/idp/plugin/scripting/nashorn/PluginTest.java    |  8 +++++---
 .../net/shibboleth/idp/plugin/scripting/rhino/PluginTest.java  | 10 ++++++----
 src/resources/main/plugins.props                               |  2 +-
 3 files changed, 12 insertions(+), 8 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 79741ba..0fa162e 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
@@ -34,6 +34,7 @@ import net.shibboleth.idp.plugin.PluginDescription;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
 import net.shibboleth.idp.plugin.PluginVersion;
 import net.shibboleth.idp.plugin.impl.PluginState;
+import net.shibboleth.idp.plugin.impl.PluginState.VersionInfo;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
@@ -55,7 +56,7 @@ public class PluginTest {
 		assertNotNull(nashorn);
 	}
 
-	@Test (enabled = false)
+	@Test
 	public void testState() throws ComponentInitializationException {
 		final PluginState state = new PluginState(nashorn); 
 		state.initialize();
@@ -66,13 +67,14 @@ public class PluginTest {
 		assertFalse(state.isSupportedWithIdPVersion(version, new PluginVersion("5.0.0")));
 	}
 
-	@Test (enabled = false)
+	@Test
 	public void testStateOld() throws ComponentInitializationException {
 		final PluginState state = new PluginState(nashorn);
 		state.initialize();
 		final PluginVersion version = new PluginVersion("0.1.0");
 		assertTrue(state.getAvailableVersions().containsKey(version));
-		assertEquals(state.getCurrentInfo().getSupportLevel(), SupportLevel.OutOfDate);
+		final VersionInfo info = state.getAvailableVersions().get(version);
+		assertEquals(info.getSupportLevel(), SupportLevel.OutOfDate);
 		assertTrue(state.isSupportedWithIdPVersion(version, new PluginVersion("4.1.0")));
 		assertFalse(state.isSupportedWithIdPVersion(version, new PluginVersion("5.0.0")));
 	}
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 60dcb83..2b35136 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
@@ -28,6 +28,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import net.shibboleth.idp.plugin.impl.PluginState;
+import net.shibboleth.idp.plugin.impl.PluginState.VersionInfo;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.idp.plugin.PluginDescription;
 import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
@@ -51,18 +52,19 @@ public class PluginTest {
 		assertNotNull(rhino);
 	}
 
-	@Test (enabled = false)
+	@Test
 	public void testStateOld() throws ComponentInitializationException {
 		final PluginState state = new PluginState(rhino);
 		state.initialize();
-		final PluginVersion version = new PluginVersion("0.1.1");
+		final PluginVersion version = new PluginVersion("0.1.0");
 		assertTrue(state.getAvailableVersions().containsKey(version));
-		assertEquals(state.getCurrentInfo().getSupportLevel(), SupportLevel.OutOfDate);
+		final VersionInfo info = state.getAvailableVersions().get(version);
+		assertEquals(info.getSupportLevel(), SupportLevel.OutOfDate);
 		assertTrue(state.isSupportedWithIdPVersion(version, new PluginVersion("4.1.0")));
 		assertFalse(state.isSupportedWithIdPVersion(version, new PluginVersion("5.0.0")));
 	}
 
-	@Test (enabled = false)
+	@Test
 	public void testState() throws ComponentInitializationException {
 		final PluginState state = new PluginState(rhino); 
 		state.initialize();
diff --git a/src/resources/main/plugins.props b/src/resources/main/plugins.props
index dfd1d3b..b3f4bb8 100644
--- a/src/resources/main/plugins.props
+++ b/src/resources/main/plugins.props
@@ -30,4 +30,4 @@ net.shibboleth.idp.plugin.rhino.baseName.0.1.0 = idp-plugin-rhino-dist-0.1.0
 #
 net.shibboleth.idp.plugin.rhino.idpVersionMax.0.1.1=5.0.0
 net.shibboleth.idp.plugin.rhino.idpVersionMin.0.1.1=4.1.0
-net.shibboleth.idp.plugin.rhino.supportLevel.0.1.0 = Current
+net.shibboleth.idp.plugin.rhino.supportLevel.0.1.1 = Current

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