Content Assist Work: More JUnit tests

17 files changed, 92 insertions, 89 deletions

diff --git a/core/org.eclipse.cdt.ui.tests/ChangeLog b/core/org.eclipse.cdt.ui.tests/ChangeLog
index 0027735a143..ac066585d86 100644
--- a/core/org.eclipse.cdt.ui.tests/ChangeLog
+++ b/core/org.eclipse.cdt.ui.tests/ChangeLog
@@ -1,4 +1,7 @@
 2004-01-21 Hoda Amer
+	Renamed completion tests to be more meaningful.
+	
+2004-01-21 Hoda Amer
 	Added more JUnit tests for Content Assist
 
 2004-01-19 Hoda Amer
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java
index a6ef2df618f..cc72c80d328 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/AutomatedSuite.java
@@ -36,23 +36,23 @@ public class AutomatedSuite extends TestSuite {
 		// Success Tests
 		addTest(PartitionTokenScannerTest.suite());
 		addTest(TextBufferTest.suite());
-		addTest(CompletionProposalsTest1.suite());
-		addTest(CompletionProposalsTest2.suite());
-		addTest(CompletionProposalsTest3.suite());
-		addTest(CompletionProposalsTest4.suite());
-		addTest(CompletionProposalsTest5.suite());
-		addTest(CompletionProposalsTest6.suite());
-		addTest(CompletionProposalsTest7.suite());
-		addTest(CompletionProposalsTest8.suite());
-		addTest(CompletionProposalsTest9.suite());
-		addTest(CompletionProposalsTest10.suite());
-		addTest(CompletionProposalsTest11.suite());
-		addTest(CompletionProposalsTest12.suite());
+		addTest(CompletionTest_StatementStart_Prefix.suite());
+		addTest(CompletionTest_MemberReference_Dot_Prefix.suite());
+		addTest(CompletionTest_VariableType_Prefix.suite());
+		addTest(CompletionTest_FieldType_Prefix.suite());
+		addTest(CompletionTest_StatementStart_NoPrefix.suite());
+		addTest(CompletionTest_MemberReference_Arrow_Prefix.suite());
+		addTest(CompletionTest_MemberReference_Arrow_Prefix2.suite());
+		addTest(CompletionTest_SingleName_Prefix.suite());
+		addTest(CompletionTest_MemberReference_Dot_NoPrefix.suite());
+		addTest(CompletionTest_MemberReference_Arrow_NoPrefix.suite());
+		addTest(CompletionTest_VariableType_NoPrefix.suite());
+		addTest(CompletionTest_FieldType_NoPrefix.suite());
 		
 		// Failed Tests
-		addTest(CompletionProposalsFailedTest1.suite());
-		addTest(CompletionProposalsFailedTest2.suite());
-		addTest(CompletionProposalsFailedTest3.suite());
+		addTest(CompletionFailedTest_ScopedReference_NoPrefix_Bug50152.suite());
+		addTest(CompletionFailedTest_ScopedReference_Prefix_Bug50152.suite());
+		addTest(CompletionFailedTest_FieldType_NoPrefix_Bug50344.suite());
 		
 	}
 	
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest12.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_FieldType_NoPrefix.java
index bc6489f2fe2..d0ffe2d2325 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest12.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_FieldType_NoPrefix.java
@@ -18,10 +18,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Class scope, declaration start, with NO prefix
+ * Testing Field_Type, with NO prefix
  *
  */
