Add test for Bug 292176

2 files changed, 33 insertions, 1 deletions

diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java
index 1de367db9..0b6d30b15 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/LoadTocUsingRemoteHelp.java
@@ -54,7 +54,25 @@ public class LoadTocUsingRemoteHelp extends TestCase {
 		assertEquals(1, deTocs);
 	    RemotePreferenceStore.disableRemoteHelp();
 	}
+	
+	/*
+	 * Fails, see  Bug 292176
+	public void testTocContributionFromTwoServers() throws Exception {
+		BaseHelpSystem.setMode(BaseHelpSystem.MODE_INFOCENTER);
+		RemotePreferenceStore.setTwoMockRemoteServers();
+		HelpPlugin.getTocManager().clearCache();
+		Toc[] tocs = HelpPlugin.getTocManager().getTocs("en");
+		int enTocs = matchingTocs(tocs, "Mock Toc en");
+		assertEquals(1, enTocs);
+		int deTocs = matchingTocs(tocs, "Mock Toc de");
+		assertEquals(0, deTocs);
+	    RemotePreferenceStore.disableRemoteHelp();
+	}
+	*/
 
+	/*
+	 * Return the number of tocs with this label
+	 */
 	private int matchingTocs(Toc[] tocs, String label) {
 		int result = 0;
 		for (int i = 0; i < tocs.length; i++) {
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
index 3f751c964..d98529c93 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/remote/RemotePreferenceStore.java
@@ -62,7 +62,7 @@ public class RemotePreferenceStore {
 		prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ON, helpOn);		
 		prefs.put(IHelpBaseConstants.P_KEY_REMOTE_HELP_ICEnabled, icEnabledPreference);
 	}
-	
+
 	public static void setMockRemoteServer() throws Exception {
         TestServerManager.start("ua.test", 0);
 		RemotePreferenceTest.setPreference("remoteHelpOn", "true");
@@ -75,6 +75,20 @@ public class RemotePreferenceStore {
 		RemotePreferenceTest.setPreference("remoteHelpICContributed", "false");
 	}	
 	
+	public static void setTwoMockRemoteServers() throws Exception {
+        TestServerManager.start("ua.test", 0);
+        TestServerManager.start("ua.test2", 1);
+		RemotePreferenceTest.setPreference("remoteHelpOn", "true");
+		RemotePreferenceTest.setPreference("remoteHelpHost", "localhost,localhost");
+		RemotePreferenceTest.setPreference("remoteHelpPath", "/help,/help");
+		RemotePreferenceTest.setPreference("remoteHelpUseDefaultPort", ",");
+		RemotePreferenceTest.setPreference("remoteHelpPort", "" 
+				+ TestServerManager.getPort(0) + ',' + TestServerManager.getPort(1));
+		RemotePreferenceTest.setPreference("remoteHelpName", "uatest,uatest2");
+		RemotePreferenceTest.setPreference("remoteHelpICEnabled", "true,true");
+		RemotePreferenceTest.setPreference("remoteHelpICContributed", "false,false");
+	}
+	
 	public static void disableRemoteHelp() throws Exception {
 		RemotePreferenceTest.setPreference("remoteHelpOn", "false");
 	}