diff --git a/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF b/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF index 685de1f8f5f9c2701ce934cf4a9dcb723d46d14b..56241bf8c6921f4b2b844eba3e7e316c7ad38126 100644 --- a/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF +++ b/org.fortiss.af3.rcp.application/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.fortiss.af3.rcp.application Bundle-ManifestVersion: 2 Bundle-Name: AF3 RCP 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-Vendor: fortiss GmbH Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -19,30 +19,30 @@ Export-Package: org.fortiss.af3.rcp.application; org.osgi.framework", org.fortiss.af3.rcp.application.example, test.org.fortiss.af3.rcp.application -Require-Bundle: eu.fbk.af3.tools.diagram.ui;bundle-version="2.14.0", - org.fortiss.af3.cosimulation.ui;bundle-version="2.14.0", - org.fortiss.af3.exploration.ui;bundle-version="2.14.0", - org.fortiss.af3.mira.ui;bundle-version="2.14.0", - org.fortiss.af3.mode.ui;bundle-version="2.14.0", - org.fortiss.af3.msc.ui;bundle-version="2.14.0", - org.fortiss.af3.operatorpanel.ui;bundle-version="2.14.0", - org.fortiss.af3.platform.beagle.ui;bundle-version="2.14.0", - org.fortiss.af3.partition.ui;bundle-version="2.14.0", - org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.14.0", - org.fortiss.af3.platform.ui;bundle-version="2.14.0", - org.fortiss.af3.project;bundle-version="2.14.0", - org.fortiss.af3.project.ui;bundle-version="2.14.0", - org.fortiss.af3.refinement.ui;bundle-version="2.14.0", - org.fortiss.af3.safety.ui;bundle-version="2.14.0", - org.fortiss.af3.safetycases.ui;bundle-version="2.14.0", - org.fortiss.af3.task.ui;bundle-version="2.14.0", - org.fortiss.af3.schedule.ui;bundle-version="2.14.0", - org.fortiss.af3.specification.ui;bundle-version="2.14.0", - org.fortiss.af3.state.ui;bundle-version="2.14.0", - org.fortiss.af3.testing.ui;bundle-version="2.14.0", - org.fortiss.af3.testing;bundle-version="2.14.0", - org.fortiss.af3.timing.ui;bundle-version="2.14.0", - org.fortiss.tooling.kernel.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.15.0", + org.fortiss.af3.exploration.ui;bundle-version="2.15.0", + org.fortiss.af3.mira.ui;bundle-version="2.15.0", + org.fortiss.af3.mode.ui;bundle-version="2.15.0", + org.fortiss.af3.msc.ui;bundle-version="2.15.0", + org.fortiss.af3.operatorpanel.ui;bundle-version="2.15.0", + org.fortiss.af3.platform.beagle.ui;bundle-version="2.15.0", + org.fortiss.af3.partition.ui;bundle-version="2.15.0", + org.fortiss.af3.platform.hierarchic.ui;bundle-version="2.15.0", + org.fortiss.af3.platform.ui;bundle-version="2.15.0", + org.fortiss.af3.project;bundle-version="2.15.0", + org.fortiss.af3.project.ui;bundle-version="2.15.0", + org.fortiss.af3.refinement.ui;bundle-version="2.15.0", + org.fortiss.af3.safety.ui;bundle-version="2.15.0", + org.fortiss.af3.safetycases.ui;bundle-version="2.15.0", + org.fortiss.af3.task.ui;bundle-version="2.15.0", + org.fortiss.af3.schedule.ui;bundle-version="2.15.0", + org.fortiss.af3.specification.ui;bundle-version="2.15.0", + org.fortiss.af3.state.ui;bundle-version="2.15.0", + org.fortiss.af3.testing.ui;bundle-version="2.15.0", + org.fortiss.af3.testing;bundle-version="2.15.0", + org.fortiss.af3.timing.ui;bundle-version="2.15.0", + org.fortiss.tooling.kernel.ui;bundle-version="2.15.0", javax.servlet, javax.servlet.jsp, org.apache.commons.logging, diff --git a/org.fortiss.af3.rcp.application/plugin.xml b/org.fortiss.af3.rcp.application/plugin.xml index 46bed6cbcbb101cd840167f8e371adc8a4ea9dc4..fa35ea8ca197e392b772f195783931ac22929f0e 100644 --- a/org.fortiss.af3.rcp.application/plugin.xml +++ b/org.fortiss.af3.rcp.application/plugin.xml @@ -38,7 +38,7 @@ </property> <property name="aboutText" - value="AutoFOCUS 3 - "Phoenix"

Version: 2.14.0

Copyright 2011-present 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."> + value="AutoFOCUS 3 - "Phoenix"

Version: 2.15.0

Copyright 2011-present 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."> </property> <property name="startupProgressRect" diff --git a/org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/example/LoadExampleTest.java b/org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/example/LoadExampleTest.java deleted file mode 100644 index 32d1e47821d2b19512b328ca4cdfd3477ae513cb..0000000000000000000000000000000000000000 --- a/org.fortiss.af3.rcp.application/test-src/test/org/fortiss/af3/rcp/application/example/LoadExampleTest.java +++ /dev/null @@ -1,108 +0,0 @@ -/*-------------------------------------------------------------------------+ -| 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(); - - } - -}