-public class CompletionProposalsTest12  extends CompletionProposalsBaseTest{
+public class CompletionTest_FieldType_NoPrefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart12.h";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -33,13 +33,13 @@ public class CompletionProposalsTest12  extends CompletionProposalsBaseTest{
 	private final String[] expectedResults = {
 	};
 	
-	public CompletionProposalsTest12(String name) {
+	public CompletionTest_FieldType_NoPrefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest12.class.getName());
-		suite.addTest(new CompletionProposalsTest12("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_FieldType_NoPrefix.class.getName());
+		suite.addTest(new CompletionTest_FieldType_NoPrefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest4.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_FieldType_Prefix.java
index 7dabd804eb8..f591cda3c66 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest4.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_FieldType_Prefix.java
@@ -17,10 +17,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Class scope, declaration start, with a prefix
+ * Testing Field_Type completion kind , with a prefix
  *
  */
-public class CompletionProposalsTest4  extends CompletionProposalsBaseTest{
+public class CompletionTest_FieldType_Prefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart4.h";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -38,13 +38,13 @@ public class CompletionProposalsTest4  extends CompletionProposalsBaseTest{
 			"AStruct"
 	};
 	
-	public CompletionProposalsTest4(String name) {
+	public CompletionTest_FieldType_Prefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest4.class.getName());
-		suite.addTest(new CompletionProposalsTest4("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_FieldType_Prefix.class.getName());
+		suite.addTest(new CompletionTest_FieldType_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest10.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_NoPrefix.java
index 66b21ccf238..781d06f173f 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest10.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_NoPrefix.java
@@ -17,12 +17,12 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, a class context, with NO prefix
+ * Testing Member_Reference, with NO prefix
  * After an ->
  *
  */
 
-public class CompletionProposalsTest10  extends CompletionProposalsBaseTest{
+public class CompletionTest_MemberReference_Arrow_NoPrefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart10.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -38,13 +38,13 @@ public class CompletionProposalsTest10  extends CompletionProposalsBaseTest{
 			"xAClassMethod(int) void"
 	};
 	
-	public CompletionProposalsTest10(String name) {
+	public CompletionTest_MemberReference_Arrow_NoPrefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest10.class.getName());
-		suite.addTest(new CompletionProposalsTest10("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_MemberReference_Arrow_NoPrefix.class.getName());
+		suite.addTest(new CompletionTest_MemberReference_Arrow_NoPrefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest6.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_Prefix.java
index afa333ef96a..156001b0323 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest6.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_Prefix.java
@@ -17,11 +17,11 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, a class context, with a prefix
+ * Testing Member_Reference, with a prefix
  * After an ->
  *
  */
-public class CompletionProposalsTest6  extends CompletionProposalsBaseTest{
+public class CompletionTest_MemberReference_Arrow_Prefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart6.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -35,13 +35,13 @@ public class CompletionProposalsTest6  extends CompletionProposalsBaseTest{
 			"aMethod() int"
 	};
 	
-	public CompletionProposalsTest6(String name) {
+	public CompletionTest_MemberReference_Arrow_Prefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest6.class.getName());
-		suite.addTest(new CompletionProposalsTest6("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_MemberReference_Arrow_Prefix.class.getName());
+		suite.addTest(new CompletionTest_MemberReference_Arrow_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest7.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_Prefix2.java
index 2f8884f4d47..8275a873ebb 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest7.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Arrow_Prefix2.java
@@ -17,11 +17,11 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, a class context, with a prefix
+ * Testing Member_Reference, with a prefix
  * Complex Context: Function return value: foo()->a(CTRL+SPACE)
  *
  */
-public class CompletionProposalsTest7  extends CompletionProposalsBaseTest{
+public class CompletionTest_MemberReference_Arrow_Prefix2  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart7.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -35,13 +35,13 @@ public class CompletionProposalsTest7  extends CompletionProposalsBaseTest{
 			"aMethod() int"
 	};
 	
-	public CompletionProposalsTest7(String name) {
+	public CompletionTest_MemberReference_Arrow_Prefix2(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest7.class.getName());
-		suite.addTest(new CompletionProposalsTest7("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_MemberReference_Arrow_Prefix2.class.getName());
+		suite.addTest(new CompletionTest_MemberReference_Arrow_Prefix2("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest9.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Dot_NoPrefix.java
index 0ccaf242b58..142a09d27a4 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest9.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Dot_NoPrefix.java
@@ -17,11 +17,11 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, a class context, with NO prefix
+ * Testing Member_Reference, with NO prefix
  * After a .
  *
  */
-public class CompletionProposalsTest9  extends CompletionProposalsBaseTest{
+public class CompletionTest_MemberReference_Dot_NoPrefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart9.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -37,13 +37,13 @@ public class CompletionProposalsTest9  extends CompletionProposalsBaseTest{
 			"xAClassMethod(int) void"
 	};
 	
-	public CompletionProposalsTest9(String name) {
+	public CompletionTest_MemberReference_Dot_NoPrefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest9.class.getName());
-		suite.addTest(new CompletionProposalsTest9("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_MemberReference_Dot_NoPrefix.class.getName());
+		suite.addTest(new CompletionTest_MemberReference_Dot_NoPrefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Dot_Prefix.java
index d142ca067dd..f7bacd24049 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_MemberReference_Dot_Prefix.java
@@ -17,11 +17,11 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, a class context, with a prefix
+ * Testing Member_Reference completion kind, with a prefix
  * After a .
  *
  */
-public class CompletionProposalsTest2  extends CompletionProposalsBaseTest{
+public class CompletionTest_MemberReference_Dot_Prefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart2.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -35,13 +35,13 @@ public class CompletionProposalsTest2  extends CompletionProposalsBaseTest{
 			"aMethod() int"
 	};
 	
-	public CompletionProposalsTest2(String name) {
+	public CompletionTest_MemberReference_Dot_Prefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest2.class.getName());
-		suite.addTest(new CompletionProposalsTest2("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_MemberReference_Dot_Prefix.class.getName());
+		suite.addTest(new CompletionTest_MemberReference_Dot_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest8.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_SingleName_Prefix.java
index 3c24e31ed30..890f2461537 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest8.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_SingleName_Prefix.java
@@ -17,10 +17,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, Macro lookups 
+ * Testing Single name reference, Macro lookups 
  *
  */
-public class CompletionProposalsTest8  extends CompletionProposalsBaseTest{
+public class CompletionTest_SingleName_Prefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart8.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -33,13 +33,13 @@ public class CompletionProposalsTest8  extends CompletionProposalsBaseTest{
 			"AMacro(x)"
 	};
 	
-	public CompletionProposalsTest8(String name) {
+	public CompletionTest_SingleName_Prefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest8.class.getName());
-		suite.addTest(new CompletionProposalsTest8("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_SingleName_Prefix.class.getName());
+		suite.addTest(new CompletionTest_SingleName_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest5.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_StatementStart_NoPrefix.java
index 0613714413b..1bc0a5e56c4 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest5.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_StatementStart_NoPrefix.java
@@ -17,11 +17,11 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, statement start, with no prefix
+ * Testing statement start, with no prefix
  * Lookup.THIS
  *
  */
-public class CompletionProposalsTest5  extends CompletionProposalsBaseTest{
+public class CompletionTest_StatementStart_NoPrefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart5.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -35,13 +35,13 @@ public class CompletionProposalsTest5  extends CompletionProposalsBaseTest{
 			"anotherMethod() void"
 	};
 	
-	public CompletionProposalsTest5(String name) {
+	public CompletionTest_StatementStart_NoPrefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest5.class.getName());
-		suite.addTest(new CompletionProposalsTest5("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_StatementStart_NoPrefix.class.getName());
+		suite.addTest(new CompletionTest_StatementStart_NoPrefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest1.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_StatementStart_Prefix.java
index 6d8566e4bb5..742099f34fc 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest1.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_StatementStart_Prefix.java
@@ -17,10 +17,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, statement start, with a prefix
+ * Testing statement start completion kind, with a prefix
  *
  */
-public class CompletionProposalsTest1  extends CompletionProposalsBaseTest{
+public class CompletionTest_StatementStart_Prefix  extends CompletionProposalsBaseTest{
 		
 	private final String fileName = "CompletionTestStart1.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
@@ -44,13 +44,13 @@ public class CompletionProposalsTest1  extends CompletionProposalsBaseTest{
 			"AMacro(x)"
 	};
 	
-	public CompletionProposalsTest1(String name) {
+	public CompletionTest_StatementStart_Prefix(String name) {
 		super(name);
 	}
 
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest1.class.getName());
-		suite.addTest(new CompletionProposalsTest1("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_StatementStart_Prefix.class.getName());
+		suite.addTest(new CompletionTest_StatementStart_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 		
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest11.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_VariableType_NoPrefix.java
index 1b70ab003e1..7e5fe590ace 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest11.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_VariableType_NoPrefix.java
@@ -17,10 +17,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Global scope, declaration start, with NO prefix
+ * Testing Variable_type, with NO prefix
  *
  */
-public class CompletionProposalsTest11  extends CompletionProposalsBaseTest{
+public class CompletionTest_VariableType_NoPrefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart11.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -32,13 +32,13 @@ public class CompletionProposalsTest11  extends CompletionProposalsBaseTest{
 	private final String[] expectedResults = {
 	};
 	
-	public CompletionProposalsTest11(String name) {
+	public CompletionTest_VariableType_NoPrefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest11.class.getName());
-		suite.addTest(new CompletionProposalsTest11("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_VariableType_NoPrefix.class.getName());
+		suite.addTest(new CompletionTest_VariableType_NoPrefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest3.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_VariableType_Prefix.java
index 057778bbffc..26173485cc6 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionProposalsTest3.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/CompletionTest_VariableType_Prefix.java
@@ -17,10 +17,10 @@ import org.eclipse.cdt.core.parser.ast.IASTCompletionNode.CompletionKind;
 /**
  * @author hamer
  * 
- * Testing Global scope, declaration start, with a prefix
+ * Testing Variable_type completion kind, with a prefix
  *
  */
-public class CompletionProposalsTest3  extends CompletionProposalsBaseTest{
+public class CompletionTest_VariableType_Prefix  extends CompletionProposalsBaseTest{
 	private final String fileName = "CompletionTestStart3.cpp";
 	private final String fileFullPath ="resources/contentassist/" + fileName;
 	private final String headerFileName = "CompletionTestStart.h";
@@ -37,13 +37,13 @@ public class CompletionProposalsTest3  extends CompletionProposalsBaseTest{
 			"AStruct"
 	};
 	
-	public CompletionProposalsTest3(String name) {
+	public CompletionTest_VariableType_Prefix(String name) {
 		super(name);
 	}
 	
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsTest3.class.getName());
-		suite.addTest(new CompletionProposalsTest3("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionTest_VariableType_Prefix.class.getName());
+		suite.addTest(new CompletionTest_VariableType_Prefix("testCompletionProposals"));
 		return suite;
 	}		
 	/* (non-Javadoc)
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest3.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_FieldType_NoPrefix_Bug50344.java
index a592bf7a4de..bd942d18a4f 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest3.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_FieldType_NoPrefix_Bug50344.java
@@ -22,7 +22,7 @@ import org.eclipse.cdt.ui.tests.text.contentassist.CompletionProposalsBaseTest;
  * Bug#50344 :Wrong completion in Class scope if before the first declaration
  *
  */
-public class CompletionProposalsFailedTest3  extends CompletionProposalsBaseTest{
+public class CompletionFailedTest_FieldType_NoPrefix_Bug50344  extends CompletionProposalsBaseTest{
 	
 	private final String fileName = "CompletionFailedTestStart3.h";
 	private final String fileFullPath ="resources/contentassist/failedtests/" + fileName;
@@ -35,13 +35,13 @@ public class CompletionProposalsFailedTest3  extends CompletionProposalsBaseTest
 	private final String[] expectedResults = {
 	};
 	
-	public CompletionProposalsFailedTest3(String name) {
+	public CompletionFailedTest_FieldType_NoPrefix_Bug50344(String name) {
 		super(name);
 	}
 
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsFailedTest3.class.getName());
-		suite.addTest(new CompletionProposalsFailedTest3("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionFailedTest_FieldType_NoPrefix_Bug50344.class.getName());
+		suite.addTest(new CompletionFailedTest_FieldType_NoPrefix_Bug50344("testCompletionProposals"));
 		return suite;
 	}		
 	
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest1.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_ScopedReference_NoPrefix_Bug50152.java
index 0bf7a4f3cb9..3273d2aea49 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest1.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_ScopedReference_NoPrefix_Bug50152.java
@@ -18,11 +18,11 @@ import org.eclipse.cdt.ui.tests.text.contentassist.CompletionProposalsBaseTest;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, Namespace context, with no prefix
+ * Testing Scoped_Reference, with no prefix
  * Bug#50152: Wrong context sent after a "::"
  *
  */
-public class CompletionProposalsFailedTest1  extends CompletionProposalsBaseTest{
+public class CompletionFailedTest_ScopedReference_NoPrefix_Bug50152  extends CompletionProposalsBaseTest{
 	
 	private final String fileName = "CompletionFailedTestStart1.cpp";
 	private final String fileFullPath ="resources/contentassist/failedtests/" + fileName;
@@ -36,13 +36,13 @@ public class CompletionProposalsFailedTest1  extends CompletionProposalsBaseTest
 			// shoud be "aNamespaceFunction() void"
 	};
 	
-	public CompletionProposalsFailedTest1(String name) {
+	public CompletionFailedTest_ScopedReference_NoPrefix_Bug50152(String name) {
 		super(name);
 	}
 
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsFailedTest1.class.getName());
-		suite.addTest(new CompletionProposalsFailedTest1("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionFailedTest_ScopedReference_NoPrefix_Bug50152.class.getName());
+		suite.addTest(new CompletionFailedTest_ScopedReference_NoPrefix_Bug50152("testCompletionProposals"));
 		return suite;
 	}		
 	
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest2.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_ScopedReference_Prefix_Bug50152.java
index e255a3f04ea..3632a06e456 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionProposalsFailedTest2.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/text/contentassist/failedtests/CompletionFailedTest_ScopedReference_Prefix_Bug50152.java
@@ -18,11 +18,11 @@ import org.eclipse.cdt.ui.tests.text.contentassist.CompletionProposalsBaseTest;
 /**
  * @author hamer
  * 
- * Testing Function/Method scope, Namespace context, with a prefix
+ * Testing Scoped_Reference, with a prefix
  * Bug#50152: Wrong context sent after a "::"
  *
  */
-public class CompletionProposalsFailedTest2  extends CompletionProposalsBaseTest{
+public class CompletionFailedTest_ScopedReference_Prefix_Bug50152  extends CompletionProposalsBaseTest{
 	
 	private final String fileName = "CompletionFailedTestStart2.cpp";
 	private final String fileFullPath ="resources/contentassist/failedtests/" + fileName;
@@ -36,13 +36,13 @@ public class CompletionProposalsFailedTest2  extends CompletionProposalsBaseTest
 			// shoud be "aNamespaceFunction() void"
 	};
 	
-	public CompletionProposalsFailedTest2(String name) {
+	public CompletionFailedTest_ScopedReference_Prefix_Bug50152(String name) {
 		super(name);
 	}
 
 	public static Test suite() {
-		TestSuite suite= new TestSuite(CompletionProposalsFailedTest2.class.getName());
-		suite.addTest(new CompletionProposalsFailedTest2("testCompletionProposals"));
+		TestSuite suite= new TestSuite(CompletionFailedTest_ScopedReference_Prefix_Bug50152.class.getName());
+		suite.addTest(new CompletionFailedTest_ScopedReference_Prefix_Bug50152("testCompletionProposals"));
 		return suite;
 	}