[NF] Update actualStream/inStream tests.

Belonging to [master]: - #152 - OpenModelica/OMCompiler#3062
OpenModelica · Apr 23, 2019 · fa080ae · fa080ae
1 parent dfa5362
commit fa080ae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 64 deletions.
diff --git a/testsuite/flattening/modelica/scodeinst/ActualStreamNoStream1.mo b/testsuite/flattening/modelica/scodeinst/ActualStreamNoStream1.mo
@@ -17,7 +17,7 @@ end ActualStreamNoStream1;
 
 // Result:
 // Error processing file: ActualStreamNoStream1.mo
-// [flattening/modelica/scodeinst/ActualStreamNoStream1.mo:15:3-15:30:writable] Error: Operand c.f to operator actualStream is not a stream variable.
+// [flattening/modelica/scodeinst/ActualStreamNoStream1.mo:15:3-15:30:writable] Error: Operand ‘c.f‘ to operator ‘actualStream‘ is not a stream variable.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

diff --git a/testsuite/flattening/modelica/scodeinst/ActualStreamNonCref1.mo b/testsuite/flattening/modelica/scodeinst/ActualStreamNonCref1.mo
@@ -10,7 +10,7 @@ end ActualStreamNonCref1;
 
 // Result:
 // Error processing file: ActualStreamNonCref1.mo
-// [flattening/modelica/scodeinst/ActualStreamNonCref1.mo:8:3-8:28:writable] Error: First argument to actualStream in component <REMOVE ME> must be a variable.
+// [flattening/modelica/scodeinst/ActualStreamNonCref1.mo:8:3-8:28:writable] Error: Operand ‘1‘ to operator ‘actualStream‘ is not a stream variable.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

diff --git a/testsuite/flattening/modelica/scodeinst/InStreamInvalidArgument1.mo b/testsuite/flattening/modelica/scodeinst/InStreamInvalidArgument1.mo
diff --git a/testsuite/flattening/modelica/scodeinst/InStreamInvalidArgument2.mo b/testsuite/flattening/modelica/scodeinst/InStreamInvalidArgument2.mo
diff --git a/testsuite/flattening/modelica/scodeinst/InStreamNoStream1.mo b/testsuite/flattening/modelica/scodeinst/InStreamNoStream1.mo
@@ -17,7 +17,7 @@ end InStreamNoStream1;
 
 // Result:
 // Error processing file: InStreamNoStream1.mo
-// [flattening/modelica/scodeinst/InStreamNoStream1.mo:15:3-15:26:writable] Error: Operand c.f to operator inStream is not a stream variable.
+// [flattening/modelica/scodeinst/InStreamNoStream1.mo:15:3-15:26:writable] Error: Operand ‘c.f‘ to operator ‘inStream‘ is not a stream variable.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

diff --git a/testsuite/flattening/modelica/scodeinst/InStreamNonCref1.mo b/testsuite/flattening/modelica/scodeinst/InStreamNonCref1.mo
@@ -10,7 +10,7 @@ end InStreamNonCref1;
 
 // Result:
 // Error processing file: InStreamNonCref1.mo
-// [flattening/modelica/scodeinst/InStreamNonCref1.mo:8:3-8:24:writable] Error: First argument to inStream in component <REMOVE ME> must be a variable.
+// [flattening/modelica/scodeinst/InStreamNonCref1.mo:8:3-8:24:writable] Error: Operand ‘1‘ to operator ‘inStream‘ is not a stream variable.
 //
 // # Error encountered! Exiting...
 // # Please check the error message and the flags.

diff --git a/testsuite/flattening/modelica/scodeinst/Makefile b/testsuite/flattening/modelica/scodeinst/Makefile
@@ -3,6 +3,9 @@ TEST=../../../rtest -v
 TESTFILES=\
 ActualStreamMinMax.mo \
 ActualStream.mo \
+ActualStreamNonCref1.mo \
+ActualStreamNoStream1.mo \
+ActualStreamVariability1.mo \
 Algorithm1.mo \
 Algorithm2.mo \
 Algorithm3.mo \
@@ -589,11 +592,14 @@ InnerOuterNotInner1.mo \
 InStreamFlowThreshold.mo \
 InStreamInsideOutside.mo \
 InStreamNominalThreshold.mo \
+InStreamNonCref1.mo \
+InStreamNoStream1.mo \
 InStreamPipeline.mo \
 InStreamReduction1.mo \
 InStreamTwoInside.mo \
 InStreamTwoOutside.mo \
 InStreamUnconnected.mo \
+InStreamVariability1.mo \
 inst2.mo \
 inst3.mo \
 inst4.mo \
@@ -854,20 +860,12 @@ OCGTests.mos \
 # test that currently fail. Move up when fixed.
 # Run make testfailing
 FAILINGTESTFILES=\
-ActualStreamNonCref1.mo \
-ActualStreamNoStream1.mo \
-ActualStreamVariability1.mo \
-InStreamNonCref1.mo \
-InStreamNoStream1.mo \
-InStreamVariability1.mo \
 FinalParameter1.mo \
 FinalParameter2.mo \
 FinalParameter3.mo \
 CevalRecordArray3.mo \
 IfExpression6.mo \
 RedeclareConstant1.mo \
-InStreamInvalidArgument1.mo \
-InStreamInvalidArgument2.mo \
 Connect3.mo \
 ProtectedMod1.mo \
 dim2.mo \

diff --git a/testsuite/flattening/modelica/streams/InStreamInvalidArgument.mo b/testsuite/flattening/modelica/streams/InStreamInvalidArgument.mo
@@ -15,7 +15,7 @@ end InStreamInvalidArgument;
 
 // Result:
 // Error processing file: InStreamInvalidArgument.mo
-// [flattening/modelica/streams/InStreamInvalidArgument.mo:13:3-13:25:writable] Error: Operand r to operator inStream is not a stream variable.
+// [flattening/modelica/streams/InStreamInvalidArgument.mo:13:3-13:25:writable] Error: Operand ‘r‘ to operator ‘inStream‘ is not a stream variable.
 // Error: Error occurred while flattening model InStreamInvalidArgument
 //
 // # Error encountered! Exiting...