Commit 5b5a8d02 authored by taste's avatar taste
Browse files

Delete test case

The test was checking that parameterless GUIs were detected as an error
This is now supported in taste
parent 1c5cb806
This diff is collapsed.
TASTE-Dataview DEFINITIONS ::=
BEGIN
IMPORTS T-Int32, T-UInt32, T-Int8, T-UInt8, T-Boolean FROM TASTE-BasicTypes;
-- A few simple types to start with ASN.1
MyInteger ::= T-UInt8
MyReal ::= REAL (0.0 .. 1000.0)
MyBool ::= BOOLEAN
MyEnum ::= ENUMERATED { hello, world, howareyou }
MySeq ::= SEQUENCE {
input-data MyInteger,
output-data MyInteger,
validity ENUMERATED { valid, invalid }
}
MyChoice ::= CHOICE {
a BOOLEAN,
b MySeq
}
MySeqOf ::= SEQUENCE (SIZE (2)) OF MyEnum
MyOctStr ::= OCTET STRING (SIZE (3))
-- You can also declare constants
myVar MySeqOf ::= { hello, world }
END
---------------------------------------------------
-- AADL2.1
-- TASTE type deploymentview
--
-- generated code: do not edit
---------------------------------------------------
PACKAGE deploymentview::DV::Node1
PUBLIC
WITH Taste;
WITH Deployment;
WITH TASTE_DV_Properties;
PROCESS demo
END demo;
PROCESS IMPLEMENTATION demo.others
END demo.others;
END deploymentview::DV::Node1;
PACKAGE deploymentview::DV
PUBLIC
WITH interfaceview::IV::Orchestrator;
WITH interfaceview::IV::FaultyGUI;
WITH ocarina_processors_x86;
WITH deploymentview::DV::Node1;
WITH Taste;
WITH Deployment;
WITH interfaceview::IV;
WITH TASTE_DV_Properties;
SYSTEM Node1
END Node1;
SYSTEM IMPLEMENTATION Node1.others
SUBCOMPONENTS
IV_Orchestrator : SYSTEM interfaceview::IV::Orchestrator::Orchestrator.others {
Taste::FunctionName => "Orchestrator";
};
IV_FaultyGUI : SYSTEM interfaceview::IV::FaultyGUI::FaultyGUI.others {
Taste::FunctionName => "FaultyGUI";
};
demo : PROCESS deploymentview::DV::Node1::demo.others {
Taste::coordinates => "122454 73037 154706 93871";
Deployment::Port_Number => 0;
};
x86_linux : PROCESSOR ocarina_processors_x86::x86.linux {
Taste::coordinates => "118579 65668 158894 95430";
};
PROPERTIES
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_Orchestrator;
Taste::APLC_Binding => (reference (demo)) APPLIES TO IV_FaultyGUI;
Actual_Processor_Binding => (reference (x86_linux)) APPLIES TO demo;
END Node1.others;
SYSTEM deploymentview
END deploymentview;
SYSTEM IMPLEMENTATION deploymentview.others
SUBCOMPONENTS
Node1 : SYSTEM Node1.others {
Taste::coordinates => "113540 57164 163933 99682";
};
interfaceview : SYSTEM interfaceview::IV::interfaceview.others;
END deploymentview.others;
PROPERTIES
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.0";
Taste::interfaceView => "InterfaceView.aadl";
Taste::HWLibraries => ("../../../tool-inst/share/ocarina/AADLv2/ocarina_components.aadl");
END deploymentview::DV;
---------------------------------------------------
-- AADL2.1
-- TASTE type interfaceview
--
-- generated code: do not edit
---------------------------------------------------
PACKAGE interfaceview::IV::Orchestrator
PUBLIC
WITH interfaceview::IV::FaultyGUI;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_pulse
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_pulse;
SUBPROGRAM IMPLEMENTATION PI_pulse.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_pulse.others;
SUBPROGRAM PI_toto
PROPERTIES
Taste::Associated_Queue_Size => 1;
END PI_toto;
SUBPROGRAM IMPLEMENTATION PI_toto.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_toto.others;
SUBPROGRAM RI_ArgUI
END RI_ArgUI;
SUBPROGRAM IMPLEMENTATION RI_ArgUI.others
END RI_ArgUI.others;
SYSTEM Orchestrator
FEATURES
PI_pulse : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Orchestrator::PI_pulse.others {
Taste::coordinates => "102361 56376";
Taste::RCMoperationKind => cyclic;
Taste::RCMperiod => 12 ms;
Taste::Deadline => 0 ms;
Taste::InterfaceName => "pulse";
};
PI_toto : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::Orchestrator::PI_toto.others {
Taste::coordinates => "111178 60472";
Taste::RCMoperationKind => sporadic;
Taste::InterfaceName => "toto";
};
RI_ArgUI : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::FaultyGUI::PI_ArgUI.others {
Taste::coordinates => "111178 65196";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "ArgUI";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (C);
Taste::Active_Interfaces => any;
END Orchestrator;
SYSTEM IMPLEMENTATION Orchestrator.others
END Orchestrator.others;
END interfaceview::IV::Orchestrator;
PACKAGE interfaceview::IV::FaultyGUI
PUBLIC
WITH interfaceview::IV::Orchestrator;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SUBPROGRAM PI_ArgUI
END PI_ArgUI;
SUBPROGRAM IMPLEMENTATION PI_ArgUI.others
PROPERTIES
Compute_Execution_Time => 0 ms .. 0 ms;
END PI_ArgUI.others;
SUBPROGRAM RI_toto
END RI_toto;
SUBPROGRAM IMPLEMENTATION RI_toto.others
END RI_toto.others;
SYSTEM FaultyGUI
FEATURES
PI_ArgUI : PROVIDES SUBPROGRAM ACCESS interfaceview::IV::FaultyGUI::PI_ArgUI.others {
Taste::coordinates => "129918 68189";
Taste::RCMoperationKind => sporadic;
Taste::InterfaceName => "ArgUI";
};
RI_toto : REQUIRES SUBPROGRAM ACCESS interfaceview::IV::Orchestrator::PI_toto.others {
Taste::coordinates => "129918 63465";
Taste::RCMoperationKind => any;
Taste::InterfaceName => "toto";
Taste::labelInheritance => "true";
};
PROPERTIES
Source_Language => (GUI);
Taste::Active_Interfaces => any;
END FaultyGUI;
SYSTEM IMPLEMENTATION FaultyGUI.others
END FaultyGUI.others;
END interfaceview::IV::FaultyGUI;
PACKAGE interfaceview::IV
PUBLIC
WITH interfaceview::IV::Orchestrator;
WITH interfaceview::IV::FaultyGUI;
WITH Taste;
WITH DataView;
WITH TASTE_IV_Properties;
SYSTEM interfaceview
END interfaceview;
SYSTEM IMPLEMENTATION interfaceview.others
SUBCOMPONENTS
Orchestrator : SYSTEM interfaceview::IV::Orchestrator::Orchestrator.others {
Taste::coordinates => "89761 56376 111178 65983";
};
FaultyGUI : SYSTEM interfaceview::IV::FaultyGUI::FaultyGUI.others {
Taste::coordinates => "129918 58739 169129 93541";
};
CONNECTIONS
Orchestrator_PI_toto_FaultyGUI_RI_toto : SUBPROGRAM ACCESS Orchestrator.PI_toto -> FaultyGUI.RI_toto {
Taste::coordinates => "129918 63465 120548 63465 120548 60472 111178 60472";
};
FaultyGUI_PI_ArgUI_Orchestrator_RI_ArgUI : SUBPROGRAM ACCESS FaultyGUI.PI_ArgUI -> Orchestrator.RI_ArgUI {
Taste::coordinates => "111178 65196 120548 65196 120548 68189 129918 68189";
};
END interfaceview.others;
PROPERTIES
Taste::dataView => ("DataView");
Taste::dataViewPath => ("DataView.aadl");
Taste::coordinates => "0 0 297000 210000";
Taste::version => "2.0";
END interfaceview::IV;
KAZOO=../../kazoo
all: test-parse
test-parse: clean
$(KAZOO) --gw \
-o output \
--glue \
--debug \
-i InterfaceView.aadl \
-c DeploymentView.aadl \
-d DataView.aadl \
2>&1 | tail -1 | diff expected -
clean:
rm -rf output
.PHONY: clean test-parse
[ERROR] Function FaultyGUI's interfaces must all have exactly one parameter
TASTE-BasicTypes DEFINITIONS ::=
BEGIN
-- Set of TASTE predefined basic types
T-Int32 ::= INTEGER (-2147483648 .. 2147483647)
T-UInt32 ::= INTEGER (0 .. 4294967295)
T-Int8 ::= INTEGER (-128 .. 127)
T-UInt8 ::= INTEGER (0 .. 255)
T-Boolean ::= BOOLEAN
END
Supports Markdown
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