Directly instantiate DefaultConfigurableCacheFactory in SSL tests

vasac · vasac · commit 0c9b1adc4d40 · 2024-10-02T04:34:44.000-05:00
[git-p4: depot-paths = "//dev/main.net/": change = 111721]
diff --git a/tests/Coherence.Tests/Net/Impl/SSLOneWayRemoteNamedCacheTests.cs b/tests/Coherence.Tests/Net/Impl/SSLOneWayRemoteNamedCacheTests.cs
@@ -23,9 +23,9 @@ protected override String TestCacheName
         [SetUp]
         public void SetUp()
         {
-            var ccf    = CacheFactory.ConfigurableCacheFactory;
-            var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
-            ccf.Config = config;
+            var ccf = new DefaultConfigurableCacheFactory(
+                "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
+            CacheFactory.ConfigurableCacheFactory = ccf;
         }
 
         [TearDown]
diff --git a/tests/Coherence.Tests/Net/Impl/SSLRemoteNamedCacheTests.cs b/tests/Coherence.Tests/Net/Impl/SSLRemoteNamedCacheTests.cs
@@ -35,9 +35,9 @@ protected String TwoWayCacheName
         [SetUp]
         public void SetUp()
         {
-            var ccf    = CacheFactory.ConfigurableCacheFactory;
-            var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
-            ccf.Config = config;
+            var ccf = new DefaultConfigurableCacheFactory(
+                "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
+            CacheFactory.ConfigurableCacheFactory = ccf;
         }
 
         [TearDown]
diff --git a/tests/Coherence.Tests/Net/Impl/SSLTwoWayRemoteNamedCacheTests.cs b/tests/Coherence.Tests/Net/Impl/SSLTwoWayRemoteNamedCacheTests.cs
@@ -23,9 +23,9 @@ protected override String TestCacheName
         [SetUp]
         public void SetUp()
         {
-            var ccf    = CacheFactory.ConfigurableCacheFactory;
-            var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
-            ccf.Config = config;
+            var ccf = new DefaultConfigurableCacheFactory(
+                "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
+            CacheFactory.ConfigurableCacheFactory = ccf;
         }
 
         [TearDown]
diff --git a/tests/Coherence.Tests/Net/Impl/TLS12OneWayRemoteNamedCacheTests.cs b/tests/Coherence.Tests/Net/Impl/TLS12OneWayRemoteNamedCacheTests.cs
@@ -23,9 +23,9 @@ protected override String TestCacheName
         [SetUp]
         public void SetUp()
         {
-            var ccf    = CacheFactory.ConfigurableCacheFactory;
-            var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
-            ccf.Config = config;
+            var ccf = new DefaultConfigurableCacheFactory(
+                "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");
+            CacheFactory.ConfigurableCacheFactory = ccf;
         }
 
         [TearDown]

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ protected override String TestCacheName`
`23`	`23`	`[SetUp]`
`24`	`24`	`public void SetUp()`
`25`	`25`	`{`
`26`		`- var ccf = CacheFactory.ConfigurableCacheFactory;`
`27`		`- var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");`
`28`		`- ccf.Config = config;`
	`26`	`+ var ccf = new DefaultConfigurableCacheFactory(`
	`27`	`+ "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");`
	`28`	`+ CacheFactory.ConfigurableCacheFactory = ccf;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`[TearDown]`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,9 @@ protected String TwoWayCacheName`
`35`	`35`	`[SetUp]`
`36`	`36`	`public void SetUp()`
`37`	`37`	`{`
`38`		`- var ccf = CacheFactory.ConfigurableCacheFactory;`
`39`		`- var config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");`
`40`		`- ccf.Config = config;`
	`38`	`+ var ccf = new DefaultConfigurableCacheFactory(`
	`39`	`+ "assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config-ssl.xml");`
	`40`	`+ CacheFactory.ConfigurableCacheFactory = ccf;`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`[TearDown]`