Skip to content

Commit ef2eaaf

Browse files
lsholsho
committed
Fix 14.1.1.0 .NET Core test failures
[git-p4: depot-paths = "//dev/release.net/coherence-net-v14.1.1.0-core/": change = 112088]
1 parent 984c49c commit ef2eaaf

File tree

5 files changed

+268
-8
lines changed

5 files changed

+268
-8
lines changed

‎tests/Coherence.Core.Tests/Net/Impl/SSLOneWayRemoteNamedCacheTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ protected override String TestCacheName
2222
[SetUp]
2323
public void SetUp()
2424
{
25-
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
25+
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
2626
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
2727
{
28-
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
28+
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
2929
}
3030

3131
var ccf = new DefaultConfigurableCacheFactory(configFileName);

‎tests/Coherence.Core.Tests/Net/Impl/SSLRemoteNamedCacheTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ protected String TwoWayCacheName
3636
[SetUp]
3737
public void SetUp()
3838
{
39-
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
39+
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
4040
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
4141
{
42-
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
42+
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
4343
}
4444

4545
var ccf = new DefaultConfigurableCacheFactory(configFileName);

‎tests/Coherence.Core.Tests/Net/Impl/SSLTwoWayRemoteNamedCacheTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ protected override String TestCacheName
2323
[SetUp]
2424
public void SetUp()
2525
{
26-
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
26+
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
2727
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
2828
{
29-
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
29+
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
3030
}
3131

3232
var ccf = new DefaultConfigurableCacheFactory(configFileName);

‎tests/Coherence.Core.Tests/Net/Impl/TLS12OneWayRemoteNamedCacheTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ protected override String TestCacheName
2323
[SetUp]
2424
public void SetUp()
2525
{
26-
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
26+
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
2727
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
2828
{
29-
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
29+
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
3030
}
3131

3232
var ccf = new DefaultConfigurableCacheFactory(configFileName);

‎tests/Coherence.Core.Tests/Resources/s4hc-cache-config-ssl.xml

Lines changed: 260 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,260 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2000, 2024, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
7+
-->
8+
<cache-config xmlns="http://schemas.tangosol.com/cache">
9+
<caching-scheme-mapping>
10+
<cache-mapping>
11+
<cache-name>dist-extend-direct</cache-name>
12+
<scheme-name>extend-direct</scheme-name>
13+
</cache-mapping>
14+
15+
<cache-mapping>
16+
<cache-name>dist-extend-direct-temp</cache-name>
17+
<scheme-name>extend-direct</scheme-name>
18+
</cache-mapping>
19+
20+
<cache-mapping>
21+
<cache-name>dist-extend-oneway-ssl</cache-name>
22+
<scheme-name>extend-direct-oneway-ssl</scheme-name>
23+
</cache-mapping>
24+
25+
<cache-mapping>
26+
<cache-name>dist-extend-twoway-ssl</cache-name>
27+
<scheme-name>extend-direct-twoway-ssl</scheme-name>
28+
</cache-mapping>
29+
30+
<cache-mapping>
31+
<cache-name>dist-extend-tls12</cache-name>
32+
<scheme-name>extend-direct-tls12</scheme-name>
33+
</cache-mapping>
34+
</caching-scheme-mapping>
35+
36+
<caching-schemes>
37+
<remote-cache-scheme>
38+
<scheme-name>extend-direct</scheme-name>
39+
<service-name>ExtendTcpCacheService</service-name>
40+
<initiator-config>
41+
<tcp-initiator>
42+
<local-address>
43+
<address>127.0.0.1</address>
44+
<port>0</port>
45+
</local-address>
46+
<remote-addresses>
47+
<address-provider>ap1</address-provider>
48+
</remote-addresses>
49+
</tcp-initiator>
50+
<outgoing-message-handler>
51+
<heartbeat-interval>1s</heartbeat-interval>
52+
<heartbeat-timeout>10s</heartbeat-timeout>
53+
<request-timeout>0s</request-timeout>
54+
</outgoing-message-handler>
55+
<use-filters>
56+
<filter-name>gzip</filter-name>
57+
</use-filters>
58+
<connect-timeout>30s</connect-timeout>
59+
</initiator-config>
60+
</remote-cache-scheme>
61+
62+
<remote-cache-scheme>
63+
<scheme-name>extend-direct-oneway-ssl</scheme-name>
64+
<service-name>ExtendTcpCacheServiceOneWaySSL</service-name>
65+
<proxy-service-name>ExtendTcpProxyServiceOneWaySSL</proxy-service-name>
66+
<initiator-config>
67+
<tcp-initiator>
68+
<stream-provider>
69+
<ssl>
70+
<protocol>Tls12</protocol>
71+
<remote-certificate-validator>
72+
<delegate>
73+
<type>static</type>
74+
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
75+
<method-name>IgnoreCommonNameCertificateValidation</method-name>
76+
</delegate>
77+
</remote-certificate-validator>
78+
</ssl>
79+
</stream-provider>
80+
<remote-addresses>
81+
<socket-address>
82+
<address>127.0.0.1</address>
83+
<port>9700</port>
84+
</socket-address>
85+
</remote-addresses>
86+
</tcp-initiator>
87+
<outgoing-message-handler>
88+
<heartbeat-interval>1s</heartbeat-interval>
89+
<heartbeat-timeout>10s</heartbeat-timeout>
90+
</outgoing-message-handler>
91+
</initiator-config>
92+
</remote-cache-scheme>
93+
94+
<remote-cache-scheme>
95+
<scheme-name>extend-direct-tls12</scheme-name>
96+
<service-name>ExtendTcpCacheServiceTLS12</service-name>
97+
<proxy-service-name>ExtendTcpProxyServiceTLS12</proxy-service-name>
98+
<initiator-config>
99+
<tcp-initiator>
100+
<stream-provider>
101+
<ssl>
102+
<protocol>Tls12</protocol>
103+
<remote-certificate-validator>
104+
<delegate>
105+
<type>static</type>
106+
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
107+
<method-name>IgnoreCommonNameCertificateValidation</method-name>
108+
</delegate>
109+
</remote-certificate-validator>
110+
</ssl>
111+
</stream-provider>
112+
<remote-addresses>
113+
<socket-address>
114+
<address>127.0.0.1</address>
115+
<port>9900</port>
116+
</socket-address>
117+
<socket-address>
118+
<address>127.0.0.1</address>
119+
<port>9901</port>
120+
</socket-address>
121+
</remote-addresses>
122+
</tcp-initiator>
123+
<outgoing-message-handler>
124+
<heartbeat-interval>1s</heartbeat-interval>
125+
<heartbeat-timeout>10s</heartbeat-timeout>
126+
</outgoing-message-handler>
127+
</initiator-config>
128+
</remote-cache-scheme>
129+
130+
<remote-cache-scheme>
131+
<scheme-name>extend-direct-twoway-ssl</scheme-name>
132+
<service-name>ExtendTcpCacheServiceTwoWaySSL</service-name>
133+
<proxy-service-name>ExtendTcpProxyServiceTwoWaySSL</proxy-service-name>
134+
<initiator-config>
135+
<tcp-initiator>
136+
<stream-provider>
137+
<ssl>
138+
<protocol>Tls12</protocol>
139+
<local-certificates>
140+
<certificate>
141+
<url>./Config/testcert.pfx</url>
142+
<password>password</password>
143+
<flags>MachineKeySet</flags>
144+
</certificate>
145+
</local-certificates>
146+
<remote-certificate-validator>
147+
<delegate>
148+
<type>static</type>
149+
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
150+
<method-name>IgnoreCommonNameCertificateValidation</method-name>
151+
</delegate>
152+
</remote-certificate-validator>
153+
</ssl>
154+
</stream-provider>
155+
<remote-addresses>
156+
<socket-address>
157+
<address>127.0.0.1</address>
158+
<port>9800</port>
159+
</socket-address>
160+
<socket-address>
161+
<address>127.0.0.1</address>
162+
<port>9801</port>
163+
</socket-address>
164+
</remote-addresses>
165+
</tcp-initiator>
166+
<outgoing-message-handler>
167+
<heartbeat-interval>1s</heartbeat-interval>
168+
<heartbeat-timeout>10s</heartbeat-timeout>
169+
</outgoing-message-handler>
170+
</initiator-config>
171+
</remote-cache-scheme>
172+
173+
<remote-invocation-scheme>
174+
<scheme-name>extend-proxy-stop</scheme-name>
175+
<service-name>ExtendTcpProxyControlService</service-name>
176+
<initiator-config>
177+
<tcp-initiator>
178+
<remote-addresses>
179+
<socket-address>
180+
<address>127.0.0.1</address>
181+
<port>9043</port>
182+
</socket-address>
183+
</remote-addresses>
184+
</tcp-initiator>
185+
</initiator-config>
186+
</remote-invocation-scheme>
187+
188+
<remote-invocation-scheme>
189+
<scheme-name>invocation-scheme</scheme-name>
190+
<service-name>RemoteInvocationService</service-name>
191+
<initiator-config>
192+
<tcp-initiator>
193+
<remote-addresses>
194+
<address-provider>ap1</address-provider>
195+
</remote-addresses>
196+
</tcp-initiator>
197+
<outgoing-message-handler>
198+
<heartbeat-interval>1s</heartbeat-interval>
199+
<heartbeat-timeout>10s</heartbeat-timeout>
200+
<request-timeout>30s</request-timeout>
201+
</outgoing-message-handler>
202+
<use-filters>
203+
<filter-name>gzip</filter-name>
204+
</use-filters>
205+
<serializer>pof</serializer>
206+
<connect-timeout>5s</connect-timeout>
207+
</initiator-config>
208+
</remote-invocation-scheme>
209+
210+
<remote-invocation-scheme>
211+
<scheme-name>invocation-scheme-with-cluster-name</scheme-name>
212+
<service-name>RemoteInvocationServiceCN</service-name>
213+
<cluster-name>DotNetTest</cluster-name>
214+
<proxy-service-name>ExtendTcpProxyServiceEphermeral</proxy-service-name>
215+
<initiator-config>
216+
<tcp-initiator>
217+
<name-service-addresses>
218+
<address-provider>ap2</address-provider>
219+
</name-service-addresses>
220+
</tcp-initiator>
221+
<connect-timeout>5s</connect-timeout>
222+
</initiator-config>
223+
</remote-invocation-scheme>
224+
225+
<remote-invocation-scheme>
226+
<scheme-name>invocation-scheme-with-cluster-name</scheme-name>
227+
<service-name>RemoteInvocationServiceUnknownCN</service-name>
228+
<cluster-name>DotNotTest</cluster-name>
229+
<proxy-service-name>ExtendTcpProxyServiceEphermeral</proxy-service-name>
230+
<initiator-config>
231+
<tcp-initiator>
232+
<name-service-addresses>
233+
<address-provider>ap2</address-provider>
234+
</name-service-addresses>
235+
</tcp-initiator>
236+
<connect-timeout>5s</connect-timeout>
237+
</initiator-config>
238+
</remote-invocation-scheme>
239+
240+
<remote-cache-scheme>
241+
<scheme-name>extend-bad-address</scheme-name>
242+
<service-name>ExtendTcpCacheServiceBadAddress</service-name>
243+
<proxy-service-name>ExtendTcpProxyServiceBadAddress</proxy-service-name>
244+
<initiator-config>
245+
<tcp-initiator>
246+
<remote-addresses>
247+
<socket-address>
248+
<address>100.10.0.1</address>
249+
<port>1000</port>
250+
</socket-address>
251+
</remote-addresses>
252+
</tcp-initiator>
253+
<outgoing-message-handler>
254+
<heartbeat-interval>5s</heartbeat-interval>
255+
<heartbeat-timeout>3s</heartbeat-timeout>
256+
</outgoing-message-handler>
257+
</initiator-config>
258+
</remote-cache-scheme>
259+
</caching-schemes>
260+
</cache-config>

0 commit comments

Comments
 (0)