svn commit: r1411380 - in /airavata/trunk/modules: rest/service/src/test/java/org/apache/airavata/security/configurations/ security/src/test/java/org/apache/airavata/security/configurations/

[lahiru]

Author: lahiru
Date: Mon Nov 19 20:03:08 2012
New Revision: 1411380

URL: http://svn.apache.org/viewvc?rev=1411380&view=rev
Log:
Applying patch given for https://issues.apache.org/jira/browse/AIRAVATA-646.

Modified:
    
airavata/trunk/modules/rest/service/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
    
airavata/trunk/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java

Modified: 
airavata/trunk/modules/rest/service/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java?rev=1411380&r1=1411379&r2=1411380&view=diff
==============================================================================
--- 
airavata/trunk/modules/rest/service/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
 (original)
+++ 
airavata/trunk/modules/rest/service/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
 Mon Nov 19 20:03:08 2012
@@ -26,6 +26,7 @@ import org.apache.airavata.security.user
 import org.apache.airavata.security.userstore.LDAPUserStore;
 
 import java.io.File;
+import java.net.URLDecoder;
 import java.util.List;
 
 /**
@@ -38,6 +39,8 @@ public class AuthenticatorConfigurationR
 
     public void setUp() throws Exception {
 
+        configurationFile = URLDecoder.decode(configurationFile);
+
         File f = new File(".");
         System.out.println(f.getAbsolutePath());
 
@@ -104,7 +107,8 @@ public class AuthenticatorConfigurationR
     public void testDisabledAuthenticator() throws Exception {
 
         String disabledConfiguration
-                = 
this.getClass().getClassLoader().getResource("disabled-authenticator.xml").getFile();
+                = URLDecoder.decode(
+                
this.getClass().getClassLoader().getResource("disabled-authenticator.xml").getFile());
 
 
         AuthenticatorConfigurationReader authenticatorConfigurationReader

Modified: 
airavata/trunk/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java?rev=1411380&r1=1411379&r2=1411380&view=diff
==============================================================================
--- 
airavata/trunk/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
 (original)
+++ 
airavata/trunk/modules/security/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java
 Mon Nov 19 20:03:08 2012
@@ -6,6 +6,7 @@ import org.apache.airavata.security.user
 import org.apache.airavata.security.userstore.LDAPUserStore;
 
 import java.io.File;
+import java.net.URLDecoder;
 import java.util.List;
 
 /**
@@ -14,7 +15,8 @@ import java.util.List;
  */
 public class AuthenticatorConfigurationReaderTest extends TestCase {
 
-    private String configurationFile = 
this.getClass().getClassLoader().getResource("authenticators.xml").getFile();
+    private String configurationFile = URLDecoder.decode(
+            
this.getClass().getClassLoader().getResource("authenticators.xml").getFile());
 
     public void setUp() throws Exception {
 
@@ -84,7 +86,8 @@ public class AuthenticatorConfigurationR
     public void testDisabledAuthenticator() throws Exception {
 
         String disabledConfiguration
-                = 
this.getClass().getClassLoader().getResource("disabled-authenticator.xml").getFile();
+                = URLDecoder.decode(
+                
this.getClass().getClassLoader().getResource("disabled-authenticator.xml").getFile());
 
 
         AuthenticatorConfigurationReader authenticatorConfigurationReader