Fix logging level and appenders

Restore accidentially removed newSession parameter field value

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1896 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/tests/edu/internet2/middleware/shibboleth/integration/IntegrationTest.java b/tests/edu/internet2/middleware/shibboleth/integration/IntegrationTest.java
index 28e498b..f4b9733 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/integration/IntegrationTest.java
+++ b/tests/edu/internet2/middleware/shibboleth/integration/IntegrationTest.java
@@ -53,7 +53,7 @@ public class IntegrationTest extends TestCase {
         super.setUp();
 
         // Static call to set Log4J appenders and levels
-        ShibbolethRunner.loglevel = Level.INFO;
+        ShibbolethRunner.loglevel = Level.DEBUG;
         ShibbolethRunner.setupLogging();
         
         // Create the overall testing framework
@@ -81,6 +81,7 @@ public class IntegrationTest extends TestCase {
         // is done before the SSO.
         Attributes attributes = runner.getAttributesCollection();
         attributes.put(new BasicAttribute("eduPersonAffiliation", "member"));
+        attributes.put(new BasicAttribute("eduPersonScopedAffiliation", "member"));
         attributes.put(new BasicAttribute("title", "clown"));
         attributes.put(new BasicAttribute("givenName", "bozo"));
         attributes.put(new BasicAttribute("surname", "Clown"));
@@ -123,6 +124,8 @@ public class IntegrationTest extends TestCase {
         // Build the parameter for Session creation
         NewSessionData data = new NewSessionData();
         FilterUtil.sessionDataFromRequest(data,idp.request);
+        data.SAMLResponse = bin64assertion; // test logic 
+        data.target=targetURL;
         data.applicationId="default";
         data.handlerURL=handlerURL;
         data.providerId="https://sp.example.org/shibboleth";
@@ -189,6 +192,8 @@ public class IntegrationTest extends TestCase {
         // Build the parameter for Session creation
         NewSessionData data = new NewSessionData();
         FilterUtil.sessionDataFromRequest(data,idp.request);
+        data.SAMLResponse = bin64assertion; // test logic 
+        data.target=targetURL;
         data.applicationId="default";
         data.handlerURL=handlerURL;
         data.providerId="https://sp.example.org/shibboleth";

diff --git a/tests/edu/internet2/middleware/shibboleth/runner/ShibbolethRunner.java b/tests/edu/internet2/middleware/shibboleth/runner/ShibbolethRunner.java
index 503839c..36dc08d 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/runner/ShibbolethRunner.java
+++ b/tests/edu/internet2/middleware/shibboleth/runner/ShibbolethRunner.java
@@ -86,7 +86,7 @@ public class ShibbolethRunner {
      */
     public static Level loglevel = Level.INFO;
     
-    private static Logger clientLogger = Logger.getLogger("edu.internet2.middleware");
+    private static Logger clientLogger = Logger.getLogger("edu.internet2.middleware.shibboleth");
     private static Logger initLogger = Logger.getLogger("shibboleth.init");
     private static Logger samlLogger = Logger.getLogger("org.opensaml");
     private static boolean manageLogs = false;
@@ -105,10 +105,14 @@ public class ShibbolethRunner {
         Logger root = Logger.getRootLogger();
         Layout initLayout = new PatternLayout("%d{HH:mm} %-5p %m%n");
         ConsoleAppender consoleAppender= new ConsoleAppender(initLayout,ConsoleAppender.SYSTEM_OUT);
+        root.removeAllAppenders();
         root.addAppender(consoleAppender);
         root.setLevel(Level.ERROR);
+        clientLogger.removeAllAppenders();
         clientLogger.setLevel(loglevel);
+        initLogger.removeAllAppenders();
         initLogger.setLevel(loglevel);
+        samlLogger.removeAllAppenders();
         samlLogger.setLevel(loglevel);
     }
     
@@ -119,8 +123,11 @@ public class ShibbolethRunner {
      */
     public static void resetLoggingLevels() {
         if (!manageLogs) return;  // If setupLogging was never called.
+        clientLogger.removeAllAppenders();
         clientLogger.setLevel(loglevel);
+        initLogger.removeAllAppenders();
         initLogger.setLevel(loglevel);
+        samlLogger.removeAllAppenders();
         samlLogger.setLevel(loglevel);
         
     }
@@ -267,6 +274,7 @@ public class ShibbolethRunner {
             // NOTE: The IdP reads its configuration file and initializes
             // itself within this call.
             idpServlet = (IdPResponder) testModule.createServlet(IdPResponder.class);
+            resetLoggingLevels();
             
             // Unchanging properties of the HttpServletRequest
             request.setRemoteAddr("127.0.0.1");