[xmlsectool] 02/02: Work round Maven's conventions for TestNG class names.

[Ian Young]

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

iay pushed a commit to branch master
in repository xmlsectool.

commit 1ebf0df2abd6785cb124eec2418bd1d3c124f519
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed May 25 11:06:52 2016 +0100

    Work round Maven's conventions for TestNG class names.
---
 src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java          | 4 +++-
 .../net/shibboleth/tool/xmlsectool/{XSTJ51.java => XSTJ51Test.java} | 6 +++---
 .../tool/xmlsectool/{XSTJ59Test-dsa1024.crt => XSTJ59-dsa1024.crt}  | 0
 .../tool/xmlsectool/{XSTJ59Test-dsa1024.key => XSTJ59-dsa1024.key}  | 0
 .../shibboleth/tool/xmlsectool/{XSTJ59Test-in.xml => XSTJ59-in.xml} | 0
 .../tool/xmlsectool/{XSTJ59Test-out1024.xml => XSTJ59-out1024.xml}  | 0
 6 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
index 443189f..8e9895d 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/BaseTest.java
@@ -68,11 +68,13 @@ public abstract class BaseTest {
      * Converts the "."-separated name of a class or package into an
      * absolute path.
      * 
+     * Names ending with "Test" have that value stripped before use.
+     * 
      * @param name name to be converted
      * @return path to resources associated with the name
      */
     private String nameToPath(final String name) {
-        return "/" + name.replace('.', '/');
+        return "/" + name.replace('.', '/').replaceAll("Test$", "");
     }
         
     /**
diff --git a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51.java b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
similarity index 96%
rename from src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51.java
rename to src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
index 240c81d..39d42fc 100644
--- a/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51.java
+++ b/src/test/java/net/shibboleth/tool/xmlsectool/XSTJ51Test.java
@@ -16,10 +16,10 @@ import org.w3c.dom.Element;
 import net.shibboleth.utilities.java.support.xml.ElementSupport;
 import net.shibboleth.utilities.java.support.xml.SchemaBuilder.SchemaLanguage;
 
-public class XSTJ51 extends BaseTest {
+public class XSTJ51Test extends BaseTest {
 
-    XSTJ51() {
-        super(XSTJ51.class);
+    XSTJ51Test() {
+        super(XSTJ51Test.class);
     }
     
     @Test
diff --git a/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-dsa1024.crt b/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-dsa1024.crt
similarity index 100%
rename from src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-dsa1024.crt
rename to src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-dsa1024.crt
diff --git a/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-dsa1024.key b/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-dsa1024.key
similarity index 100%
rename from src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-dsa1024.key
rename to src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-dsa1024.key
diff --git a/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-in.xml b/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-in.xml
similarity index 100%
rename from src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-in.xml
rename to src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-in.xml
diff --git a/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-out1024.xml b/src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-out1024.xml
similarity index 100%
rename from src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59Test-out1024.xml
rename to src/test/resources/net/shibboleth/tool/xmlsectool/XSTJ59-out1024.xml

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