#2358 increase coverage

Author: Scottmar93

pybamm/experiments/experiment.py

@@ -417,29 +417,24 @@ def convert_electric(self, electric):
                     )
                 )
 
-    def _read_and_drop_temperature(self, cond):
+    def _detect_mistyped_temperatures(self, cond):
 
-        if (len(re.findall("at", cond)) > 1 or ("Run" in cond and "at" in cond)) and (
-            "oC" not in cond
-        ):
-            raise ValueError(
-                "Instruction must be 'discharge', 'charge', 'rest', 'hold' or "
-                f"'Run'. For example: {examples}"
-                ""
-                "The following instruction does not comply: "
-                f"{cond}"
-            )
+        mistype = False
 
-        matches = re.findall(r"at\s-*\d+\.*\d*\s*oC", cond)
+        if "oC" in cond:
+            mistype = True
 
-        if len(matches) == 0 and "oC" in cond:
-            raise ValueError(
-                f"Temperature not written "
-                f"correctly on step: '{cond}'"
-            )
+        if mistype:
+            raise ValueError(f"Temperature not written correctly on step: '{cond}'")
+
+    def _read_and_drop_temperature(self, cond):
+
+        matches = re.findall(r"at\s-*\d+\.*\d*\s*oC", cond)
 
         if len(matches) == 0:
 
+            self._detect_mistyped_temperatures(cond)
+
             if self.temperature is None:
 
                 pybamm.logger.warning(

tests/unit/test_experiments/test_experiment.py

@@ -440,7 +440,7 @@ def test_bad_strings(self):
             TypeError, "Operating conditions should be strings or tuples of strings"
         ):
             pybamm.Experiment([(1, 2, 3)])
-        with self.assertRaisesRegex(ValueError, "Instruction must be"):
+        with self.assertRaisesRegex(ValueError, "Operating conditions must"):
             pybamm.Experiment(["Discharge at 1 A at 2 hours"])
         with self.assertRaisesRegex(ValueError, "Instruction must be"):
             pybamm.Experiment(["Run at 1 A for 2 hours"])
@@ -450,12 +450,18 @@ def test_bad_strings(self):
             pybamm.Experiment(["Run at at 1 A for 2 hours"])
         with self.assertRaisesRegex(ValueError, "Instruction must be"):
             pybamm.Experiment(["Play at 1 A for 2 hours"])
+        with self.assertRaisesRegex(ValueError, "Operating conditions must"):
+            pybamm.Experiment(["Do at 1 A"])
+        with self.assertRaisesRegex(ValueError, "Instruction must be"):
+            pybamm.Experiment(["Run US06 at 1 A"])
         with self.assertRaisesRegex(ValueError, "Instruction"):
             pybamm.Experiment(["Cell Charge at 1 A for 2 hours"])
         with self.assertRaisesRegex(ValueError, "units must be"):
             pybamm.Experiment(["Discharge at 1 B for 2 hours"])
         with self.assertRaisesRegex(ValueError, "time units must be"):
             pybamm.Experiment(["Discharge at 1 A for 2 years"])
+        with self.assertRaisesRegex(ValueError, "More than one temperature found"):
+            pybamm.Experiment(["Discharge at 1 A for 2 hours at 25oC at 30oC"])
         with self.assertRaisesRegex(
             ValueError, "The temperature for the CC and CV steps"
         ):
@@ -468,8 +474,6 @@ def test_bad_strings(self):
                 ],
                 cccv_handling="ode",
             )
-        with self.assertRaisesRegex(ValueError, "Instruction must be"):
-            pybamm.Experiment(["Discharge at 1 A for 2 hours at 25C"])
 
         with self.assertRaisesRegex(
             ValueError, "Temperature not written correctly on step"