[java-metadata-aggregator] branch main updated: MDA-286 - Migrate testing APIs into sub-packages

[Ian Young]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
     new e653b12  MDA-286 - Migrate testing APIs into sub-packages
e653b12 is described below

commit e653b1267f43d0ff79b01c895f3cbfb0896f3a3a
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Apr 6 11:48:50 2023 +0100

    MDA-286 - Migrate testing APIs into sub-packages
    
    Move some test resources.
    
    https://shibboleth.atlassian.net/browse/MDA-286
---
 .../net/shibboleth/metadata/dom/{ => testing}/BaseDOMTest-prolog.xml    | 0
 .../resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js    | 2 +-
 .../resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js | 2 +-
 .../resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py | 2 +-
 .../resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb | 2 +-
 .../resources/net/shibboleth/metadata/{ => testing}/BaseTest-bytes.bin  | 0
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/testing/BaseDOMTest-prolog.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/BaseDOMTest-prolog.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/testing/BaseDOMTest-prolog.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
index d13b0f9..4f9e078 100644
--- a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
+++ b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-bad.js
@@ -3,7 +3,7 @@
 // "foo 0" for the first, "foo 1" for the second, etc.
 // BUT throw an exception after the first one.
 
-var TestMarker = Java.type('net.shibboleth.metadata.TestMarker')
+var TestMarker = Java.type('net.shibboleth.metadata.testing.TestMarker')
 for (i=0; i<items.length; i++) {
     item = items[i]
     marker = new TestMarker('foo ' + i);
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
index 5f3772d..d4ad3b0 100644
--- a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
+++ b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.js
@@ -1,7 +1,7 @@
 // Add a TestMarker to each item's item metadata
 // "foo 0" for the first, "foo 1" for the second, etc.
 
-var TestMarker = Java.type('net.shibboleth.metadata.TestMarker')
+var TestMarker = Java.type('net.shibboleth.metadata.testing.TestMarker')
 for (i=0; i<items.length; i++) {
     item = items[i]
     marker = new TestMarker('foo ' + i);
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
index 971f258..44643ac 100644
--- a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
+++ b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.py
@@ -1,7 +1,7 @@
 # Add a TestMarker to each item's item metadata
 # "foo 0" for the first, "foo 1" for the second, etc.
 
-from net.shibboleth.metadata import TestMarker;
+from net.shibboleth.metadata.testing import TestMarker;
 
 count = 0
 for item in items:
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
index 2d4942a..195bf14 100644
--- a/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
+++ b/mda-framework/src/test/resources/net/shibboleth/metadata/pipeline/ScriptletStage-script.rb
@@ -5,7 +5,7 @@ require 'java'
 count = 0
 
 $items.each do |item|
-    marker = Java::NetShibbolethMetadata::TestMarker.new("foo #{count}")
+    marker = Java::NetShibbolethMetadataTesting::TestMarker.new("foo #{count}")
     count += 1
     item.itemMetadata.put marker
 end
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin b/mda-framework/src/test/resources/net/shibboleth/metadata/testing/BaseTest-bytes.bin
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/BaseTest-bytes.bin
rename to mda-framework/src/test/resources/net/shibboleth/metadata/testing/BaseTest-bytes.bin

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