fix merge proglems

Author: lsho

tests/Coherence.Core.Tests/Net/Cache/CacheInvalidAddressTimeoutTest.cs

@@ -27,7 +27,7 @@ private static INamedCache GetCache(String cacheName)
             IConfigurableCacheFactory ccf = CacheFactory.ConfigurableCacheFactory;
 
             IXmlDocument config =
-                XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config.xml");
+                XmlHelper.LoadXml("assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config.xml");
             ccf.Config = config;
 
             return CacheFactory.GetCache(cacheName);

tests/Coherence.Core.Tests/Net/Cache/CacheTimeoutTest.cs

@@ -27,7 +27,7 @@ private static INamedCache GetCache(String cacheName)
             IConfigurableCacheFactory ccf = CacheFactory.ConfigurableCacheFactory;
 
             IXmlDocument config =
-                XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config.xml");
+                XmlHelper.LoadXml("assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config.xml");
             ccf.Config = config;
 
             return CacheFactory.GetCache(cacheName);

tests/Coherence.Core.Tests/Net/Cache/CacheWithTimeoutTest.cs

@@ -26,7 +26,7 @@ private static INamedCache GetCache(String cacheName)
             IConfigurableCacheFactory ccf = CacheFactory.ConfigurableCacheFactory;
 
             IXmlDocument config =
-                XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config.xml");
+                XmlHelper.LoadXml("assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config.xml");
             ccf.Config = config;
 
             return CacheFactory.GetCache(cacheName);

tests/Coherence.Core.Tests/Net/Cache/CachesTimeoutTest.cs

@@ -27,7 +27,7 @@ private static INamedCache GetCache(String cacheName)
         {
             IConfigurableCacheFactory ccf = CacheFactory.ConfigurableCacheFactory;
 
-            IXmlDocument config = XmlHelper.LoadXml("assembly://Coherence.Tests/Tangosol.Resources/s4hc-cache-config.xml");
+            IXmlDocument config = XmlHelper.LoadXml("assembly://Coherence.Core.Tests/Tangosol.Resources/s4hc-cache-config.xml");
             ccf.Config = config;
 
             return CacheFactory.GetCache(cacheName);

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

@@ -267,10 +267,6 @@
               <address>127.0.0.1</address>
               <port>9700</port>
             </socket-address>
-             <socket-address>
-              <address>127.0.0.1</address>
-              <port>9701</port>
-            </socket-address>
           </remote-addresses>
         </tcp-initiator>
         <outgoing-message-handler>

tests/Coherence.Core.Tests/Resources/s4hc-test-config.xml

@@ -75,7 +75,7 @@
 
     <user-type>
       <type-id>1210</type-id>
-      <class-name>Tangosol.TestEntryProcessor, Coherence.Tests</class-name>
+      <class-name>Tangosol.TestEntryProcessor, Coherence.Core.Tests</class-name>
     </user-type>
 
     <user-type>

tests/Coherence.Core.Tests/Util/Daemon/QueueProcessor/Service/Peer/Initiator/TcpInitiatorTests.cs

@@ -101,7 +101,7 @@ public void TestWithAddressProvider()
                 }
 
                 remoteAddressNode.AddElement("address-provider").AddElement("class-name").SetString(
-                    "Tangosol.Net.ConfigurableAddressProviderTests+LoopbackAddressProvider, Coherence.Tests");
+                    "Tangosol.Net.ConfigurableAddressProviderTests+LoopbackAddressProvider, Coherence.Core.Tests");
             }
 
             IXmlElement initConfig = xmlConfig.FindElement("caching-schemes/remote-cache-scheme/initiator-config");