[utilities COMMIT] in /java-support/trunk/src: main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScr...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr  8 07:00:09 2013
New Revision: 368

URL: http://svn.shibboleth.net/view/utilities?rev=368&view=rev
Log:
IDP-205 add getScriptLanguage() method to allow better testing of the scripted attribute definition parser.

Modified:
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
    java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java?rev=368&r1=367&r2=368&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java Mon Apr  8 07:00:09 2013
@@ -114,6 +114,15 @@
     }
 
     /**
+     * Gets the script language.
+     * 
+     * @return the script source
+     */
+    @Nonnull public String getScriptLanguage() {
+        return scriptLanguage;
+    }
+
+    /**
      * Evaluates this script against the given bindings.
      * 
      * @param scriptBindings the script bindings

Modified: java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java?rev=368&r1=367&r2=368&view=diff
==============================================================================
--- java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java (original)
+++ java-support/trunk/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java Mon Apr  8 07:00:09 2013
@@ -77,7 +77,7 @@
         s.write(TEST_SIMPLE_SCRIPT, 0, TEST_SIMPLE_SCRIPT.length());
         s.close();
 
-        new EvaluableScript(SCRIPT_LANGUAGE, f);
+        Assert.assertEquals((new EvaluableScript(SCRIPT_LANGUAGE, f)).getScriptLanguage(), SCRIPT_LANGUAGE);
 
         try {
             new EvaluableScript(null, f);