Commit 96f1fee8 authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch 'master' of https://git.fortiss.org/af3/af3-rcp.git into 3417

parents f3e75281 a2961ca4
......@@ -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,
......
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=windows-1252"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<title></title>
<meta name="generator" content="LibreOffice 6.0.5.2 (Windows)"/>
<meta name="generator" content="LibreOffice 6.0.7.3 (Linux)"/>
<meta name="created" content="00:00:00"/>
<meta name="changed" content="2018-09-24T17:59:49.121000000"/>
<meta name="changed" content="2019-05-06T10:33:15.006709761"/>
<meta name="created" content="00:00:00">
<style type="text/css">
p.msonormal { margin-bottom: 0.28cm; font-family: "Calibri", sans-serif; font-size: 11pt; line-height: 107% }
p.msonormal { margin-bottom: 0.11in; font-family: "Calibri", sans-serif; font-size: 11pt; line-height: 107% }
a:visited { color: #954f72 }
</style>
</head>
<body lang="en-US" vlink="#954f72" dir="ltr">
<p class="msonormal"><font color="#212121">&nbsp;</font></p>
<p class="msonormal"><font color="#000000"><font face="Times New Roman, serif"><font size="5" style="font-size: 18pt"><b>New
features of Phoenix 2.14</b></font></font></font></p>
<p class="msonormal"><font color="#212121"><font face="Times New Roman, serif"><font size="3" style="font-size: 12pt"><b>Hierarchical
technical architecture model</b></font></font></font></p>
<ul type="disc">
features of Phoenix 2.15</b></font></font></font></p>
<ul>
<li/>
<p style="margin-bottom: 0cm; font-variant: normal; letter-spacing: normal; font-style: normal; orphans: 2; widows: 2">
<font color="#212121"><font face="Times New Roman, serif"><font size="3" style="font-size: 12pt"><b>Cosimulation:
</b><span style="font-weight: normal">AF3 now supports to simulate
projects that contain FMUs behaviors.</span></font></font></font></p>
<p class="msonormal" style="line-height: 107%"><span style="font-variant: normal"><font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt"><span style="letter-spacing: normal"><span style="font-style: normal"><span style="font-weight: normal">P</span></span></span></font></font></font></span><span style="font-variant: normal"><font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt"><span style="letter-spacing: normal"><span style="font-style: normal"><span style="font-weight: normal">latform
update</span></span></span></font></font></font></span></p>
<ul>
<li/>
<p class="msonormal" style="line-height: 107%"><span style="font-variant: normal"><font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt"><span style="letter-spacing: normal"><span style="font-style: normal"><span style="font-weight: normal">Build
on Eclipse 2018-12</span></span></span></font></font></font></span></p>
<li/>
<p class="msonormal" style="line-height: 107%"><span style="font-variant: normal"><font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt"><span style="letter-spacing: normal"><span style="font-style: normal"><span style="font-weight: normal">Requires
Java 11</span></span></span></font></font></font></span></p>
</ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Retire
deployment model in favor of allocation table</font></font></font></p>
<ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Allocation
tables enable to model deployments of logical architectures to
multiple layers of the technical architecture (e.g., tasks,
partitions, hardware platform).</font></font></font></p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">A
direct replacement for the previous deployments is the
&quot;component-to-execution unit&quot; allocation </font></font></font>
</p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">All
modules depending on deployments (DSE, code generators, ...) have
been ported to the new metamodel</font></font></font></p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Old
deployment models are migrated automatically (WCET specifications
are now found in &quot;Timing&quot; tab of the task architecture)</font></font></font></p>
</ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Introduce
timing specification model</font></font></font></p>
<ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Aligned
with TADL language defined in the TIMMO2USE project that served as
input for industrial standards such as AUTOSAR TIMEX and
APP4MC/AMALTHEA</font></font></font></p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Used
to define reaction/synchronization constraints between tasks and/or
messages that are considered by DSE</font></font></font></p>
</ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Design-Space
Exploration (DSE)</font></font></font></p>
<ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Overhaul
of DSE project model, process support, and UI</font></font></font></p>
<ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Supported
operations: import input model, define constraints/objectives,
perform exploration, pick/export solution</font></font></font></p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Use
snapshots to freeze input model before performing exploration
steps</font></font></font></p>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Old
DSE projects will not be migrated to the new DSE project model due
to the massive structural changes. They are automatically removed,
and a new DSE project has to be created manually (using the import
wizard)</font></font></font></p>
</ul>
<li/>
<p class="msonormal" style="font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; line-height: 107%">
<font color="#333333"><font face="Menlo, Monaco, Consolas, Courier New, monospace"><font size="2" style="font-size: 9pt">Improved
deployment and schedule synthesis (joint exploration of deployments
and schedules, minimization of latencies, task hardware decoupling
constraint) </font></font></font>
</p>
</ul>
</ul>
<p style="margin-bottom: 0cm"><br/>
</p>
<p style="margin-bottom: 0cm; font-variant: normal; letter-spacing: normal; font-style: normal; font-weight: normal; orphans: 2; widows: 2">
<font color="#212121"><font face="Times New Roman, serif"><font size="3" style="font-size: 12pt">For
further information see</font></font></font></p>
<p style="margin-bottom: 0cm; orphans: 2; widows: 2"><a name="LPlnk681489"></a>
<a href="https://download.fortiss.org/public/projects/af3/help/cosimulation_with_af3.html" target="_blank"><span style="font-variant: normal"><font color="#212121"><font face="Times New Roman, serif"><font size="3" style="font-size: 12pt"><span style="letter-spacing: normal"><span style="font-style: normal"><span style="font-weight: normal">https://download.fortiss.org/public/projects/af3/help/cosimulation_with_af3.html</span></span></span></font></font></font></span></a></p>
<p class="msonormal" style="line-height: 107%">&nbsp;</p>
</body>
</html>
\ No newline at end of file
......@@ -38,7 +38,7 @@
</property>
<property
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
name="startupProgressRect"
......
/*-------------------------------------------------------------------------+
| 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();
}
}
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