From c4c63453c38e0b83c2d0c32c377f14eefa554c08 Mon Sep 17 00:00:00 2001 From: John Moule Date: Tue, 15 Nov 2022 12:30:44 +0000 Subject: [PATCH] Bug 580015: add support for multiple bin parsers #75 Fixed build props of new test plugin. Fixed test, cleanup project afterwards. --- .../build.properties | 1 + .../core/build/TestICBuildConfiguration.java | 20 +++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/build/org.eclipse.cdt.build.gcc.core.tests/build.properties b/build/org.eclipse.cdt.build.gcc.core.tests/build.properties index d944674ba0b..cdd2db7f1f5 100644 --- a/build/org.eclipse.cdt.build.gcc.core.tests/build.properties +++ b/build/org.eclipse.cdt.build.gcc.core.tests/build.properties @@ -4,3 +4,4 @@ bin.includes = META-INF/,\ .,\ about.html,\ plugin.properties +src.includes = about.html diff --git a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/build/TestICBuildConfiguration.java b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/build/TestICBuildConfiguration.java index 7fd1ee7919b..15bfa5ebd60 100644 --- a/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/build/TestICBuildConfiguration.java +++ b/core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/core/build/TestICBuildConfiguration.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.cdt.core.build; +import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -23,12 +24,28 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.NullProgressMonitor; +import org.junit.After; +import org.junit.Before; import org.junit.Test; /** * Tests for org.eclipse.cdt.core.build.ICBuildConfiguration */ public class TestICBuildConfiguration { + private IProject testProject = null; + + @Before + public void setup() throws Exception { + testProject = getProject(); + assertNotNull("Test project must not be null", testProject); + } + + @After + public void shutdown() throws Exception { + if (testProject != null) { + testProject.delete(true, true, new NullProgressMonitor()); + } + } /** * Tests that ICBuildConfiguration.getBinaryParserIds() meets API.
@@ -38,8 +55,7 @@ public class TestICBuildConfiguration { */ @Test public void getBinaryParserIdsTest00() throws Exception { - IProject proj = getProject(); - IBuildConfiguration[] buildConfigs = proj.getBuildConfigs(); + IBuildConfiguration[] buildConfigs = testProject.getBuildConfigs(); assertNotNull(buildConfigs, "Must not be null"); assertNotEquals(0, buildConfigs.length, "Must not be empty"); IBuildConfiguration buildConfig = buildConfigs[0];