Commits

tsl@kvalitetsit.dk authored b1bc5b2796e 
[SDS-4783] Adjust tests for using local running sts

git-svn-id: https://svn.nspop.dk/svn/components/sosigw/branches/SDS-4783@7572 3203d48c-b89f-428c-a2b9-71f4dc330d7c
No tags
5ac0a9b1eae
main

src/test/java/com/trifork/sosigw/ws/PassThroughProxyTest.java

Modified
91 91 disablePassThroughOnSignatureInServer();
92 92 createSignedIdCard();
93 93 ​
94 94 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
95 95 addSignatureElements(securityHeader);
96 96 ​
97 97 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);
98 98 ​
99 99 String response = client.doInvoke(null, securityHeader, "", 0, 0, SERVER_URL + "/proxy/soap-request", false);
100 100 assertEquals("Incorrect response from service stub", "#", response);
101 - assertTrue("ID card was not exchanged", lastRequest.toString().indexOf("Issuer>TEST1-NSP-STS<") != -1);
101 + assertTrue("ID card was not exchanged", lastRequest.toString().matches(".*Issuer>TEST.*STS.*Issuer>.*"));
102 102 }
103 103 ​
104 104 @Test
105 105 public void testNoPassThroughWithoutSignature() throws Exception {
106 106 createSignedIdCard();
107 107
108 108 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
109 109
110 110 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);
111 111
112 112 String response = client.doInvoke(null, securityHeader, "", 0, 0, SERVER_URL + "/proxy/soap-request", false);
113 113 assertEquals("Incorrect response from service stub", "#", response);
114 - assertTrue("ID card was not exchanged", lastRequest.toString().indexOf("Issuer>TEST1-NSP-STS<") != -1);
114 + assertTrue("ID card was not exchanged", lastRequest.toString().matches(".*Issuer>TEST.*STS.*Issuer>.*"));
115 115 }
116 116 ​
117 117 @Test
118 118 public void testNoPassThroughWithoutDigestValue() throws Exception {
119 119 createSignedIdCard();
120 120
121 121 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
122 122 addSignatureElements(securityHeader);
123 123 securityHeader.getAssertion().getSignature().setSignedInfo(null);
124 124
125 125 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);
126 126
127 127 String response = client.doInvoke(null, securityHeader, "", 0, 0, SERVER_URL + "/proxy/soap-request", false);
128 128 assertEquals("Incorrect response from service stub", "#", response);
129 - assertTrue("ID card was not exchanged", lastRequest.toString().indexOf("Issuer>TEST1-NSP-STS<") != -1);
129 + assertTrue("ID card was not exchanged", lastRequest.toString().matches(".*Issuer>TEST.*STS.*Issuer>.*"));
130 130 }
131 131 ​
132 132 @Test
133 133 public void testNoPassThroughWithoutSignatureValue() throws Exception {
134 134 createSignedIdCard();
135 135
136 136 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
137 137 addSignatureElements(securityHeader);
138 138 securityHeader.getAssertion().getSignature().setSignatureValue(null);
139 139
140 140 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);
141 141
142 142 String response = client.doInvoke(null, securityHeader, "", 0, 0, SERVER_URL + "/proxy/soap-request", false);
143 143 assertEquals("Incorrect response from service stub", "#", response);
144 - assertTrue("ID card was not exchanged", lastRequest.toString().indexOf("Issuer>TEST1-NSP-STS<") != -1);
144 + assertTrue("ID card was not exchanged", lastRequest.toString().matches(".*Issuer>TEST.*STS.*Issuer>.*"));
145 145 }
146 146 ​
147 147 @Test
148 148 public void testNoPassThroughWithoutX509Certificate() throws Exception {
149 149 createSignedIdCard();
150 150
151 151 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
152 152 addSignatureElements(securityHeader);
153 153 securityHeader.getAssertion().getSignature().setKeyInfo(null);
154 154
155 155 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);
156 156
157 157 String response = client.doInvoke(null, securityHeader, "", 0, 0, SERVER_URL + "/proxy/soap-request", false);
158 158 assertEquals("Incorrect response from service stub", "#", response);
159 - assertTrue("ID card was not exchanged", lastRequest.toString().indexOf("Issuer>TEST1-NSP-STS<") != -1);
159 + assertTrue("ID card was not exchanged", lastRequest.toString().matches(".*Issuer>TEST.*STS.*Issuer>.*"));
160 160 }
161 161
162 162 @Test
163 163 public void testPassThroughWithAllSignatureElements() throws Exception {
164 164 createSignedIdCard();
165 165 ​
166 166 Security securityHeader = IdCardTestUtils.makeIDCardInSecurity();
167 167 addSignatureElements(securityHeader);
168 168 ​
169 169 ServiceStubClient client = new ServiceStubClient("localhost:8586", true, true, true, false, false);

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut