renamed a lot of the LR parser tests

23 files changed, 218 insertions, 220 deletions

diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java
deleted file mode 100644
index 32c07c56fc0..00000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionParseTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99CompletionParseTest;
-
-public class UPCC99CompletionParseTest extends C99CompletionParseTest {
-
-	public UPCC99CompletionParseTest() { }
-	public UPCC99CompletionParseTest(String name) { super(name); }
-	
-	@Override
-	protected BaseExtensibleLanguage getC99Language() {
-		return UPCLanguage.getDefault();
-	}
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java
deleted file mode 100644
index c236bf00c93..00000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationInclusionTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationInclusionTests;
-
-public class UPCC99DOMLocationInclusionTests extends C99DOMLocationInclusionTests {
-	
-	public UPCC99DOMLocationInclusionTests() {
-	}
-
-	public UPCC99DOMLocationInclusionTests(String name) {
-		super(name);
-	}
-
-	@Override
-	protected BaseExtensibleLanguage getC99Language() {
-		return UPCLanguage.getDefault();
-	}
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java
deleted file mode 100644
index 9aaaf2a61c7..00000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DigraphTrigraphTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99DigraphTrigraphTests;
-
-
-public class UPCC99DigraphTrigraphTests extends C99DigraphTrigraphTests {
-
-	public UPCC99DigraphTrigraphTests() { }
-	public UPCC99DigraphTrigraphTests(String name) { super(name); }
-
-	@Override
-	protected BaseExtensibleLanguage getLanguage() {
-		return UPCLanguage.getDefault();
-	}
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java
deleted file mode 100644
index 72eb13f5081..00000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SelectionParseTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.core.parser.upc.tests;
-
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99SelectionParseTest;
-
-public class UPCC99SelectionParseTest extends C99SelectionParseTest {
-
-	public UPCC99SelectionParseTest() { }
-	public UPCC99SelectionParseTest(String name) { super(name); }
-
-	
-	@Override
-	protected BaseExtensibleLanguage getC99Language() {
-		return UPCLanguage.getDefault();
-	}
-}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99KnRTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java
index b5b254088a8..54f87b22b0f 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99KnRTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCSpecTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,17 +10,21 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99KnRTests;
+import org.eclipse.cdt.core.lrparser.tests.LRCSpecTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99KnRTests extends C99KnRTests {
+public class UPCCSpecTests extends LRCSpecTests {
 
-	public UPCC99KnRTests() {
+	public UPCCSpecTests() {
+	}
+
+	public UPCCSpecTests(String name) {
+		super(name);
 	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getCLanguage() {
 		return UPCLanguage.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CommentTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java
index 376f0418128..348902a0e7c 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CommentTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCommentTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99CommentTests;
+import org.eclipse.cdt.core.lrparser.tests.LRCommentTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99CommentTests extends C99CommentTests {
+public class UPCCommentTests extends LRCommentTests {
 	
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilOldTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java
index 9d3aee00671..7d18d2b1414 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilOldTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompleteParser2Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99UtilOldTests;
+import org.eclipse.cdt.core.lrparser.tests.LRCompleteParser2Tests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99UtilOldTests extends C99UtilOldTests {
+public class UPCCompleteParser2Tests extends LRCompleteParser2Tests {
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionBasicTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java
index 287c7d6fdee..6353ad0bbf7 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompletionBasicTest.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionBasicTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.lrparser.c99.C99Language;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99CompletionBasicTest;
+import org.eclipse.cdt.core.lrparser.tests.LRCompletionBasicTest;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99CompletionBasicTest extends C99CompletionBasicTest {
+public class UPCCompletionBasicTest extends LRCompletionBasicTest {
 
-	public UPCC99CompletionBasicTest() { }
+	public UPCCompletionBasicTest() { }
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return C99Language.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java
new file mode 100644
index 00000000000..7208a3c7687
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCCompletionParseTest.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.lrparser.tests.LRCompletionParseTest;
+import org.eclipse.cdt.core.model.ILanguage;
+
+public class UPCCompletionParseTest extends LRCompletionParseTest {
+
+	public UPCCompletionParseTest() { }
+	public UPCCompletionParseTest(String name) { super(name); }
+	
+	@Override
+	protected ILanguage getC99Language() {
+		return UPCLanguage.getDefault();
+	}
+}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99GCCTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java
index 2debeefe409..9a76613e012 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99GCCTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationInclusionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,22 +10,21 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99GCCTests;
+import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationInclusionTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99GCCTests extends C99GCCTests {
+public class UPCDOMLocationInclusionTests extends LRDOMLocationInclusionTests {
 	
-	public UPCC99GCCTests() {
+	public UPCDOMLocationInclusionTests() {
 	}
-	
-	public UPCC99GCCTests(String message) {
-		super(message);
+
+	public UPCDOMLocationInclusionTests(String name) {
+		super(name);
 	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
-
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMPreprocessorInformationTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java
index d46398babce..3ed629bf5d6 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMPreprocessorInformationTest.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationMacroTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,15 +10,17 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMPreprocessorInformationTest;
+import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationMacroTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99DOMPreprocessorInformationTest extends C99DOMPreprocessorInformationTest {
+public class UPCDOMLocationMacroTests extends LRDOMLocationMacroTests {
+
+	public UPCDOMLocationMacroTests() {
+	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
     	return UPCLanguage.getDefault();
     }
-
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java
index 90005c24cb2..bad2b688ee6 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMLocationTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,21 +10,21 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationTests;
+import org.eclipse.cdt.core.lrparser.tests.LRDOMLocationTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99DOMLocationTests extends C99DOMLocationTests {
+public class UPCDOMLocationTests extends LRDOMLocationTests {
 
-	public UPCC99DOMLocationTests() {
+	public UPCDOMLocationTests() {
 	}
 
-	public UPCC99DOMLocationTests(String name) {
+	public UPCDOMLocationTests(String name) {
 		super(name);
 	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 	    return UPCLanguage.getDefault();
 	}
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationMacroTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java
index 4e14043177a..15f74558153 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99DOMLocationMacroTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDOMPreprocessorInformationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,17 +10,15 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99DOMLocationMacroTests;
+import org.eclipse.cdt.core.lrparser.tests.LRDOMPreprocessorInformationTest;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99DOMLocationMacroTests extends C99DOMLocationMacroTests {
-
-	public UPCC99DOMLocationMacroTests() {
-	}
+public class UPCDOMPreprocessorInformationTest extends LRDOMPreprocessorInformationTest {
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
     	return UPCLanguage.getDefault();
     }
+
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SpecTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java
index c342ab82120..990f5b15ebb 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99SpecTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCDigraphTrigraphTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,22 +10,18 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99SpecTests;
+import org.eclipse.cdt.core.lrparser.tests.LRDigraphTrigraphTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99SpecTests extends C99SpecTests {
 
-	public UPCC99SpecTests() {
-	}
+public class UPCDigraphTrigraphTests extends LRDigraphTrigraphTests {
 
-	public UPCC99SpecTests(String name) {
-		super(name);
-	}
+	public UPCDigraphTrigraphTests() { }
+	public UPCDigraphTrigraphTests(String name) { super(name); }
 
 	@Override
-	protected BaseExtensibleLanguage getCLanguage() {
+	protected ILanguage getCLanguage() {
 		return UPCLanguage.getDefault();
 	}
-
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java
index d5d9fba2361..8b8f2ea3eac 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99CompleteParser2Tests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCGCCTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,14 +10,21 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99CompleteParser2Tests;
+import org.eclipse.cdt.core.lrparser.tests.LRGCCTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99CompleteParser2Tests extends C99CompleteParser2Tests {
+public class UPCGCCTests extends LRGCCTests {
+	
+	public UPCGCCTests() {
+	}
+	
+	public UPCGCCTests(String message) {
+		super(message);
+	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java
index c167045cdaf..cac0c19edc8 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99UtilTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCKnRTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,14 +10,17 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99UtilTests;
+import org.eclipse.cdt.core.lrparser.tests.LRKnRTests;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99UtilTests extends C99UtilTests {
+public class UPCKnRTests extends LRKnRTests {
+
+	public UPCKnRTests() {
+	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
index dfec4dc6f6f..78250638b5c 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
index d1afdb0cbe1..ff84f06c478 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,27 +16,25 @@ import junit.framework.TestSuite;
 public class UPCParserTestSuite extends TestSuite {
 	
 	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		
-		suite.addTestSuite(UPCC99CommentTests.class);
-		suite.addTestSuite(UPCC99CompletionBasicTest.class);
-		suite.addTestSuite(UPCC99CompletionParseTest.class);
-		suite.addTestSuite(UPCC99DOMLocationInclusionTests.class);
-		suite.addTestSuite(UPCC99DOMLocationMacroTests.class);
-		suite.addTestSuite(UPCC99DOMLocationTests.class);
-		suite.addTestSuite(UPCC99DOMPreprocessorInformationTest.class);
-		suite.addTestSuite(UPCC99KnRTests.class);
-		suite.addTestSuite(UPCC99SelectionParseTest.class);
-		suite.addTestSuite(UPCC99SpecTests.class);
-		suite.addTestSuite(UPCC99Tests.class);
-		suite.addTestSuite(UPCLanguageExtensionTests.class);
-		suite.addTestSuite(UPCC99DigraphTrigraphTests.class);
-		suite.addTestSuite(UPCC99GCCTests.class);
-		suite.addTestSuite(UPCC99UtilOldTests.class);
-		suite.addTestSuite(UPCC99UtilTests.class);
-		suite.addTestSuite(UPCC99CompleteParser2Tests.class);
-		suite.addTestSuite(UPCC99TaskParserTest.class);
-		
-		return suite;
+		return new TestSuite() {{
+			addTestSuite(UPCCommentTests.class);
+			addTestSuite(UPCCompletionBasicTest.class);
+			addTestSuite(UPCCompletionParseTest.class);
+			addTestSuite(UPCDOMLocationInclusionTests.class);
+			addTestSuite(UPCDOMLocationMacroTests.class);
+			addTestSuite(UPCDOMLocationTests.class);
+			addTestSuite(UPCDOMPreprocessorInformationTest.class);
+			addTestSuite(UPCKnRTests.class);
+			addTestSuite(UPCSelectionParseTest.class);
+			addTestSuite(UPCCSpecTests.class);
+			addTestSuite(UPCTests.class);
+			addTestSuite(UPCLanguageExtensionTests.class);
+			addTestSuite(UPCDigraphTrigraphTests.class);
+			addTestSuite(UPCGCCTests.class);
+			addTestSuite(UPCUtilOldTests.class);
+			addTestSuite(UPCUtilTests.class);
+			addTestSuite(UPCCompleteParser2Tests.class);
+			addTestSuite(UPCTaskParserTest.class);
+		}};
 	}
 }
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java
new file mode 100644
index 00000000000..6b1345bfb04
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCSelectionParseTest.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.lrparser.tests.LRSelectionParseTest;
+import org.eclipse.cdt.core.model.ILanguage;
+
+public class UPCSelectionParseTest extends LRSelectionParseTest {
+
+	public UPCSelectionParseTest() { }
+	public UPCSelectionParseTest(String name) { super(name); }
+
+	
+	@Override
+	protected ILanguage getC99Language() {
+		return UPCLanguage.getDefault();
+	}
+}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java
index 5231b3ecd13..2bfdf839f00 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99TaskParserTest.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTaskParserTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,14 +10,14 @@
  *******************************************************************************/
 package org.eclipse.cdt.core.parser.upc.tests;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99TaskParserTest;
+import org.eclipse.cdt.core.lrparser.tests.LRTaskParserTest;
+import org.eclipse.cdt.core.model.ILanguage;
 
-public class UPCC99TaskParserTest extends C99TaskParserTest {
+public class UPCTaskParserTest extends LRTaskParserTest {
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99Tests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java
index 9cf08d3f375..d2c245260f4 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCC99Tests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,25 +12,25 @@ package org.eclipse.cdt.core.parser.upc.tests;
 
 import junit.framework.TestSuite;
 
-import org.eclipse.cdt.core.dom.lrparser.BaseExtensibleLanguage;
 import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.lrparser.tests.c99.C99Tests;
+import org.eclipse.cdt.core.lrparser.tests.LRTests;
+import org.eclipse.cdt.core.model.ILanguage;
 /**
  * Run the C99 tests against the UPC parser
  *
  */
-public class UPCC99Tests extends C99Tests {
+public class UPCTests extends LRTests {
 
 	public static TestSuite suite() {
-    	return suite(UPCC99Tests.class);
+    	return suite(UPCTests.class);
     }
 	
-	public UPCC99Tests(String name) {
+	public UPCTests(String name) {
 		super(name);
 	}
 
 	@Override
-	protected BaseExtensibleLanguage getC99Language() {
+	protected ILanguage getC99Language() {
 		return UPCLanguage.getDefault();
 	}
 	
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java
new file mode 100644
index 00000000000..3c29524c27f
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilOldTests.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.lrparser.tests.LRUtilOldTests;
+import org.eclipse.cdt.core.model.ILanguage;
+
+public class UPCUtilOldTests extends LRUtilOldTests {
+
+	@Override
+	protected ILanguage getC99Language() {
+		return UPCLanguage.getDefault();
+	}
+
+}
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java
new file mode 100644
index 00000000000..b3cb530ff4e
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCUtilTests.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.core.parser.upc.tests;
+
+import org.eclipse.cdt.core.dom.upc.UPCLanguage;
+import org.eclipse.cdt.core.lrparser.tests.LRUtilTests;
+import org.eclipse.cdt.core.model.ILanguage;
+
+public class UPCUtilTests extends LRUtilTests {
+
+	@Override
+	protected ILanguage getC99Language() {
+		return UPCLanguage.getDefault();
+	}
+
+}