From 95eee92c4ca6b5dd94277b53452ac4f1bd0e51c9 Mon Sep 17 00:00:00 2001
From: Nathan Ridge <zeratul976@hotmail.com>
Date: Wed, 1 Jun 2016 03:26:02 -0400
Subject: [PATCH] Bug 495095 - Fix incorrect tests

Change-Id: I90e211b9bbf55245bc15bc6239555267e8d88f92
---
 .../tests/text/contentassist2/CPPParameterGuessingTests.java | 5 ++---
 .../tests/text/contentassist2/CParameterGuessingTests.java   | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java
index f6f8883afa6..4ed70d6dbb5 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CPPParameterGuessingTests.java
@@ -91,8 +91,7 @@ public class CPPParameterGuessingTests extends AbstractContentAssistTest {
 	//		tFunc<aClass> (
 	public void testTemplateFunction() throws Exception {
 		Map<String, String[][]> resultsMap = new HashMap<>();
-		resultsMap.put("tFunc<aClass> (x, y)", new String[][] { { "x" },
-				{ "y" } });
+		resultsMap.put("tFunc<aClass> (x, y)", new String[][] { { "aTypeObj" }, { "bTypeObj" } });
 		assertParametersGuesses(resultsMap);
 	}
 
@@ -135,7 +134,7 @@ public class CPPParameterGuessingTests extends AbstractContentAssistTest {
 		Map<String, String[][]> resultsMap = new HashMap<>();
 		resultsMap.put("aMethod(c)", new String[][] { { "charX", "charY", "inCall" } });
 		resultsMap.put("aMethod(c, x)", new String[][] {
-				{ "charX", "charY"}, { "inCall" } });
+				{ "charX", "charY", "inCall"}, { "charX", "charY", "inCall" } });
 		assertParametersGuesses(resultsMap);
 	}
 }
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java
index c85a1c1d010..1e1f058d569 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist2/CParameterGuessingTests.java
@@ -69,6 +69,7 @@ public class CParameterGuessingTests extends AbstractContentAssistTest {
 
 	//	void foo(){
 	//		aStruct ax;
+	//		int x;
 	//		ov
 	public void testMultipleFunctions() throws Exception {
 		Map<String, String[][]> resultsMap = new HashMap<>();