[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Apr 23 22:18:53 2012
New Revision: 4181

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4181&view=rev
Log:
Tidy tests.  Use BeforeClass rather than the needlessly convoluted BeforeSuite...

Modified:
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1ByteAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1StringAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml1XmlObjectSubjectNameIdentifierEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2ByteAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2StringAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectAttributeEncoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/encoding/Saml2XmlObjectSubjectNameIDEncoderTest.java

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java?rev=4181&r1=4180&r2=4181&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java Mon Apr 23 22:18:53 2012
@@ -34,7 +34,7 @@
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.testng.Assert;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Lists;
@@ -58,7 +58,7 @@
 
     private final String ATTRIBUTE_VALUE_2 = "attrValueTwo";
     
-    @BeforeSuite(dependsOnGroups={"opensaml.init"}) public void initTest() throws ComponentInitializationException {
+    @BeforeClass public void initTest() throws ComponentInitializationException {
         theBuilder = new XSStringBuilder();
     }
 

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java?rev=4181&r1=4180&r2=4181&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoderTest.java Mon Apr 23 22:18:53 2012
@@ -36,7 +36,7 @@
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.testng.Assert;
-import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import com.google.common.collect.Lists;
@@ -62,7 +62,7 @@
 
     private final String FRIENDLY_NAME = "friendly";
     
-    @BeforeSuite(dependsOnGroups={"opensaml.init"}) public void initTest() throws ComponentInitializationException {
+    @BeforeClass public void initTest() throws ComponentInitializationException {
         theBuilder = new XSStringBuilder();
     }
 

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java?rev=4181&r1=4180&r2=4181&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoderTest.java Mon Apr 23 22:18:53 2012
@@ -39,7 +39,7 @@
 import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.opensaml.saml.common.SAMLObject;

[... 208 lines stripped ...]