From aa444bd1e3bae589cc787b1a438fda6b50503a7b Mon Sep 17 00:00:00 2001
From: Alan Garny <agarny@hellix.com>
Date: Tue, 29 Sep 2020 16:15:17 +1300
Subject: [PATCH] Tests: removed the ids from the sine approximations CellML
 files.

---
 tests/printer/printer.cpp                     | 14 ++++++------
 tests/resources/deriv_approx_sin.xml          |  8 +++----
 tests/resources/parabolic_approx_sin.xml      | 22 +++++++++----------
 tests/resources/sin.xml                       |  8 +++----
 .../resources/sine_approximations_import.xml  | 14 ++++++------
 5 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/printer/printer.cpp b/tests/printer/printer.cpp
index 1ce4fcc315..39bec81391 100644
--- a/tests/printer/printer.cpp
+++ b/tests/printer/printer.cpp
@@ -216,7 +216,7 @@ TEST(Printer, printModelWithImports)
 {
     const std::string e_model =
         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-        "<model xmlns=\"http://www.cellml.org/cellml/2.0#\" name=\"sin_approximations_import\" id=\"sin_approximations_import\">\n"
+        "<model xmlns=\"http://www.cellml.org/cellml/2.0#\" name=\"sin_approximations_import\">\n"
         "  <import xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"sin.xml\">\n"
         "    <component component_ref=\"sin\" name=\"actual_sin\"/>\n"
         "  </import>\n"
@@ -226,12 +226,12 @@ TEST(Printer, printModelWithImports)
         "  <import xmlns:xlink=\"http://www.w3.org/1999/xlink\" xlink:href=\"parabolic_approx_sin.xml\">\n"
         "    <component component_ref=\"sin\" name=\"parabolic_approx_sin\"/>\n"
         "  </import>\n"
-        "  <component name=\"main\" id=\"main\">\n"
-        "    <variable name=\"x\" units=\"dimensionless\" interface=\"public_and_private\" id=\"x\"/>\n"
-        "    <variable name=\"sin1\" units=\"dimensionless\" interface=\"public_and_private\" id=\"sin\"/>\n"
-        "    <variable name=\"sin2\" units=\"dimensionless\" interface=\"public_and_private\" id=\"deriv_approx\"/>\n"
-        "    <variable name=\"deriv_approx_initial_value\" units=\"dimensionless\" initial_value=\"0\" interface=\"public_and_private\" id=\"deriv_approx_initial_value\"/>\n"
-        "    <variable name=\"sin3\" units=\"dimensionless\" interface=\"public_and_private\" id=\"parabolic_approx\"/>\n"
+        "  <component name=\"main\">\n"
+        "    <variable name=\"x\" units=\"dimensionless\" interface=\"public_and_private\"/>\n"
+        "    <variable name=\"sin1\" units=\"dimensionless\" interface=\"public_and_private\"/>\n"
+        "    <variable name=\"sin2\" units=\"dimensionless\" interface=\"public_and_private\"/>\n"
+        "    <variable name=\"deriv_approx_initial_value\" units=\"dimensionless\" initial_value=\"0\" interface=\"public_and_private\"/>\n"
+        "    <variable name=\"sin3\" units=\"dimensionless\" interface=\"public_and_private\"/>\n"
         "    <variable name=\"C\" units=\"dimensionless\" initial_value=\"0.75\" interface=\"public_and_private\"/>\n"
         "  </component>\n"
         "  <connection component_1=\"main\" component_2=\"actual_sin\">\n"
diff --git a/tests/resources/deriv_approx_sin.xml b/tests/resources/deriv_approx_sin.xml
index 692de9cb00..2e2f7141a9 100644
--- a/tests/resources/deriv_approx_sin.xml
+++ b/tests/resources/deriv_approx_sin.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="deriv_approx_sin" id="deriv_approx_sin">
+<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="deriv_approx_sin">
 
 
-  <component name="sin" id="sin">
-    <variable id="x" units="dimensionless" name="x" interface="public_and_private"/>
-    <variable id="sin" units="dimensionless" name="sin" initial_value="sin_initial_value" interface="public_and_private"/>
+  <component name="sin">
+    <variable units="dimensionless" name="x" interface="public_and_private"/>
+    <variable units="dimensionless" name="sin" initial_value="sin_initial_value" interface="public_and_private"/>
     <variable units="dimensionless" name="sin_initial_value" interface="public_and_private"/>
     <math xmlns="http://www.w3.org/1998/Math/MathML">
       <apply><eq/>
diff --git a/tests/resources/parabolic_approx_sin.xml b/tests/resources/parabolic_approx_sin.xml
index 713d0e631b..58a7131517 100644
--- a/tests/resources/parabolic_approx_sin.xml
+++ b/tests/resources/parabolic_approx_sin.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="parabolic_approx_sin" id="parabolic_approx_sin">
+<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="parabolic_approx_sin">
 
 
-  <component name="sin" id="sin">
-    <variable id="x" units="dimensionless" name="x" interface="public_and_private"/>
-    <variable id="sin" units="dimensionless" name="sin" interface="public_and_private"/>
+  <component name="sin">
+    <variable units="dimensionless" name="x" interface="public_and_private"/>
+    <variable units="dimensionless" name="sin" interface="public_and_private"/>
     <variable units="dimensionless" name="k2_oPi" interface="public_and_private"/>
     <variable units="dimensionless" name="k2Pi" interface="public_and_private"/>
     <variable units="dimensionless" name="kPi_2" interface="public_and_private"/>
@@ -12,32 +12,32 @@
     <variable units="dimensionless" name="z" interface="public_and_private"/>
     <variable units="dimensionless" name="C" interface="public_and_private"/>
     <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <apply id="k2_oPi"><eq/>
+      <apply><eq/>
         <ci>k2_oPi</ci>
         <apply><divide/>
           <cn cellml:units="dimensionless">2.0</cn>
           <pi/>
         </apply>
       </apply>
-      <apply id="k2Pi"><eq/>
+      <apply><eq/>
         <ci>k2Pi</ci>
         <apply><times/>
           <cn cellml:units="dimensionless">2.0</cn>
           <pi/>
         </apply>
       </apply>
-      <apply id="kPi_2"><eq/>
+      <apply><eq/>
         <ci>kPi_2</ci>
         <apply><divide/>
           <pi/>
           <cn cellml:units="dimensionless">2.0</cn>
         </apply>
       </apply>
-      <apply id="kPi"><eq/>
+      <apply><eq/>
         <ci>kPi</ci>
         <pi/>
       </apply>
-      <apply id="kPi_32"><eq/>
+      <apply><eq/>
         <ci>kPi_32</ci>
         <apply><divide/>
           <apply><times/>
@@ -48,7 +48,7 @@
         </apply>
       </apply>
 
-      <apply id="z"><eq/>
+      <apply><eq/>
         <ci>z</ci>
         <piecewise>
           <piece>
@@ -111,7 +111,7 @@
         </piecewise>
       </apply>
 
-      <apply id="sin"><eq/>
+      <apply><eq/>
         <ci>sin</ci>
         <piecewise>
           <piece>
diff --git a/tests/resources/sin.xml b/tests/resources/sin.xml
index ca5721418b..c6b8edb467 100644
--- a/tests/resources/sin.xml
+++ b/tests/resources/sin.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="sin" id="sin">
+<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="sin">
 
 
-  <component name="sin" id="sin">
+  <component name="sin">
     <variable name="x" units="dimensionless" interface="public_and_private"/>
-    <variable id="sin" units="dimensionless" name="sin" interface="public_and_private"/>
+    <variable units="dimensionless" name="sin" interface="public_and_private"/>
     <math xmlns="http://www.w3.org/1998/Math/MathML">
-      <apply id="actual_sin"><eq/>
+      <apply><eq/>
         <ci>sin</ci>
         <apply><sin/>
           <ci>x</ci>
diff --git a/tests/resources/sine_approximations_import.xml b/tests/resources/sine_approximations_import.xml
index e37be8bd13..3a29143cf8 100644
--- a/tests/resources/sine_approximations_import.xml
+++ b/tests/resources/sine_approximations_import.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="sin_approximations_import" id="sin_approximations_import">
+<?xml version="1.0" encoding="UTF-8"?><model xmlns="http://www.cellml.org/cellml/2.0#" xmlns:cellml="http://www.cellml.org/cellml/2.0#" xmlns:xlink="http://www.w3.org/1999/xlink" name="sin_approximations_import">
 
 
 
@@ -12,12 +12,12 @@
     <component name="parabolic_approx_sin" component_ref="sin"/>
   </import>
 
-  <component name="main" id="main">
-    <variable id="x" name="x" units="dimensionless" interface="public_and_private"/>
-    <variable id="sin" name="sin1" units="dimensionless" interface="public_and_private"/>
-    <variable id="deriv_approx" units="dimensionless" name="sin2" interface="public_and_private"/>
-    <variable id="deriv_approx_initial_value" units="dimensionless" name="deriv_approx_initial_value" initial_value="0" interface="public_and_private"/>
-    <variable id="parabolic_approx" name="sin3" units="dimensionless" interface="public_and_private"/>
+  <component name="main">
+    <variable name="x" units="dimensionless" interface="public_and_private"/>
+    <variable name="sin1" units="dimensionless" interface="public_and_private"/>
+    <variable units="dimensionless" name="sin2" interface="public_and_private"/>
+    <variable units="dimensionless" name="deriv_approx_initial_value" initial_value="0" interface="public_and_private"/>
+    <variable name="sin3" units="dimensionless" interface="public_and_private"/>
 	<variable name="C" units="dimensionless" interface="public_and_private" initial_value="0.75"/>
   </component>