Skip to content

Commit

Permalink
Fix 14.1.1.0 .NET Core test failures
Browse files Browse the repository at this point in the history 
[git-p4: depot-paths = "//dev/release.net/coherence-net-v14.1.1.0-core/": change = 112088]
  • Loading branch information
@lsho
lsho committed Oct 22, 2024
1 parent 984c49c commit ef2eaaf
Show file tree
Hide file tree
Showing 5 changed files with 268 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/Coherence.Core.Tests/Net/Impl/SSLOneWayRemoteNamedCacheTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ protected override String TestCacheName
[SetUp]
public void SetUp()
{
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
}

var ccf = new DefaultConfigurableCacheFactory(configFileName);
Expand Down
4 changes: 2 additions & 2 deletions tests/Coherence.Core.Tests/Net/Impl/SSLRemoteNamedCacheTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ protected String TwoWayCacheName
[SetUp]
public void SetUp()
{
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
}

var ccf = new DefaultConfigurableCacheFactory(configFileName);
Expand Down
4 changes: 2 additions & 2 deletions tests/Coherence.Core.Tests/Net/Impl/SSLTwoWayRemoteNamedCacheTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ protected override String TestCacheName
[SetUp]
public void SetUp()
{
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
}

var ccf = new DefaultConfigurableCacheFactory(configFileName);
Expand Down
4 changes: 2 additions & 2 deletions tests/Coherence.Core.Tests/Net/Impl/TLS12OneWayRemoteNamedCacheTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ protected override String TestCacheName
[SetUp]
public void SetUp()
{
var configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
var configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml";
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
configFileName = "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
configFileName = "assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config-ssl-non-win.xml";
}

var ccf = new DefaultConfigurableCacheFactory(configFileName);
Expand Down
260 changes: 260 additions & 0 deletions tests/Coherence.Core.Tests/Resources/s4hc-cache-config-ssl.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
<?xml version="1.0"?>
<!--
Copyright (c) 2000, 2024, Oracle and/or its affiliates.
Licensed under the Universal Permissive License v 1.0 as shown at
https://oss.oracle.com/licenses/upl.
-->
<cache-config xmlns="http://schemas.tangosol.com/cache">
<caching-scheme-mapping>
<cache-mapping>
<cache-name>dist-extend-direct</cache-name>
<scheme-name>extend-direct</scheme-name>
</cache-mapping>

<cache-mapping>
<cache-name>dist-extend-direct-temp</cache-name>
<scheme-name>extend-direct</scheme-name>
</cache-mapping>

<cache-mapping>
<cache-name>dist-extend-oneway-ssl</cache-name>
<scheme-name>extend-direct-oneway-ssl</scheme-name>
</cache-mapping>

<cache-mapping>
<cache-name>dist-extend-twoway-ssl</cache-name>
<scheme-name>extend-direct-twoway-ssl</scheme-name>
</cache-mapping>

<cache-mapping>
<cache-name>dist-extend-tls12</cache-name>
<scheme-name>extend-direct-tls12</scheme-name>
</cache-mapping>
</caching-scheme-mapping>

<caching-schemes>
<remote-cache-scheme>
<scheme-name>extend-direct</scheme-name>
<service-name>ExtendTcpCacheService</service-name>
<initiator-config>
<tcp-initiator>
<local-address>
<address>127.0.0.1</address>
<port>0</port>
</local-address>
<remote-addresses>
<address-provider>ap1</address-provider>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>1s</heartbeat-interval>
<heartbeat-timeout>10s</heartbeat-timeout>
<request-timeout>0s</request-timeout>
</outgoing-message-handler>
<use-filters>
<filter-name>gzip</filter-name>
</use-filters>
<connect-timeout>30s</connect-timeout>
</initiator-config>
</remote-cache-scheme>

<remote-cache-scheme>
<scheme-name>extend-direct-oneway-ssl</scheme-name>
<service-name>ExtendTcpCacheServiceOneWaySSL</service-name>
<proxy-service-name>ExtendTcpProxyServiceOneWaySSL</proxy-service-name>
<initiator-config>
<tcp-initiator>
<stream-provider>
<ssl>
<protocol>Tls12</protocol>
<remote-certificate-validator>
<delegate>
<type>static</type>
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
<method-name>IgnoreCommonNameCertificateValidation</method-name>
</delegate>
</remote-certificate-validator>
</ssl>
</stream-provider>
<remote-addresses>
<socket-address>
<address>127.0.0.1</address>
<port>9700</port>
</socket-address>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>1s</heartbeat-interval>
<heartbeat-timeout>10s</heartbeat-timeout>
</outgoing-message-handler>
</initiator-config>
</remote-cache-scheme>

