[java-idp-plugin-scripting] 01/02: untabify
Rod Widdowson
rdw at steadingsoftware.com
Thu Aug 27 10:27:50 UTC 2020
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=21787f8a34db0bf1c4d8f965a4a0e516bdba7af0
commit 21787f8a34db0bf1c4d8f965a4a0e516bdba7af0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Aug 27 10:50:50 2020 +0100
untabify
---
.../idp/plugin/scripting/nashorn/PluginTest.java | 98 +++++++++++-----------
.../plugin/scripting/rhino/RhinoDescription.java | 4 +-
.../idp/plugin/scripting/rhino/PluginTest.java | 68 +++++++--------
3 files changed, 85 insertions(+), 85 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 0fa162e..cd35abc 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
@@ -42,57 +42,57 @@ import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
@SuppressWarnings("javadoc")
public class PluginTest {
- private PluginDescription nashorn;
+ private PluginDescription nashorn;
- @BeforeClass
- public void SetupPlugin() {
- final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
- for (final PluginDescription service:loader) {
- if ("net.shibboleth.idp.plugin.nashorn".contentEquals(service.getPluginId())) {
- nashorn = service;
- break;
- }
- }
- assertNotNull(nashorn);
- }
+ @BeforeClass
+ public void SetupPlugin() {
+ final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
+ for (final PluginDescription service:loader) {
+ if ("net.shibboleth.idp.plugin.nashorn".contentEquals(service.getPluginId())) {
+ nashorn = service;
+ break;
+ }
+ }
+ assertNotNull(nashorn);
+ }
- @Test
- public void testState() throws ComponentInitializationException {
- final PluginState state = new PluginState(nashorn);
- state.initialize();
- 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
+ public void testState() throws ComponentInitializationException {
+ final PluginState state = new PluginState(nashorn);
+ state.initialize();
+ 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
- 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));
- 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
+ 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));
+ 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
- public void testDownload() throws Exception {
- //
- // Abuse: We 'know' that the first download is the sdk
- //
- final URL url = nashorn.getExternalFilePathsToCopy().get(0).getFirst();
- final HTTPResource resource = new HTTPResource(new HttpClientBuilder().buildClient(), url);
- final InputStream stream = resource.getInputStream();
- byte[] buffer;
- int count = 0;
- do {
- buffer = stream.readNBytes(10240);
- count += buffer.length;
- } while (buffer.length >= 10240);
- assertEquals(count, 539904);
- }
+ @Test
+ public void testDownload() throws Exception {
+ //
+ // Abuse: We 'know' that the first download is the sdk
+ //
+ final URL url = nashorn.getExternalFilePathsToCopy().get(0).getFirst();
+ final HTTPResource resource = new HTTPResource(new HttpClientBuilder().buildClient(), url);
+ final InputStream stream = resource.getInputStream();
+ byte[] buffer;
+ int count = 0;
+ do {
+ buffer = stream.readNBytes(10240);
+ count += buffer.length;
+ } while (buffer.length >= 10240);
+ assertEquals(count, 539904);
+ }
}
diff --git a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
index e358955..3affb79 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoDescription.java
@@ -40,12 +40,12 @@ public class RhinoDescription extends AbstractPluginDescription {
@Override
public List<URL> getUpdateURLs() throws IOException {
return List.of(
- new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"));
+ new URL("https://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=blob_plain;f=src/resources/main/plugins.props;hb=HEAD"));
}
@Override
public List<Pair<URL, Path>> getExternalFilePathsToCopy() throws IOException {
- return Collections.emptyList();
+ return Collections.emptyList();
}
@Override
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 2b35136..5895821 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
@@ -38,41 +38,41 @@ import net.shibboleth.idp.plugin.PluginVersion;
@SuppressWarnings("javadoc")
public class PluginTest {
- private PluginDescription rhino;
+ private PluginDescription rhino;
- @BeforeClass
- public void SetupPlugin() {
- final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
- for (final PluginDescription service:loader) {
- if ("net.shibboleth.idp.plugin.rhino".contentEquals(service.getPluginId())) {
- rhino = service;
- break;
- }
- }
- assertNotNull(rhino);
- }
+ @BeforeClass
+ public void SetupPlugin() {
+ final ServiceLoader<PluginDescription> loader = ServiceLoader.load(PluginDescription.class);
+ for (final PluginDescription service:loader) {
+ if ("net.shibboleth.idp.plugin.rhino".contentEquals(service.getPluginId())) {
+ rhino = service;
+ break;
+ }
+ }
+ assertNotNull(rhino);
+ }
- @Test
- public void testStateOld() throws ComponentInitializationException {
- final PluginState state = new PluginState(rhino);
- state.initialize();
- final PluginVersion version = new PluginVersion("0.1.0");
- assertTrue(state.getAvailableVersions().containsKey(version));
- 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
+ public void testStateOld() throws ComponentInitializationException {
+ final PluginState state = new PluginState(rhino);
+ state.initialize();
+ final PluginVersion version = new PluginVersion("0.1.0");
+ assertTrue(state.getAvailableVersions().containsKey(version));
+ 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
- public void testState() throws ComponentInitializationException {
- final PluginState state = new PluginState(rhino);
- state.initialize();
- 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")));
- }
-
+ @Test
+ public void testState() throws ComponentInitializationException {
+ final PluginState state = new PluginState(rhino);
+ state.initialize();
+ 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.
More information about the commits
mailing list