From 703091a5510fefd9de88c48868d9fa21a79c01ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=96stlund?= <per.ostlund@liu.se>
Date: Tue, 3 Apr 2018 11:31:46 +0200
Subject: [PATCH] [NF] Add more when tests.

---
 flattening/modelica/scodeinst/Makefile        |  4 ++-
 flattening/modelica/scodeinst/When1.mo        | 23 ++++++++++++++++
 flattening/modelica/scodeinst/When2.mo        | 27 +++++++++++++++++++
 .../modelica/scodeinst/{when1.mo => When3.mo} | 10 +++----
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 flattening/modelica/scodeinst/When1.mo
 create mode 100644 flattening/modelica/scodeinst/When2.mo
 rename flattening/modelica/scodeinst/{when1.mo => When3.mo} (81%)

diff --git a/flattening/modelica/scodeinst/Makefile b/flattening/modelica/scodeinst/Makefile
index 1f175e00b..a96ffa8c2 100644
--- a/flattening/modelica/scodeinst/Makefile
+++ b/flattening/modelica/scodeinst/Makefile
@@ -614,7 +614,9 @@ Visibility1.mo \
 Visibility2.mo \
 Visibility3.mo \
 Visibility4.mo \
-when1.mo \
+When1.mo \
+When2.mo \
+When3.mo \
 WhenInitial1.mo \
 WhenNested1.mo \
 Wild1.mo \
diff --git a/flattening/modelica/scodeinst/When1.mo b/flattening/modelica/scodeinst/When1.mo
new file mode 100644
index 000000000..ff119f989
--- /dev/null
+++ b/flattening/modelica/scodeinst/When1.mo
@@ -0,0 +1,23 @@
+// name: When1
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model When1
+  Real x;
+equation
+  when time > 1 then
+    reinit(x, 2.0);
+  end when;
+end When1;
+
+// Result:
+// class When1
+//   Real x;
+// equation
+//   when time > 1.0 then
+//     reinit(x, 2.0);
+//   end when;
+// end When1;
+// endResult
diff --git a/flattening/modelica/scodeinst/When2.mo b/flattening/modelica/scodeinst/When2.mo
new file mode 100644
index 000000000..5210634b8
--- /dev/null
+++ b/flattening/modelica/scodeinst/When2.mo
@@ -0,0 +1,27 @@
+// name: When2
+// keywords:
+// status: correct
+// cflags: -d=newInst
+//
+
+model When2
+  Real x = 1;
+  Boolean b[3];
+equation
+  when b then
+    reinit(x, 2.0);
+  end when;
+end When2;
+
+// Result:
+// class When2
+//   Real x = 1.0;
+//   Boolean b[1];
+//   Boolean b[2];
+//   Boolean b[3];
+// equation
+//   when {b[1], b[2], b[3]} then
+//     reinit(x, 2.0);
+//   end when;
+// end When2;
+// endResult
diff --git a/flattening/modelica/scodeinst/when1.mo b/flattening/modelica/scodeinst/When3.mo
similarity index 81%
rename from flattening/modelica/scodeinst/when1.mo
rename to flattening/modelica/scodeinst/When3.mo
index 9c4b7d51d..33012681f 100644
--- a/flattening/modelica/scodeinst/when1.mo
+++ b/flattening/modelica/scodeinst/When3.mo
@@ -1,21 +1,21 @@
-// name: when1.mo
+// name: When3
 // keywords:
 // status: correct
 // cflags:   -d=newInst
 //
 //
 
-model A
+model When3
   Real x, y;
   Boolean b, b2;
 equation
   when {b, b2} then
     x = y;
   end when;
-end A;
+end When3;
 
 // Result:
-// class A
+// class When3
 //   Real x;
 //   Real y;
 //   Boolean b;
@@ -24,5 +24,5 @@ end A;
 //   when {b, b2} then
 //     x = y;
 //   end when;
-// end A;
+// end When3;
 // endResult