[java-opensaml COMMIT] in /trunk/opensaml-core/src/test/java/org/opensaml/core: config/provider/ClasspathConfiguratio...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 11 22:16:53 2013
New Revision: 3141

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3141&view=rev
Log:
Fix warnings.

Modified:
    trunk/opensaml-core/src/test/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSourceTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectChildrenListTest.java
    trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/XMLObjectSupportTest.java

Modified: trunk/opensaml-core/src/test/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSourceTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/test/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSourceTest.java?rev=3141&r1=3140&r2=3141&view=diff
==============================================================================
--- trunk/opensaml-core/src/test/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSourceTest.java (original)
+++ trunk/opensaml-core/src/test/java/org/opensaml/core/config/provider/ClasspathConfigurationPropertiesSourceTest.java Fri Jan 11 22:16:53 2013
@@ -21,7 +21,6 @@
 import org.testng.annotations.Test;
 import org.testng.annotations.BeforeMethod;
 import org.testng.Assert;
-import java.io.File;
 import java.util.Properties;
 
 import org.opensaml.core.config.ConfigurationPropertiesSource;
@@ -34,16 +33,8 @@
     /** The source to test. */
     private ConfigurationPropertiesSource source;
     
-    /** Master file with test data. */
-    private File masterFile;
-    
-    /** Actual target file test runs against. */
-    private File targetFile;
-    
     /** Constructor. */
     public ClasspathConfigurationPropertiesSourceTest() {
-        masterFile = new File("src/test/resources/opensaml-config.properties.TEST");
-        targetFile = new File("src/test/resources/opensaml-config.properties");
     }
     
     /** {@inheritDoc} */
@@ -54,9 +45,6 @@
     /** {@inheritDoc} */
     @AfterMethod
     protected void tearDown() throws Exception {
-        if (targetFile.exists()) {
-            //targetFile.delete();
-        }
     }
 
     /**
@@ -72,4 +60,4 @@
         Assert.assertEquals(props.getProperty("opensaml.initializer.foo.flag"), "true", "Incorrect property value");
     }
 
-}
+}

Modified: trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java?rev=3141&r1=3140&r2=3141&view=diff
==============================================================================
--- trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java (original)
+++ trunk/opensaml-core/src/test/java/org/opensaml/core/xml/NamespaceManagerTest.java Fri Jan 11 22:16:53 2013
@@ -24,7 +24,6 @@
 
 import javax.xml.namespace.QName;
 
-import net.shibboleth.utilities.java.support.collection.LazySet;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.xml.XmlConstants;
 
@@ -267,16 +266,6 @@
         
     }
     
-    private Set<Namespace> buildNamespaceSet(QName ... names) {
-        LazySet<Namespace> namespaces = new LazySet<Namespace>();
-        for (QName name : names) {
-            if (name != null) {
-                namespaces.add(buildNamespace(name));
-            }
-        }
-        return namespaces;
-    }
-    
     private Namespace buildNamespace(QName name) {
         String uri = StringSupport.trimOrNull(name.getNamespaceURI());
         if (uri == null) {
@@ -305,4 +294,4 @@
     }
 
 
-}
+}

Modified: trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java?rev=3141&r1=3140&r2=3141&view=diff
==============================================================================
--- trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java (original)
+++ trunk/opensaml-core/src/test/java/org/opensaml/core/xml/XMLObjectBaseTestCase.java Fri Jan 11 22:16:53 2013
@@ -33,7 +33,6 @@
 import net.shibboleth.utilities.java.support.xml.XMLAssertTestNG;
 import org.custommonkey.xmlunit.XMLUnit;
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.core.config.InitializationService;
 import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.core.xml.io.Marshaller;
 import org.opensaml.core.xml.io.MarshallerFactory;

Modified: trunk/opensaml-core/src/test/java/org/opensaml/core/xml/util/AttributeMapTest.java

[... 83 lines stripped ...]