<remote-cache-scheme>
<scheme-name>extend-direct-tls12</scheme-name>
<service-name>ExtendTcpCacheServiceTLS12</service-name>
<proxy-service-name>ExtendTcpProxyServiceTLS12</proxy-service-name>
<initiator-config>
<tcp-initiator>
<stream-provider>
<ssl>
<protocol>Tls12</protocol>
<remote-certificate-validator>
<delegate>
<type>static</type>
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
<method-name>IgnoreCommonNameCertificateValidation</method-name>
</delegate>
</remote-certificate-validator>
</ssl>
</stream-provider>
<remote-addresses>
<socket-address>
<address>127.0.0.1</address>
<port>9900</port>
</socket-address>
<socket-address>
<address>127.0.0.1</address>
<port>9901</port>
</socket-address>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>1s</heartbeat-interval>
<heartbeat-timeout>10s</heartbeat-timeout>
</outgoing-message-handler>
</initiator-config>
</remote-cache-scheme>

<remote-cache-scheme>
<scheme-name>extend-direct-twoway-ssl</scheme-name>
<service-name>ExtendTcpCacheServiceTwoWaySSL</service-name>
<proxy-service-name>ExtendTcpProxyServiceTwoWaySSL</proxy-service-name>
<initiator-config>
<tcp-initiator>
<stream-provider>
<ssl>
<protocol>Tls12</protocol>
<local-certificates>
<certificate>
<url>./Config/testcert.pfx</url>
<password>password</password>
<flags>MachineKeySet</flags>
</certificate>
</local-certificates>
<remote-certificate-validator>
<delegate>
<type>static</type>
<class-name>Tangosol.Net.SslStreamProvider, Coherence</class-name>
<method-name>IgnoreCommonNameCertificateValidation</method-name>
</delegate>
</remote-certificate-validator>
</ssl>
</stream-provider>
<remote-addresses>
<socket-address>
<address>127.0.0.1</address>
<port>9800</port>
</socket-address>
<socket-address>
<address>127.0.0.1</address>
<port>9801</port>
</socket-address>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>1s</heartbeat-interval>
<heartbeat-timeout>10s</heartbeat-timeout>
</outgoing-message-handler>
</initiator-config>
</remote-cache-scheme>

<remote-invocation-scheme>
<scheme-name>extend-proxy-stop</scheme-name>
<service-name>ExtendTcpProxyControlService</service-name>
<initiator-config>
<tcp-initiator>
<remote-addresses>
<socket-address>
<address>127.0.0.1</address>
<port>9043</port>
</socket-address>
</remote-addresses>
</tcp-initiator>
</initiator-config>
</remote-invocation-scheme>

<remote-invocation-scheme>
<scheme-name>invocation-scheme</scheme-name>
<service-name>RemoteInvocationService</service-name>
<initiator-config>
<tcp-initiator>
<remote-addresses>
<address-provider>ap1</address-provider>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>1s</heartbeat-interval>
<heartbeat-timeout>10s</heartbeat-timeout>
<request-timeout>30s</request-timeout>
</outgoing-message-handler>
<use-filters>
<filter-name>gzip</filter-name>
</use-filters>
<serializer>pof</serializer>
<connect-timeout>5s</connect-timeout>
</initiator-config>
</remote-invocation-scheme>

<remote-invocation-scheme>
<scheme-name>invocation-scheme-with-cluster-name</scheme-name>
<service-name>RemoteInvocationServiceCN</service-name>
<cluster-name>DotNetTest</cluster-name>
<proxy-service-name>ExtendTcpProxyServiceEphermeral</proxy-service-name>
<initiator-config>
<tcp-initiator>
<name-service-addresses>
<address-provider>ap2</address-provider>
</name-service-addresses>
</tcp-initiator>
<connect-timeout>5s</connect-timeout>
</initiator-config>
</remote-invocation-scheme>

<remote-invocation-scheme>
<scheme-name>invocation-scheme-with-cluster-name</scheme-name>
<service-name>RemoteInvocationServiceUnknownCN</service-name>
<cluster-name>DotNotTest</cluster-name>
<proxy-service-name>ExtendTcpProxyServiceEphermeral</proxy-service-name>
<initiator-config>
<tcp-initiator>
<name-service-addresses>
<address-provider>ap2</address-provider>
</name-service-addresses>
</tcp-initiator>
<connect-timeout>5s</connect-timeout>
</initiator-config>
</remote-invocation-scheme>

<remote-cache-scheme>
<scheme-name>extend-bad-address</scheme-name>
<service-name>ExtendTcpCacheServiceBadAddress</service-name>
<proxy-service-name>ExtendTcpProxyServiceBadAddress</proxy-service-name>
<initiator-config>
<tcp-initiator>
<remote-addresses>
<socket-address>
<address>100.10.0.1</address>
<port>1000</port>
</socket-address>
</remote-addresses>
</tcp-initiator>
<outgoing-message-handler>
<heartbeat-interval>5s</heartbeat-interval>
<heartbeat-timeout>3s</heartbeat-timeout>
</outgoing-message-handler>
</initiator-config>
</remote-cache-scheme>
</caching-schemes>
</cache-config>

0 comments on commit ef2eaaf

Please sign in to comment.