From d00af009c744ded371f60c858d30f6f580114c4f Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Thu, 27 Oct 2022 15:34:10 -0400
Subject: [PATCH] There is a new way to mark tests as failing

And by "new" I mean 15 years old.

Part of #115
---
 .../eclipse/cdt/core/tests/FailingTester.java | 72 -------------------
 .../rename/RenameRegressionTests.java         | 17 +----
 .../refactoring/rename/RenameTestBase.java    |  2 +-
 3 files changed, 2 insertions(+), 89 deletions(-)
 delete mode 100644 core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java

diff --git a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java b/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java
deleted file mode 100644
index 492b245be8b..00000000000
--- a/core/org.eclipse.cdt.core.tests/regression/org/eclipse/cdt/core/tests/FailingTester.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2012 IBM Corporation and others.
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-/*
- * Created on Nov 1, 2004
- */
-package org.eclipse.cdt.core.tests;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-import junit.framework.TestFailure;
-import junit.framework.TestResult;
-
-/**
- * Wraps a test case to check for its failure.
- * @author aniefer
- */
-public class FailingTester extends TestCase {
-	private TestCase test = null;
-	private int bugNum = -1;
-
-	public FailingTester(TestCase test, int bugNumber) {
-		this.test = test;
-		this.bugNum = bugNumber;
-		String name = "Failing " + test.getName();
-		if (bugNum > 0) {
-			name += " [bug " + bugNum + "]";
-		}
-		setName(name);
-	}
-
-	public FailingTester(TestCase test) {
-		this(test, -1);
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.Test#run(junit.framework.TestResult)
-	 */
-	@Override
-	public void run(TestResult result) {
-		result.startTest(this);
-
-		TestResult r = new TestResult();
-		test.run(r);
-		if (r.failureCount() == 1) {
-			TestFailure failure = r.failures().nextElement();
-			String msg = failure.exceptionMessage();
-			if (msg != null && msg.startsWith("Method \"" + test.getName() + "\"")) {
-				result.addFailure(this, new AssertionFailedError(msg));
-			}
-		} else if (r.errorCount() == 0 && r.failureCount() == 0) {
-			String err = "Unexpected success"; //$NON-NLS-1$
-			if (bugNum != -1)
-				err += ", bug #" + bugNum; //$NON-NLS-1$
-			result.addFailure(this, new AssertionFailedError(err));
-		}
-
-		result.endTest(this);
-	}
-}
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
index beebc655b1b..21af7f5d33d 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameRegressionTests.java
@@ -17,7 +17,6 @@
 import java.io.StringWriter;
 
 import org.eclipse.cdt.core.dom.ast.IBinding;
-import org.eclipse.cdt.core.tests.FailingTester;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.ltk.core.refactoring.Change;
 import org.eclipse.ltk.core.refactoring.RefactoringStatus;
@@ -25,7 +24,6 @@
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
-import junit.framework.TestSuite;
 
 public class RenameRegressionTests extends RenameTestBase {
 	public RenameRegressionTests() {
@@ -37,20 +35,7 @@ public RenameRegressionTests(String name) {
 	}
 
 	public static Test suite() {
-		return suite(true);
-	}
-
-	public static Test suite(boolean cleanup) {
-		TestSuite innerSuite = new TestSuite(RenameRegressionTests.class);
-		innerSuite.addTest(new FailingTester(new RenameRegressionTests("_testMethod_35_72726"), 72726));
-
-		TestSuite suite = new TestSuite("RenameRegressionTests");
-		suite.addTest(innerSuite);
-
-		if (cleanup)
-			suite.addTest(new RenameRegressionTests("cleanupProject"));
-
-		return suite;
+		return suite(RenameRegressionTests.class, "_");
 	}
 
 	public void testSimpleRename() throws Exception {
diff --git a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java
index 16f396d7cfd..2854f98b3b8 100644
--- a/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java
+++ b/core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/rename/RenameTestBase.java
@@ -30,7 +30,7 @@
 /**
  * @author markus.schorn@windriver.com
  */
-public class RenameTestBase extends RefactoringTests {
+public abstract class RenameTestBase extends RefactoringTests {
 	private static final IProgressMonitor NPM = new NullProgressMonitor();
 
 	protected RenameTestBase(String name) {