[java-identity-provider] 01/03: Spring bean file is optional for command lines

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=22021986120a5ab6b8de0ce5a795658bd6a3dfd4

commit 22021986120a5ab6b8de0ce5a795658bd6a3dfd4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Sep 8 16:29:02 2020 +0100

    Spring bean file is optional for command lines
---
 .../shibboleth/idp/installer/plugin/PluginCLITest.java | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java
index aedb9114c..eebc2b35d 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/PluginCLITest.java
@@ -19,7 +19,6 @@ package net.shibboleth.idp.installer.plugin;
 
 import static org.testng.Assert.assertEquals;
 
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,39 +43,34 @@ public class PluginCLITest extends BasePluginTest {
     
     private final String RHINO_DISTRO = "https://build.shibboleth.net/nexus/service/local/repositories/releases/content/net/shibboleth/idp/plugin/scripting/idp-plugin-rhino-dist/0.1.2/idp-plugin-rhino-dist-0.1.2.tar.gz";
 
-    private File plugin;
-
     @BeforeSuite public void setUp() throws IOException
     {
         System.setProperty("idp.home",getIdpHome().toString());
-        plugin = getIdpHome().resolve("conf").resolve("admin").resolve("plugin-installer.xml").toFile();
     }
 
     @Test(enabled = true) public void testList() throws IOException {
-        assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(), "-fl", } ),
-                AbstractCommandLine.RC_OK);
+        assertEquals(PluginInstallerCLI.runMain(new String[] { "-fl", } ), AbstractCommandLine.RC_OK);
     }
 
     @Test(enabled = true) public void testWrong() {
-        assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(), "-i", "a"}),
-                AbstractCommandLine.RC_INIT);
+        assertEquals(PluginInstallerCLI.runMain(new String[] { "-i", "a"}), AbstractCommandLine.RC_INIT);
     }
 
     @Test(enabled = true, dependsOnMethods = {"testRhinoLocal"}) public void testRhinoWeb() {
-            assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(),
+            assertEquals(PluginInstallerCLI.runMain(new String[] { 
                     "-i", RHINO_DISTRO,
                     "-p", "net.shibboleth.idp.plugin.rhino"}),
                     AbstractCommandLine.RC_OK);
     }
 
     @Test(dependsOnMethods = {"testRhinoWeb"})  public void testUpdate() {
-        assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(),
+        assertEquals(PluginInstallerCLI.runMain(new String[] {
                 "-u", "net.shibboleth.idp.plugin.rhino"}),
                 AbstractCommandLine.RC_OK);
     }
 
     @Test(dependsOnMethods = {"testUpdate"})  public void testForceUpdate() {
-        assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(),
+        assertEquals(PluginInstallerCLI.runMain(new String[] {
                 "-u", "net.shibboleth.idp.plugin.rhino",
                 "-fu", "0.1.2" }),
                 AbstractCommandLine.RC_OK);
@@ -112,7 +106,7 @@ public class PluginCLITest extends BasePluginTest {
             //
             // try again
             //
-            assertEquals(PluginInstallerCLI.runMain(new String[] { plugin.getAbsolutePath(), 
+            assertEquals(PluginInstallerCLI.runMain(new String[] { 
                     "-i", unpack.resolve("rhino.tar.gz").toString(),
                     "-p", "net.shibboleth.idp.plugin.rhino"}),
                     AbstractCommandLine.RC_OK);

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