Commit 69c572a3 authored by Simon Barner's avatar Simon Barner
Browse files

Adapt to updated default name "Component Architecture"


Issue-Ref: 3816
Issue-Url: https://af3-developer.fortiss.org/issues/3816

Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
parent 140a0392
......@@ -582,7 +582,7 @@ public class EditorTest {
/** Create a component. */
private void canCreateComponent(SWTBotTreeItem treeItemAF3Project) throws Exception {
treeItemAF3Project.contextMenu("Component Architecture").click();
treeItemAF3Project.getNode("Component Architecture Root").contextMenu("Component").click();
treeItemAF3Project.getNode("Component Architecture").contextMenu("Component").click();
bot.activeEditor().save();
}
......@@ -592,7 +592,7 @@ public class EditorTest {
editor.show();
editor.bot().button(1).click();
SWTBotShell shell = bot.activeShell();
shell.bot().tree().expandNode("Component Architecture Root").select("Component");
shell.bot().tree().expandNode("Component Architecture").select("Component");
shell.bot().button("OK").click();
}
......
......@@ -743,7 +743,7 @@ public class MiraHelpTest {
editor.bot().buttonWithTooltip("Assign target").click();
shell = bot.activeShell();
shell.bot().tree().expandNode("Component Architecture Root").select("Component");
shell.bot().tree().expandNode("Component Architecture").select("Component");
shell.bot().button("OK").click();
}
......@@ -759,7 +759,7 @@ public class MiraHelpTest {
editor.bot().buttonWithTooltip("Assign target").click();
SWTBotShell shell = bot.activeShell();
shell.bot().tree().expandNode("Component Architecture Root").select("Component");
shell.bot().tree().expandNode("Component Architecture").select("Component");
shell.bot().button("OK").click();
editor.bot().button("Add refinement specification", 1).click();
......@@ -887,7 +887,7 @@ public class MiraHelpTest {
/** Create a component. */
private void canCreateComponent(SWTBotTreeItem treeItemAF3Project) throws Exception {
treeItemAF3Project.contextMenu("Component Architecture").click();
treeItemAF3Project.getNode("Component Architecture Root").contextMenu("Component").click();
treeItemAF3Project.getNode("Component Architecture").contextMenu("Component").click();
bot.activeEditor().save();
}
......@@ -897,7 +897,7 @@ public class MiraHelpTest {
editor.show();
editor.bot().buttonWithTooltip("Assign Scope").click();
SWTBotShell shell = bot.activeShell();
shell.bot().tree().expandNode("Component Architecture Root").select("Component");
shell.bot().tree().expandNode("Component Architecture").select("Component");
shell.bot().button("OK").click();
}
......
......@@ -298,7 +298,7 @@ public class MiraRelationTest {
// In the external traces editor.
editor.bot().buttonWithTooltip("Assign target").click();
shell = bot.activeShell();
shell.bot().tree(0).expandNode("Component Architecture Root").select("Component");
shell.bot().tree(0).expandNode("Component Architecture").select("Component");
bot.button("OK").click();
// Check refinement specification.
......@@ -327,7 +327,7 @@ public class MiraRelationTest {
/** Create a component. */
private void canCreateComponent(SWTBotTreeItem treeItemAF3Project) throws Exception {
treeItemAF3Project.contextMenu("Component Architecture").click();
treeItemAF3Project.getNode("Component Architecture Root").contextMenu("Component").click();
treeItemAF3Project.getNode("Component Architecture").contextMenu("Component").click();
bot.activeEditor().save();
}
......@@ -337,7 +337,7 @@ public class MiraRelationTest {
editor.show();
editor.bot().buttonWithTooltip("Assign Scope").click();
SWTBotShell shell = bot.activeShell();
shell.bot().tree().expandNode("Component Architecture Root").select("Component");
shell.bot().tree().expandNode("Component Architecture").select("Component");
shell.bot().button("OK").click();
}
......
......@@ -2,7 +2,7 @@ AuthorConstraint.java 388bf883f2d3c1d0d2b062a5c698914d0570b8b7 GREEN
ComponentExistsConstraint.java 9e0048c7452adcea6d8424722b4a2622289bcec7 GREEN
ComponentNameMeaningfulConstraint.java cb187db98094a1c34845311952e161e1bb13c22c YELLOW
ComponentPackageExistsConstraint.java a9046afa399d1064f00daf5c374deaf5967d271b GREEN
ComponentToRequirementTraceExistsConstraint.java 0d48c8ca5a223df9710a483f2d6d1a814011bd71 GREEN
ComponentToRequirementTraceExistsConstraint.java aa30b5454e8be7dcbb64e5439b8c103fe8e75259 YELLOW
DescriptionAndOrConstraint.java 8e55d44b4f447bdc1e181e5100a03095db707526 GREEN
DescriptionConstraint.java d939aa5b55ac78f104dcc3fc1b503ef9bc8c1f29 GREEN
EveryDefinedSignalIsUsed.java 622900d37785bafe5da7edc2f45576559efd6a70 GREEN
......
......@@ -51,9 +51,8 @@ public class ComponentToRequirementTraceExistsConstraint extends ComponentConstr
if(componentTraceAvailable == true) {
traceAvailable = true;
}
if(comp.getName().equalsIgnoreCase("Component Architecture Root")) {
// if top component node is available. don't do anything but make the traceAvailable
// to true
if(comp.getName().toLowerCase().startsWith("component architecture")) {
// If top component node is available, set traceAvailable to true
traceAvailable = true;
}
return successIfTrue(traceAvailable);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment