summaryrefslogtreecommitdiff
path: root/bkucommon
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-02-02 17:10:20 (GMT)
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2010-02-02 17:10:20 (GMT)
commit703d8ded0f42d445b38dbc84ae2a376bfc31b141 (patch)
tree33e962b9a07feb9f00a9ff36e92e3306c7510c66 /bkucommon
parent4ecb7d48fbece6f788809bd447fdcdef3d83e993 (diff)
downloadmocca-703d8ded0f42d445b38dbc84ae2a376bfc31b141.zip
mocca-703d8ded0f42d445b38dbc84ae2a376bfc31b141.tar.gz
mocca-703d8ded0f42d445b38dbc84ae2a376bfc31b141.tar.bz2
SignatureLocation index bug
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@620 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'bkucommon')
-rw-r--r--bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java12
-rw-r--r--bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml2
-rw-r--r--bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml2
-rw-r--r--bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml2
-rw-r--r--bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml2
-rw-r--r--bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml2
6 files changed, 12 insertions, 10 deletions
diff --git a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
index ccd29e8..0a34c8f 100644
--- a/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
+++ b/bkucommon/src/test/java/at/gv/egiz/bku/slcommands/impl/xsect/SignatureTest.java
@@ -79,6 +79,8 @@ import at.gv.egiz.dom.DOMUtils;
import at.gv.egiz.slbinding.RedirectEventFilter;
import at.gv.egiz.slbinding.RedirectUnmarshallerListener;
import org.junit.Ignore;
+import org.w3c.dom.NodeList;
+import static org.junit.Assert.*;
public class SignatureTest {
@@ -271,7 +273,7 @@ public class SignatureTest {
assertNotNull(nextSibling);
assertTrue("urn:document".equals(nextSibling.getNamespaceURI()));
assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-
+
}
@Test
@@ -311,7 +313,7 @@ public class SignatureTest {
assertNotNull(nextSibling);
assertTrue("Paragraph".equals(nextSibling.getLocalName()));
-
+
}
@Test
@@ -325,13 +327,13 @@ public class SignatureTest {
Node parent = signature.getParent();
Node nextSibling = signature.getNextSibling();
-
+
assertNotNull(parent);
assertTrue("urn:document".equals(parent.getNamespaceURI()));
assertTrue("Whole".equals(parent.getLocalName()));
-
+
assertNull(nextSibling);
-
+
}
@Test
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
index dac81be..7cf3f09 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_1.xml
@@ -18,6 +18,6 @@ cnN0ZSBBYnNhdHogaW4gZGllc2VtIERva3VtZW50LjwvZG9jOlBhcmFncmFwaD4NCiAgPGRvYzpQ
YXJhZ3JhcGg+VW5kIGljaCBiaW4gZGVyIHp3ZWl0ZSBBYnNhdHogaW4gZGllc2VtIERva3VtZW50
LjwvZG9jOlBhcmFncmFwaD4NCjwvZG9jOlhNTERvY3VtZW50Pg0K</sl:Base64Content>
</sl:SignatureEnvironment>
- <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/doc:XMLDocument</sl:SignatureLocation>
+ <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/doc:XMLDocument</sl:SignatureLocation>
</sl:SignatureInfo>
</sl:CreateXMLSignatureRequest> \ No newline at end of file
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
index 7d8c7c0..69373ac 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_2.xml
@@ -8,7 +8,7 @@ cmFwaD4NCiAgICA8UGFyYWdyYXBoIFBhcmFJZD0iUGFyYTIiPlVuZCBpY2ggYmluIGRlciB6d2Vp
dGUgQWJzYXR6IGluIGRpZXNlbSBEb2t1bWVudC4NCiAgICBJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBl
aWdlbmVucyBJRC1BdHRyaWJ1dCBiZWtvbW1lbi48L1BhcmFncmFwaD4NCjwvWE1MRG9jdW1lbnQ+</sl:Base64Content>
</sl:SignatureEnvironment>
- <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/XMLDocument</sl:SignatureLocation>
+ <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/XMLDocument</sl:SignatureLocation>
<sl:Supplement>
<sl:Content Reference="urn:Document.dtd">
<sl:LocRefContent>testlocal:Document.dtd</sl:LocRefContent>
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
index 91425a9..c3d8ba2 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Base64_3.xml
@@ -8,7 +8,7 @@ cmFwaD4NCiAgICA8UGFyYWdyYXBoIFBhcmFJZD0iUGFyYTIiPlVuZCBpY2ggYmluIGRlciB6d2Vp
dGUgQWJzYXR6IGluIGRpZXNlbSBEb2t1bWVudC4NCiAgICBJY2ggaGFiZSB3ZWl0ZXJzIGVpbiBl
aWdlbmVucyBJRC1BdHRyaWJ1dCBiZWtvbW1lbi48L1BhcmFncmFwaD4NCjwvWE1MRG9jdW1lbnQ+</sl:Base64Content>
</sl:SignatureEnvironment>
- <sl:SignatureLocation xmlns:doc="urn:document" Index="2">/XMLDocument</sl:SignatureLocation>
+ <sl:SignatureLocation xmlns:doc="urn:document" Index="1">/XMLDocument</sl:SignatureLocation>
<sl:Supplement>
<sl:Content Reference="urn:Document.dtd">
<sl:Base64Content>PCFFTEVNRU5UIFhNTERvY3VtZW50ICgjUENEQVRBIHwgUGFyYWdyYXBoKSo+DQo8IUVMRU1FTlQg
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
index d1589f2..98a77fb 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_Reference_1.xml
@@ -1,7 +1,7 @@
<sl:CreateXMLSignatureRequest xmlns:sl="http://www.buergerkarte.at/namespaces/securitylayer/1.2#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
<sl:SignatureInfo>
<sl:SignatureEnvironment Reference="testlocal:SignatureEnvironment1.xml"/>
- <sl:SignatureLocation Index="0" xmlns:doc="urn:document">id("Para2")</sl:SignatureLocation>
+ <sl:SignatureLocation Index="1" xmlns:doc="urn:document">id("Para2")</sl:SignatureLocation>
<sl:Supplement>
<sl:Content Reference="urn:XMLDocument.xsd">
<sl:LocRefContent>testlocal:XMLDocument.xsd</sl:LocRefContent>
diff --git a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
index 79e9199..e0a97e3 100644
--- a/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
+++ b/bkucommon/src/test/resources/at/gv/egiz/bku/slcommands/impl/SignatureInfo_XMLContent_1.xml
@@ -8,6 +8,6 @@
</doc:Whole>
</sl:XMLContent>
</sl:SignatureEnvironment>
- <sl:SignatureLocation xmlns:doc="urn:document" Index="4">/doc:Whole</sl:SignatureLocation>
+ <sl:SignatureLocation xmlns:doc="urn:document" Index="5">/doc:Whole</sl:SignatureLocation>
</sl:SignatureInfo>
</sl:CreateXMLSignatureRequest> \ No newline at end of file