Skip to content

Commit 0058b25

Browse files
author
jantje
committed
Added tool provider. Still need to use it
1 parent ab1ed6d commit 0058b25

File tree

16 files changed

+609
-178
lines changed

16 files changed

+609
-178
lines changed

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateBasicProjects.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
import io.sloeber.autoBuild.api.AutoBuildProject;
2626
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
2727
import io.sloeber.autoBuild.api.ICodeProvider;
28+
import io.sloeber.autoBuild.api.IToolProvider;
29+
import io.sloeber.autoBuild.api.IToolProviderManager;
2830
import io.sloeber.autoBuild.extensionPoint.providers.AutoBuildCommon;
2931
import io.sloeber.autoBuild.helpers.Shared;
3032
import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -39,6 +41,7 @@ public class CreateBasicProjects {
3941
private boolean doTestDefaultBuilder = true;
4042
private boolean doTestInternalBuilder = true;
4143
private boolean doTestMakeBuilder = true;
44+
static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
4245

4346
@BeforeAll
4447
static void beforeAll() {
@@ -55,7 +58,7 @@ static void buildAllConfigsAsActive(String builderName, String projectName, Stri
5558
Boolean shouldMakefileExists) throws Exception {
5659

5760
IProject testProject = AutoBuildProject.createProject(String.format("%03d", testCounter++) + "_" + projectName,
58-
extensionPointID, extensionID, projectTypeID, natureID, codeProvider, false, null);
61+
extensionPointID, extensionID, projectTypeID, natureID, codeProvider, toolprovider, false, null);
5962
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
6063
for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {
6164
cProjectDesc.setActiveConfiguration(curConfig);
@@ -69,7 +72,7 @@ static void buildAllConfigs(String builderName, String projectName, String exten
6972
throws Exception {
7073

7174
IProject testProject = AutoBuildProject.createProject(String.format("%03d", testCounter++) + "_" + projectName,
72-
extensionPointID, extensionID, projectTypeID, natureID, codeProvider, false, null);
75+
extensionPointID, extensionID, projectTypeID, natureID, codeProvider, toolprovider, false, null);
7376
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
7477
Set<String> configs = new HashSet<>();
7578

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/CreateProject.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import org.junit.jupiter.params.provider.MethodSource;
1111
import io.sloeber.autoBuild.api.AutoBuildProject;
1212
import io.sloeber.autoBuild.api.ICodeProvider;
13+
import io.sloeber.autoBuild.api.IToolProvider;
14+
import io.sloeber.autoBuild.api.IToolProviderManager;
1315
import io.sloeber.autoBuild.extensionPoint.providers.AutoBuildCommon;
1416
import io.sloeber.autoBuild.helpers.Shared;
1517
import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
@@ -25,6 +27,7 @@
2527

2628
@SuppressWarnings("nls")
2729
class CreateProject {
30+
static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
2831

2932
@BeforeAll
3033
static void beforeAll() {
@@ -39,7 +42,7 @@ void testExample(String myProjectName, String extensionID, String extensionImpID
3942
String natureID, ICodeProvider codeProvider) throws Exception {
4043

4144
IProject testProject = AutoBuildProject.createProject(myProjectName, extensionID, extensionImpID, projectTypeID,
42-
natureID, codeProvider, false, null);
45+
natureID, codeProvider, toolprovider, false, null);
4346
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
4447
for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {
4548
cProjectDesc.setActiveConfiguration(curConfig);

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/issues.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,14 @@
2020
import org.junit.jupiter.api.BeforeAll;
2121

2222
import io.sloeber.autoBuild.api.AutoBuildProject;
23+
import io.sloeber.autoBuild.api.IToolProvider;
24+
import io.sloeber.autoBuild.api.IToolProviderManager;
2325
import io.sloeber.autoBuild.helpers.Shared;
2426
import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
2527

2628
@SuppressWarnings({ "nls", "static-method" })
2729
public class issues {
30+
static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
2831

2932
@BeforeAll
3033
public static void beforeAll() {
@@ -99,8 +102,8 @@ public void setDescriptionDoesNotSetDescription() throws Exception {
99102
CoreModel coreModel = CoreModel.getDefault();
100103

101104
IProject testProject = AutoBuildProject.createProject(projectName, defaultExtensionPointID,
102-
defaultProjectTypeID, defaultExtensionID, defaultNatureID, new TemplateTestCodeProvider("exe"), false,
103-
null);
105+
defaultProjectTypeID, defaultExtensionID, defaultNatureID, new TemplateTestCodeProvider("exe"),
106+
toolprovider, false, null);
104107

105108
ICProjectDescription cProjectDesc = CCorePlugin.getDefault().getProjectDescription(testProject, true);
106109
for (ICConfigurationDescription curConfig : cProjectDesc.getConfigurations()) {

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuild/regression/regression.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929
import io.sloeber.autoBuild.api.AutoBuildProject;
3030
import io.sloeber.autoBuild.api.IAutoBuildConfigurationDescription;
31+
import io.sloeber.autoBuild.api.IToolProvider;
32+
import io.sloeber.autoBuild.api.IToolProviderManager;
3133
import io.sloeber.autoBuild.extensionPoint.providers.MakeRule;
3234
import io.sloeber.autoBuild.extensionPoint.providers.MakeRules;
3335
import io.sloeber.autoBuild.helpers.Shared;
@@ -40,6 +42,7 @@
4042
public class regression {
4143
static private String extensionPointID = "io.sloeber.autoBuild.buildDefinitions";
4244
static int testCounter = 1;
45+
static IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
4346

4447
@BeforeAll
4548
public static void beforeAll() {
@@ -72,7 +75,7 @@ public void createCloseOpenProject() throws Exception {
7275

7376
IProject testProject = AutoBuildProject.createProject(projectName, extensionPointID, "cdt.cross.gnu",
7477
"cdt.managedbuild.target.gnu.cross.exe", CCProjectNature.CC_NATURE_ID,
75-
new TemplateTestCodeProvider("exe"), false, null);
78+
new TemplateTestCodeProvider("exe"), toolprovider, false, null);
7679

7780
//Build all the configurations and verify proper building
7881
Shared.buildAndVerifyProjectUsingActivConfig(testProject, null);
@@ -111,7 +114,7 @@ public void setBuilder() throws Exception {
111114

112115
IProject testProject = AutoBuildProject.createProject(projectName, extensionPointID, "cdt.cross.gnu",
113116
"cdt.managedbuild.target.gnu.cross.exe", CCProjectNature.CC_NATURE_ID,
114-
new TemplateTestCodeProvider("exe"), false, null);
117+
new TemplateTestCodeProvider("exe"), toolprovider, false, null);
115118

116119
//Build the active configuration and verify proper building
117120
Shared.BuildAndVerifyActiveConfig(testProject);
@@ -169,7 +172,7 @@ void testOptions(String optionID, String optionValue, String commandContribution
169172
if (testProject == null || !testProject.exists()) {
170173
testProject = AutoBuildProject.createProject(projectName, extensionPointID, "io.sloeber.autoBuild.test",
171174
"io.sloeber.autoBuild.projectType.test.options", CCProjectNature.CC_NATURE_ID,
172-
new TemplateTestCodeProvider("exe"), false, null);
175+
new TemplateTestCodeProvider("exe"), toolprovider, false, null);
173176
}
174177

175178
//get the project and autobuild configurations

‎io.sloeber.autoBuild.test/src/io/sloeber/autoBuilld/investigate/CConfigurationDescriptionInvestigation.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import org.junit.Test;
1717
import org.junit.jupiter.api.BeforeAll;
1818
import io.sloeber.autoBuild.api.AutoBuildProject;
19+
import io.sloeber.autoBuild.api.IToolProvider;
20+
import io.sloeber.autoBuild.api.IToolProviderManager;
1921
import io.sloeber.autoBuild.helpers.Shared;
2022
import io.sloeber.autoBuild.helpers.TemplateTestCodeProvider;
2123

@@ -37,8 +39,9 @@ static void beforeAll() {
3739
public void testConfigDescription() {
3840
beforeAll();
3941
String projectName = "testConfigDescription";
42+
IToolProvider toolprovider = IToolProviderManager.getDefault().getAnyToolProvider();
4043
IProject testProject = AutoBuildProject.createProject(projectName, defaultExtensionPointID, defaultExtensionID,
41-
defaultProjectTypeID, defaultNatureID, new TemplateTestCodeProvider("exe"), false, null);
44+
defaultProjectTypeID, defaultNatureID, new TemplateTestCodeProvider("exe"), toolprovider, false, null);
4245
ICProjectDescription projectDesc = CoreModel.getDefault().getProjectDescription(testProject, true);
4346
for (ICConfigurationDescription curConf : projectDesc.getConfigurations()) {
4447
assertFalse("conf is readOnly class instance", curConf instanceof CConfigurationDescriptionCache);

‎io.sloeber.autoBuild.ui/src/io/sloeber/autoBuild/integrations/NewAutoBuildProjectWizard.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
import io.sloeber.autoBuild.api.AutoBuildProject;
2828
import io.sloeber.autoBuild.api.ICodeProvider;
29+
import io.sloeber.autoBuild.api.IToolProvider;
30+
import io.sloeber.autoBuild.api.IToolProviderManager;
2931
import io.sloeber.autoBuild.integration.AutoBuildManager;
3032
import io.sloeber.autoBuild.integration.AutoBuildProjectGenerator;
3133
import io.sloeber.autoBuild.ui.internal.Messages;
@@ -43,14 +45,15 @@ public boolean performFinish() {
4345
.toArray(new String[10])[0];
4446
String natureID = CCProjectNature.CC_NATURE_ID;
4547
ICodeProvider codeProvider = null;
48+
IToolProvider toolProvider = IToolProviderManager.getDefault().getAnyToolProvider();
4649
getContainer().run(true, true, new WorkspaceModifyOperation() {
4750
@Override
4851
protected void execute(IProgressMonitor monitor)
4952
throws CoreException, InvocationTargetException, InterruptedException {
5053
SubMonitor sub = SubMonitor.convert(monitor, Messages.TemplateWizard_Generating, 1);
5154

5255
AutoBuildProject.createProject(projectName, extensionPointID, extensionID, projectTypeID, natureID,
53-
codeProvider, false, sub);
56+
codeProvider, toolProvider, false, sub);
5457
// generator.generate(model, sub);
5558
// getWorkbench().getDisplay().asyncExec(new Runnable() {
5659
// @Override

0 commit comments

Comments
 (0)