mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-25 01:45:33 +02:00
Add a new Meson property page test
- add NewMesonConfigureTest.java - fix extraneous "meson" string in console output when performing a meson configure - add new test to AutomatedIntegrationSuite for Meson UI test plug-in Change-Id: Ic10520a0d420d380df95117b69200409a48226b3
This commit is contained in:
Jeff Johnston
parent
980eb1b25c
commit
1a05bf6910
3 changed files with 411 additions and 3 deletions
|
|
@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
|
|||
import org.junit.runners.Suite;
|
||||
|
||||
@RunWith(Suite.class)
|
||||
@Suite.SuiteClasses({ NewMesonProjectTest.class })
|
||||
@Suite.SuiteClasses({ NewMesonProjectTest.class, NewMesonConfigureTest.class })
|
||||
public class AutomatedIntegrationSuite {
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,409 @@
|
|||
/*******************************************************************************
|
||||
* Copyright (c) 2017, 2018 QNX Software Systems 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:
|
||||
* Red Hat Inc. - modified for Meson testing
|
||||
*******************************************************************************/
|
||||
package org.eclipse.cdt.internal.meson.ui.tests;
|
||||
|
||||
import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.withRegex;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.eclipse.cdt.core.CCorePlugin;
|
||||
import org.eclipse.cdt.core.index.IIndexManager;
|
||||
import org.eclipse.cdt.core.model.CoreModel;
|
||||
import org.eclipse.cdt.core.model.IBinary;
|
||||
import org.eclipse.cdt.core.model.ICProject;
|
||||
import org.eclipse.cdt.internal.meson.ui.tests.utils.CloseWelcomePageRule;
|
||||
import org.eclipse.cdt.meson.core.MesonNature;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.core.resources.ResourcesPlugin;
|
||||
import org.eclipse.epp.logging.aeri.core.ISystemSettings;
|
||||
import org.eclipse.epp.logging.aeri.core.SendMode;
|
||||
import org.eclipse.epp.logging.aeri.core.SystemControl;
|
||||
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
|
||||
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
|
||||
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
|
||||
import org.eclipse.swtbot.swt.finder.waits.Conditions;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableItem;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotText;
|
||||
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
|
||||
import org.junit.Before;
|
||||
import org.junit.BeforeClass;
|
||||
import org.junit.ClassRule;
|
||||
import org.junit.FixMethodOrder;
|
||||
import org.junit.Test;
|
||||
import org.junit.runners.MethodSorters;
|
||||
|
||||
@SuppressWarnings("nls")
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
public class NewMesonConfigureTest {
|
||||
|
||||
private static SWTWorkbenchBot bot;
|
||||
|
||||
@ClassRule
|
||||
public static CloseWelcomePageRule closeWelcomePage = new CloseWelcomePageRule(
|
||||
CloseWelcomePageRule.CDT_PERSPECTIVE_ID);
|
||||
|
||||
@BeforeClass
|
||||
public static void beforeClass() {
|
||||
SWTBotPreferences.TIMEOUT = 50000;
|
||||
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
|
||||
SWTBotPreferences.PLAYBACK_DELAY = 500;
|
||||
bot = new SWTWorkbenchBot();
|
||||
}
|
||||
|
||||
@Before
|
||||
public void before() {
|
||||
ISystemSettings settings = SystemControl.getSystemSettings();
|
||||
settings.setSendMode(SendMode.NEVER);
|
||||
bot.resetWorkbench();
|
||||
}
|
||||
|
||||
@Test(timeout = 120000)
|
||||
public void addNewMesonProject() throws Exception {
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Activate C/C++ wizard
|
||||
bot.menu("File").menu("New").menu("C/C++ Project").click();
|
||||
bot.shell("New C/C++ Project").activate();
|
||||
|
||||
// Double click on the template
|
||||
SWTBotTable templateTable = bot.table();
|
||||
bot.getDisplay().syncExec(() -> {
|
||||
for (int i = 0; i < templateTable.rowCount(); ++i) {
|
||||
SWTBotTableItem item = templateTable.getTableItem(i);
|
||||
if ("Meson Project".equals(item.widget.getData(SWTBotPreferences.DEFAULT_KEY))) {
|
||||
item.doubleClick();
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Select the shell again since magic wizardry happened
|
||||
SWTBotShell newProjectShell = bot.shell("New Meson Project").activate();
|
||||
bot.waitUntil(Conditions.shellIsActive("New Meson Project"));
|
||||
newProjectShell.setFocus();
|
||||
|
||||
// Create the project
|
||||
String projectName = "MesonTestProj2";
|
||||
bot.sleep(2000);
|
||||
SWTBotText text = bot.textWithLabel("Project name:");
|
||||
text.setText(projectName);
|
||||
bot.button("Finish").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellCloses(newProjectShell));
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
ICProject cproject = CoreModel.getDefault().create(project);
|
||||
IIndexManager indexManager = CCorePlugin.getIndexManager();
|
||||
while (!indexManager.isProjectContentSynced(cproject)) {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
|
||||
// Make sure it has the right nature
|
||||
assertTrue(project.hasNature(MesonNature.ID));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void attemptMesonConfiguration() throws Exception {
|
||||
String projectName = "MesonTestProj2";
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
ICProject cproject = CoreModel.getDefault().create(project);
|
||||
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
SWTBotTreeItem proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
|
||||
proj.contextMenu("Properties").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellIsActive("Properties for MesonTestProj2"));
|
||||
|
||||
SWTBotShell propertiesShell = bot.shell("Properties for MesonTestProj2").activate();
|
||||
|
||||
propertiesShell.bot().tree().getTreeItem("Meson").click();
|
||||
|
||||
propertiesShell.bot().textInGroup("Environment").setText("CFLAGS=\"-DJeff\"");
|
||||
|
||||
propertiesShell.bot().checkBox("werror").click();
|
||||
|
||||
propertiesShell.bot().comboBoxWithLabel("buildtype").setSelection("debug");
|
||||
|
||||
propertiesShell.bot().comboBoxWithLabel("warnlevel").setSelection("2");
|
||||
|
||||
bot.sleep(2000);
|
||||
|
||||
propertiesShell.bot().button("Apply and Close").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellCloses(propertiesShell));
|
||||
|
||||
proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
|
||||
proj.contextMenu("Properties").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellIsActive("Properties for MesonTestProj2"));
|
||||
|
||||
propertiesShell = bot.shell("Properties for MesonTestProj2").activate();
|
||||
|
||||
propertiesShell.bot().tree().getTreeItem("Meson").click();
|
||||
|
||||
assertEquals("CFLAGS=\"-DJeff\"", propertiesShell.bot().textInGroup("Environment").getText());
|
||||
|
||||
assertTrue(propertiesShell.bot().checkBox("werror").isChecked());
|
||||
|
||||
assertEquals("debug", propertiesShell.bot().comboBoxWithLabel("buildtype").getText());
|
||||
|
||||
assertEquals("2", propertiesShell.bot().comboBoxWithLabel("warnlevel").getText());
|
||||
|
||||
propertiesShell.bot().button("Cancel").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellCloses(propertiesShell));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void buildMesonProject() throws Exception {
|
||||
String projectName = "MesonTestProj2";
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
ICProject cproject = CoreModel.getDefault().create(project);
|
||||
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
SWTBotTreeItem proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
proj.contextMenu("Build Project").click();
|
||||
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IIndexManager indexManager = CCorePlugin.getIndexManager();
|
||||
while (!indexManager.isProjectContentSynced(cproject)) {
|
||||
Thread.sleep(1000);
|
||||
}
|
||||
|
||||
// check the build console output
|
||||
SWTBotView console = bot.viewByPartName("Console");
|
||||
console.show();
|
||||
console.setFocus();
|
||||
|
||||
String[] lines = new String[0];
|
||||
|
||||
while (lines.length < 16) {
|
||||
String output = console.bot().styledText().getText();
|
||||
lines = output.split("\\r?\\n"); //$NON-NLS-1$
|
||||
bot.sleep(2000);
|
||||
}
|
||||
|
||||
bot.sleep(2000);
|
||||
|
||||
assertEquals("Building in: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[0]);
|
||||
assertEquals("env CFLAGS=\"-DJeff\" sh -c \"meson --backend=ninja --buildtype=debug --unity=off --werror --layout=mirror --default-library=shared --warnlevel=2 /home/jjohnstn/junit-workspace/MesonTestProj2\"", lines[1]);
|
||||
assertEquals("The Meson build system", lines[2]);
|
||||
assertTrue(lines[3].startsWith("Version:"));
|
||||
assertEquals("Source dir: /home/jjohnstn/junit-workspace/MesonTestProj2", lines[4]);
|
||||
assertEquals("Build dir: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[5]);
|
||||
assertEquals("Build type: native build", lines[6]);
|
||||
assertEquals("Project name: MesonTestProj2", lines[7]);
|
||||
assertTrue(lines[8].startsWith("Native C compiler: cc"));
|
||||
assertEquals("Build targets in project: 1", lines[12]);
|
||||
assertTrue(lines[13].startsWith("[1/2] cc -IMesonTestProj2@exe"));
|
||||
assertTrue(lines[13].contains("-Werror"));
|
||||
assertTrue(lines[14].startsWith("FAILED"));
|
||||
assertTrue(lines[17].contains("Werror=unused-parameter"));
|
||||
assertEquals("Build complete: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[lines.length-1]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void configureAfterBuild() throws Exception {
|
||||
String projectName = "MesonTestProj2";
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
ICProject cproject = CoreModel.getDefault().create(project);
|
||||
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
SWTBotTreeItem proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
|
||||
proj.contextMenu("Properties").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellIsActive("Properties for MesonTestProj2"));
|
||||
|
||||
SWTBotShell propertiesShell = bot.shell("Properties for MesonTestProj2").activate();
|
||||
|
||||
propertiesShell.bot().tree().getTreeItem("Meson").click();
|
||||
|
||||
assertEquals("true", propertiesShell.bot().comboBoxWithLabel("werror").getText());
|
||||
|
||||
assertEquals("2", propertiesShell.bot().comboBoxWithLabel("warning_level").getText());
|
||||
|
||||
assertEquals("debug", propertiesShell.bot().comboBoxWithLabel("buildtype").getText());
|
||||
|
||||
assertEquals("-DJeff", propertiesShell.bot().textWithLabel("c_args").getText());
|
||||
|
||||
propertiesShell.bot().comboBoxWithLabel("warning_level").setSelection("1");
|
||||
|
||||
propertiesShell.bot().comboBoxWithLabel("werror").setSelection("false");
|
||||
|
||||
bot.sleep(2000);
|
||||
|
||||
propertiesShell.bot().button("Apply and Close").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellCloses(propertiesShell));
|
||||
|
||||
proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
|
||||
proj.contextMenu("Properties").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellIsActive("Properties for MesonTestProj2"));
|
||||
|
||||
propertiesShell = bot.shell("Properties for MesonTestProj2").activate();
|
||||
|
||||
propertiesShell.bot().tree().getTreeItem("Meson").click();
|
||||
|
||||
assertEquals("-DJeff", propertiesShell.bot().textWithLabel("c_args").getText());
|
||||
|
||||
assertEquals("false", propertiesShell.bot().comboBoxWithLabel("werror").getText());
|
||||
|
||||
assertEquals("debug", propertiesShell.bot().comboBoxWithLabel("buildtype").getText());
|
||||
|
||||
assertEquals("1", propertiesShell.bot().comboBoxWithLabel("warning_level").getText());
|
||||
|
||||
propertiesShell.bot().button("Cancel").click();
|
||||
|
||||
bot.waitUntil(Conditions.shellCloses(propertiesShell));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void rebuildMesonProject() throws Exception {
|
||||
String projectName = "MesonTestProj2";
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
ICProject cproject = CoreModel.getDefault().create(project);
|
||||
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
SWTBotTreeItem proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
proj.contextMenu("Build Project").click();
|
||||
|
||||
boolean foundExecutable = false;
|
||||
while (!foundExecutable) {
|
||||
IBinary[] binaries = cproject.getBinaryContainer().getBinaries();
|
||||
if (binaries.length > 0) {
|
||||
for (IBinary binary : binaries) {
|
||||
if (binary.getResource().getName().startsWith(projectName)) {
|
||||
foundExecutable = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
bot.sleep(1000);
|
||||
}
|
||||
assertTrue(foundExecutable);
|
||||
|
||||
// check the build console output
|
||||
SWTBotView console = bot.viewByPartName("Console");
|
||||
console.show();
|
||||
console.setFocus();
|
||||
String output = console.bot().styledText().getText();
|
||||
|
||||
String[] lines = output.split("\\r?\\n"); //$NON-NLS-1$
|
||||
|
||||
assertEquals("Building in: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[0]);
|
||||
assertEquals("The Meson build system", lines[2]);
|
||||
assertTrue(lines[3].startsWith("Version:"));
|
||||
assertEquals("Source dir: /home/jjohnstn/junit-workspace/MesonTestProj2", lines[4]);
|
||||
assertEquals("Build dir: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[5]);
|
||||
assertEquals("Build type: native build", lines[6]);
|
||||
assertEquals("Project name: MesonTestProj2", lines[7]);
|
||||
assertTrue(lines[8].startsWith("Native C compiler: cc"));
|
||||
assertEquals("Build targets in project: 1", lines[11]);
|
||||
assertTrue(lines[12].startsWith("[1/2] cc -IMesonTestProj2@exe"));
|
||||
assertTrue(lines[13].startsWith("[2/2] cc -o MesonTestProj2"));
|
||||
assertEquals("Build complete: /home/jjohnstn/junit-workspace/MesonTestProj2/build/default", lines[lines.length-1]);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void runMesonProject() throws Exception {
|
||||
String projectName = "MesonTestProj2";
|
||||
// Make sure the project indexer completes. At that point we're stable.
|
||||
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
|
||||
CoreModel.getDefault().create(project);
|
||||
|
||||
// open C++ perspective
|
||||
if (!"C/C++".equals(bot.activePerspective().getLabel())) {
|
||||
bot.perspectiveByLabel("C/C++").activate();
|
||||
}
|
||||
|
||||
// Make sure it shows up in Project Explorer
|
||||
SWTBotView explorer = bot.viewByPartName("Project Explorer");
|
||||
explorer.show();
|
||||
explorer.setFocus();
|
||||
SWTBotTreeItem proj = explorer.bot().tree().getTreeItem(projectName).select();
|
||||
|
||||
proj.expand();
|
||||
proj.expandNode("Binaries");
|
||||
|
||||
SWTBotTreeItem binaries = proj.getNode("Binaries").select();
|
||||
binaries.getNode(0).contextMenu("Run As").menu(withRegex(".*Local C.*"), false, 0).click();
|
||||
bot.sleep(4000);
|
||||
|
||||
SWTBotView console = bot.viewByPartName("Console");
|
||||
console.show();
|
||||
console.setFocus();
|
||||
String output = "";
|
||||
|
||||
boolean done = false;
|
||||
while (!done) {
|
||||
// check the build console output
|
||||
output = console.bot().styledText().getText();
|
||||
if (output.startsWith("Hello") || !output.startsWith("Building in")) {
|
||||
done = true;
|
||||
}
|
||||
bot.sleep(2000);
|
||||
}
|
||||
String[] lines = output.split("\\r?\\n"); //$NON-NLS-1$
|
||||
assertEquals("Hello World", lines[0]);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -272,10 +272,9 @@ public class MesonPropertyPage extends PropertyPage {
|
|||
try (OutputStream stdout = console.getOutputStream()) {
|
||||
OutputStream stderr = stdout;
|
||||
StringBuilder buf = new StringBuilder();
|
||||
buf.append("meson");
|
||||
for (String arg : args) {
|
||||
buf.append(" "); //$NON-NLS-1$
|
||||
buf.append(arg);
|
||||
buf.append(" "); //$NON-NLS-1$
|
||||
}
|
||||
buf.append(System.lineSeparator());
|
||||
stdout.write(buf.toString().getBytes());
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue