Skip to content
Snippets Groups Projects
Commit 42d49994 authored by Alexander Diewald's avatar Alexander Diewald
Browse files

Merge branch '3725' into 'master' 

3725

See merge request !4
parents acff4939 3e46fff3
No related branches found
No related tags found
1 merge request!43725
Hide whitespace changes
Inline Side-by-side
org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF
+ 25
− 25
View file @ 42d49994
...@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.rcp.application ...@@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.rcp.application
Bundle-ManifestVersion: 2 Bundle-ManifestVersion: 2
Bundle-Name: AF3 RCP Bundle-Name: AF3 RCP
Bundle-SymbolicName: org.fortiss.af3.rcp.application;singleton:=true Bundle-SymbolicName: org.fortiss.af3.rcp.application;singleton:=true
Bundle-Version: 2.14.0.qualifier Bundle-Version: 2.15.0.qualifier
Bundle-Activator: org.fortiss.af3.rcp.application.AF3ApplicationActivator Bundle-Activator: org.fortiss.af3.rcp.application.AF3ApplicationActivator
Bundle-Vendor: fortiss GmbH Bundle-Vendor: fortiss GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-RequiredExecutionEnvironment: JavaSE-11
...@@ -19,30 +19,30 @@ Export-Package: org.fortiss.af3.rcp.application; ...@@ -19,30 +19,30 @@ Export-Package: org.fortiss.af3.rcp.application;
org.osgi.framework", org.osgi.framework",
org.fortiss.af3.rcp.application.example, org.fortiss.af3.rcp.application.example,
test.org.fortiss.af3.rcp.application test.org.fortiss.af3.rcp.application
Require-Bundle: eu.fbk.af3.tools.diagram.ui;bundle-version="2.14.0", Require-Bundle: eu.fbk.af3.tools.diagram.ui;bundle-version="2.15.0",
org.fortiss.af3.cosimulation.ui;bundle-version="2.14.0", org.fortiss.af3.cosimulation.ui;bundle-version="2.15.0",
org.fortiss.af3.exploration.ui;bundle-version="2.14.0", org.fortiss.af3.exploration.ui;bundle-version="2.15.0",
org.fortiss.af3.mira.ui;bundle-version="2.14.0", org.fortiss.af3.mira.ui;bundle-version="2.15.0",
org.fortiss.af3.mode.ui;bundle-version="2.14.0", org.fortiss.af3.mode.ui;bundle-version="2.15.0",
org.fortiss.af3.msc.ui;bundle-version="2.14.0", org.fortiss.af3.msc.ui;bundle-version="2.15.0",
org.fortiss.af3.operatorpanel.ui;bundle-version="2.14.0", org.fortiss.af3.operatorpanel.ui;bundle-version="2.15.0",
org.fortiss.af3.platform.beagle.ui;bundle-version="2.14.0", org.fortiss.af3.platform.beagle.ui;bundle-version="2.15.0",
org.fortiss.af3.partition.ui;bundle-version="2.14.0", org.fortiss.af3.partition.ui;bundle-version="2.15.0",
org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.14.0", org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.15.0",
org.fortiss.af3.platform.ui;bundle-version="2.14.0", org.fortiss.af3.platform.ui;bundle-version="2.15.0",
org.fortiss.af3.project;bundle-version="2.14.0", org.fortiss.af3.project;bundle-version="2.15.0",
org.fortiss.af3.project.ui;bundle-version="2.14.0", org.fortiss.af3.project.ui;bundle-version="2.15.0",
org.fortiss.af3.refinement.ui;bundle-version="2.14.0", org.fortiss.af3.refinement.ui;bundle-version="2.15.0",
org.fortiss.af3.safety.ui;bundle-version="2.14.0", org.fortiss.af3.safety.ui;bundle-version="2.15.0",
org.fortiss.af3.safetycases.ui;bundle-version="2.14.0", org.fortiss.af3.safetycases.ui;bundle-version="2.15.0",
org.fortiss.af3.task.ui;bundle-version="2.14.0", org.fortiss.af3.task.ui;bundle-version="2.15.0",
org.fortiss.af3.schedule.ui;bundle-version="2.14.0", org.fortiss.af3.schedule.ui;bundle-version="2.15.0",
org.fortiss.af3.specification.ui;bundle-version="2.14.0", org.fortiss.af3.specification.ui;bundle-version="2.15.0",
org.fortiss.af3.state.ui;bundle-version="2.14.0", org.fortiss.af3.state.ui;bundle-version="2.15.0",
org.fortiss.af3.testing.ui;bundle-version="2.14.0", org.fortiss.af3.testing.ui;bundle-version="2.15.0",
org.fortiss.af3.testing;bundle-version="2.14.0", org.fortiss.af3.testing;bundle-version="2.15.0",
org.fortiss.af3.timing.ui;bundle-version="2.14.0", org.fortiss.af3.timing.ui;bundle-version="2.15.0",
org.fortiss.tooling.kernel.ui;bundle-version="2.14.0", org.fortiss.tooling.kernel.ui;bundle-version="2.15.0",
javax.servlet, javax.servlet,
javax.servlet.jsp, javax.servlet.jsp,
org.apache.commons.logging, org.apache.commons.logging,
......
org.fortiss.af3.rcp.application/plugin.xml
+ 1
− 1
View file @ 42d49994
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</property> </property>
<property <property
name="aboutText" name="aboutText"
value="AutoFOCUS 3 - &quot;Phoenix&quot;&#x0A;&#x0A;Version: 2.14.0&#x0A;&#x0A;Copyright 2011-present fortiss GmbH&#x0A;&#x0A;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#x0A;you may not use this file except in compliance with the License.&#x0A;You may obtain a copy of the License at&#x0A;&#x0A; http://www.apache.org/licenses/LICENSE-2.0&#x0A;&#x0A;Unless required by applicable law or agreed to in writing, software&#x0A;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#x0A;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either &#x0A;express or implied. See the License for the specific language &#x0A;governing permissions and limitations under the License."> value="AutoFOCUS 3 - &quot;Phoenix&quot;&#x0A;&#x0A;Version: 2.15.0&#x0A;&#x0A;Copyright 2011-present fortiss GmbH&#x0A;&#x0A;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#x0A;you may not use this file except in compliance with the License.&#x0A;You may obtain a copy of the License at&#x0A;&#x0A; http://www.apache.org/licenses/LICENSE-2.0&#x0A;&#x0A;Unless required by applicable law or agreed to in writing, software&#x0A;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#x0A;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either &#x0A;express or implied. See the License for the specific language &#x0A;governing permissions and limitations under the License.">
</property> </property>
<property <property
name="startupProgressRect" name="startupProgressRect"
......
org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/example/LoadExampleTest.java deleted 100644 → 0
+ 0
− 108
View file @ acff4939
/*-------------------------------------------------------------------------+
| Copyright 2013 fortiss GmbH |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+--------------------------------------------------------------------------*/
package test.org.fortiss.af3.rcp.application.example;
import static org.junit.Assert.assertTrue;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.forms.finder.SWTFormsBot;
import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
// Class to be removed since SWTbot will be retired: #1987
/**
* SWTBot Test for Simple Traffic Lights Test Specification Example
*
* @author guven
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class LoadExampleTest {
/** workbench bot */
private static SWTWorkbenchBot bot;
/** form bot */
private static SWTFormsBot botF;
private boolean flag = false;
private static final int WaitingTime = 1000;
private static final String actionText =
"Load Simple Traffic Lights Test Specification Example";
private static final String SimpleTrafficLightsTestSpecificEx =
"SimpleTrafficLightsTestSpecificExample";
/**
* creates new SWTBot work bench
*/
@BeforeClass
public static void beforeClass() {
// SWTBotPreferences.PLAYBACK_DELAY = 100; //put in for slow playback
SWTBotPreferences.TYPE_INTERVAL = 0; // put in for fast playback
bot = new SWTWorkbenchBot();
botF = new SWTFormsBot();
bot.sleep(WaitingTime);
bot.viewByTitle("Welcome").close();
}
/**
* tests the simple traffic light test example
*
* @throws Exception
*
*/
@Test
public void test() throws Exception {
// Creation of the project
bot.perspectiveByLabel("Modeling").activate();
bot.sleep(WaitingTime);
bot.menu("File").menu("Open AF3 Example").menu(actionText).click();
bot.sleep(WaitingTime);
SWTBotView viewModelNavigator = bot.viewByTitle("Model Navigator");
SWTBotTree treeTestEx = viewModelNavigator.bot().tree();
SWTBotTreeItem treeItemAF3Project = treeTestEx.getAllItems()[0];
treeItemAF3Project.select();
canSave();
SWTBotTreeItem architectureNode = treeItemAF3Project.expand().getNode("TL-Architecture");
SWTBotTreeItem controllerNode = architectureNode.expand().getNode("Controller");
if(controllerNode.expand().getItems().length == 3)
flag = true;
assertTrue(flag);
// fail("Not yet implemented");
}
/** save the changing */
private void canSave() throws Exception {
bot.perspectiveByLabel("Modeling").activate();
bot.sleep(WaitingTime);
bot.menu("File").menu("Save").click();
}
}
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