[java-metadata-aggregator] branch master updated: MDA-225 - Use correct TestNG annotation for a per-method setup method

Ian Young ian at iay.org.uk
Thu Nov 7 05:31:52 EST 2019


This is an automated email from the git hooks/post-receive script.

iay pushed a commit to branch master
in repository java-metadata-aggregator.

View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=1095b9dade76d2c20cdbb0514213869c59f3c84a

The following commit(s) were added to refs/heads/master by this push:
       new  1095b9d   MDA-225 - Use correct TestNG annotation for a per-method setup method
1095b9d is described below

commit 1095b9dade76d2c20cdbb0514213869c59f3c84a
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Nov 7 10:31:47 2019 +0000

    MDA-225 - Use correct TestNG annotation for a per-method setup method
    
    https://issues.shibboleth.net/jira/browse/MDA-225
---
 .../metadata/dom/saml/AttributeElementMatcherTest.java       | 12 ++++++------
 .../metadata/dom/saml/AttributeValueElementMatcherTest.java  | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
index 55af283..7b43506 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeElementMatcherTest.java
@@ -1,17 +1,17 @@
 
 package net.shibboleth.metadata.dom.saml;
 
-import net.shibboleth.metadata.dom.BaseDOMTest;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import com.google.common.base.Predicate;
 
+import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 public class AttributeElementMatcherTest extends BaseDOMTest {
 
     private final Document doc;
@@ -23,8 +23,8 @@ public class AttributeElementMatcherTest extends BaseDOMTest {
         doc = getParserPool().newDocument();
     }
 
-    @BeforeTest
-    private void beforeTest() throws Exception {
+    @BeforeMethod
+    private void beforeMethod() throws Exception {
         attr = ElementSupport.constructElement(doc, SAMLSupport.ATTRIBUTE_NAME);
     }
 
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
index 9dfd16c..95a0228 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/AttributeValueElementMatcherTest.java
@@ -1,17 +1,17 @@
 
 package net.shibboleth.metadata.dom.saml;
 
-import net.shibboleth.metadata.dom.BaseDOMTest;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.testng.Assert;
-import org.testng.annotations.BeforeTest;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
 import com.google.common.base.Predicate;
 
+import net.shibboleth.metadata.dom.BaseDOMTest;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 public class AttributeValueElementMatcherTest extends BaseDOMTest {
 
     private final Document doc;
@@ -23,8 +23,8 @@ public class AttributeValueElementMatcherTest extends BaseDOMTest {
         doc = getParserPool().newDocument();
     }
 
-    @BeforeTest
-    private void beforeTest() throws Exception {
+    @BeforeMethod
+    private void beforeMethod() throws Exception {
         value = ElementSupport.constructElement(doc, SAMLSupport.ATTRIBUTE_VALUE_NAME);
     }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list