Removing testcase.py file

tests/__init__.py

@@ -44,5 +44,5 @@
     get_optional_distribution_deps,
     get_present_optional_import_deps,
     no_internet_connection,
+    assert_domain_equal,
 )
-from .testcase import TestCase

tests/integration/test_experiments.py

@@ -1,13 +1,13 @@
 #
 # Test some experiments
 #
-from tests import TestCase
+
 import pybamm
 import numpy as np
 import unittest
 
 
-class TestExperiments(TestCase):
+class TestExperiments(unittest.TestCase):
     def test_discharge_rest_charge(self):
         experiment = pybamm.Experiment(
             [

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_compare_outputs.py

@@ -1,14 +1,14 @@
 #
 # Tests for the surface formulation
 #
-from tests import TestCase
+
 import pybamm
 import numpy as np
 import unittest
 from tests import StandardOutputComparison
 
 
-class TestCompareOutputs(TestCase):
+class TestCompareOutputs(unittest.TestCase):
     def test_compare_outputs_surface_form(self):
         # load models
         options = [

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_compare_outputs_two_phase.py

@@ -4,10 +4,9 @@
 import pybamm
 import numpy as np
 import unittest
-from tests import TestCase
 
 
-class TestCompareOutputsTwoPhase(TestCase):
+class TestCompareOutputsTwoPhase(unittest.TestCase):
     def compare_outputs_two_phase_graphite_graphite(self, model_class):
         """
         Check that a two-phase graphite-graphite model gives the same results as a

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_dfn.py

@@ -1,15 +1,15 @@
 #
 # Tests for the lithium-ion DFN model
 #
-from tests import TestCase
+
 import pybamm
 import tests
 import numpy as np
 import unittest
 from tests import BaseIntegrationTestLithiumIon
 
 
-class TestDFN(BaseIntegrationTestLithiumIon, TestCase):
+class TestDFN(BaseIntegrationTestLithiumIon, unittest.TestCase):
     def setUp(self):
         self.model = pybamm.lithium_ion.DFN
 
@@ -35,7 +35,7 @@ def positive_radius(x):
         self.run_basic_processing_test({}, parameter_values=param)
 
 
-class TestDFNWithSizeDistribution(TestCase):
+class TestDFNWithSizeDistribution(unittest.TestCase):
     def setUp(self):
         params = pybamm.ParameterValues("Marquis2019")
         self.params = pybamm.get_size_distribution_parameters(params)

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_mpm.py

@@ -1,14 +1,14 @@
 #
 # Tests for the lithium-ion MPM model
 #
-from tests import TestCase
+
 import pybamm
 import tests
 import numpy as np
 import unittest
 
 
-class TestMPM(TestCase):
+class TestMPM(unittest.TestCase):
     def test_basic_processing(self):
         options = {"thermal": "isothermal"}
         model = pybamm.lithium_ion.MPM(options)

tests/integration/test_models/test_full_battery_models/test_lithium_ion/test_thermal_models.py

@@ -5,10 +5,9 @@
 import pybamm
 import numpy as np
 import unittest
-from tests import TestCase
 
 
-class TestThermal(TestCase):
+class TestThermal(unittest.TestCase):
     def test_consistent_cooling(self):
         "Test the cooling is consistent between the 1D, 1+1D and 2+1D SPMe models"
 

tests/integration/test_models/test_submodels/test_external_circuit/test_function_control.py

@@ -1,13 +1,13 @@
 #
 # Test function control submodel
 #
-from tests import TestCase
+
 import numpy as np
 import pybamm
 import unittest
 
 
-class TestFunctionControl(TestCase):
+class TestFunctionControl(unittest.TestCase):
     def test_constant_current(self):
         def constant_current(variables):
             I = variables["Current [A]"]

tests/integration/test_models/test_submodels/test_interface/test_butler_volmer.py

@@ -1,15 +1,15 @@
 #
 # Tests for the electrode-electrolyte interface equations
 #
-from tests import TestCase
+
 import pybamm
 from tests import get_discretisation_for_testing
 
 import unittest
 import numpy as np
 
 
-class TestButlerVolmer(TestCase):
+class TestButlerVolmer(unittest.TestCase):
     def setUp(self):
         self.delta_phi_s_n = pybamm.Variable(
             "surface potential difference [V]",

tests/integration/test_models/test_submodels/test_interface/test_lead_acid.py

@@ -1,13 +1,13 @@
 #
 # Tests for the electrode-electrolyte interface equations for lead-acid models
 #
-from tests import TestCase
+
 import pybamm
 from tests import get_discretisation_for_testing
 import unittest
 
 
-class TestMainReaction(TestCase):
+class TestMainReaction(unittest.TestCase):
     def setUp(self):
         c_e_n = pybamm.Variable(
             "Negative electrolyte concentration [mol.m-3]",

tests/integration/test_models/test_submodels/test_interface/test_lithium_ion.py

@@ -1,15 +1,15 @@
 #
 # Tests for the electrode-electrolyte interface equations for lithium-ion models
 #
-from tests import TestCase
+
 import pybamm
 from tests import get_discretisation_for_testing
 
 import unittest
 import numpy as np
 
 
-class TestExchangeCurrentDensity(TestCase):
+class TestExchangeCurrentDensity(unittest.TestCase):
     def setUp(self):
         c_e_n = pybamm.Variable("concentration", domain=["negative electrode"])
         c_e_s = pybamm.Variable("concentration", domain=["separator"])

tests/integration/test_solvers/test_idaklu.py

@@ -1,12 +1,12 @@
 import pybamm
 import numpy as np
 import sys
-from tests import TestCase
+
 import unittest
 
 
 @unittest.skipIf(not pybamm.have_idaklu(), "idaklu solver is not installed")
-class TestIDAKLUSolver(TestCase):
+class TestIDAKLUSolver(unittest.TestCase):
     def test_on_spme(self):
         model = pybamm.lithium_ion.SPMe()
         geometry = model.default_geometry

tests/integration/test_solvers/test_solution.py

@@ -1,13 +1,13 @@
 #
 # Tests for the Solution class
 #
-from tests import TestCase
+
 import pybamm
 import unittest
 import numpy as np
 
 
-class TestSolution(TestCase):
+class TestSolution(unittest.TestCase):
     def test_append(self):
         model = pybamm.lithium_ion.SPMe()
         # create geometry

tests/integration/test_spatial_methods/test_finite_volume.py

@@ -1,7 +1,7 @@
 #
 # Test for the operator class
 #
-from tests import TestCase
+
 import pybamm
 from tests import (
     get_mesh_for_testing,
@@ -13,7 +13,7 @@
 import unittest
 
 
-class TestFiniteVolumeConvergence(TestCase):
+class TestFiniteVolumeConvergence(unittest.TestCase):
     def test_grad_div_broadcast(self):
         # create mesh and discretisation
         spatial_methods = {"macroscale": pybamm.FiniteVolume()}
@@ -319,7 +319,7 @@ def solve_laplace_equation(coord_sys="cartesian"):
     return solver.solve(model)
 
 
-class TestFiniteVolumeLaplacian(TestCase):
+class TestFiniteVolumeLaplacian(unittest.TestCase):
     def test_laplacian_cartesian(self):
         solution = solve_laplace_equation(coord_sys="cartesian")
         np.testing.assert_array_almost_equal(
@@ -374,7 +374,7 @@ def solve_advection_equation(direction="upwind", source=1, bc=0):
     return solver.solve(model, [0, 1])
 
 
-class TestUpwindDownwind(TestCase):
+class TestUpwindDownwind(unittest.TestCase):
     def test_upwind(self):
         solution = solve_advection_equation("upwind")
         np.testing.assert_array_almost_equal(

tests/integration/test_spatial_methods/test_spectral_volume.py

@@ -1,7 +1,7 @@
 #
 # Test for the operator class
 #
-from tests import TestCase
+
 import pybamm
 
 import numpy as np
@@ -76,7 +76,7 @@ def get_p2d_mesh_for_testing(xpts=None, rpts=10):
     return get_mesh_for_testing(xpts=xpts, rpts=rpts, geometry=geometry)
 
 
-class TestSpectralVolumeConvergence(TestCase):
+class TestSpectralVolumeConvergence(unittest.TestCase):
     def test_grad_div_broadcast(self):
         # create mesh and discretisation
         spatial_methods = {"macroscale": pybamm.SpectralVolume()}

tests/shared.py

@@ -338,3 +338,10 @@ def no_internet_connection():
         return False
     except socket.gaierror:
         return True
+
+
+def assert_domain_equal(a, b):
+    "Check that two domains are equal, ignoring empty domains"
+    a_dict = {k: v for k, v in a.items() if v != []}
+    b_dict = {k: v for k, v in b.items() if v != []}
+    assert a_dict == b_dict

tests/unit/test_batch_study.py

@@ -2,14 +2,13 @@
 Tests for the batch_study.py
 """
 
-from tests import TestCase
 import os
 import pybamm
 import unittest
 from tempfile import TemporaryDirectory
 
 
-class TestBatchStudy(TestCase):
+class TestBatchStudy(unittest.TestCase):
     def test_solve(self):
         spm = pybamm.lithium_ion.SPM()
         spm_uniform = pybamm.lithium_ion.SPM({"particle": "uniform profile"})

tests/unit/test_callbacks.py

@@ -1,7 +1,7 @@
 #
 # Tests the citations class.
 #
-from tests import TestCase
+
 import pybamm
 import unittest
 import os
@@ -18,7 +18,7 @@ def on_experiment_end(self, logs):
             print(self.name, file=f)
 
 
-class TestCallbacks(TestCase):
+class TestCallbacks(unittest.TestCase):
     def tearDown(self):
         # Remove any test log files that were created, even if the test fails
         for logfile in ["test_callback.log", "test_callback_2.log"]:

tests/unit/test_discretisations/test_discretisation.py

@@ -1,7 +1,7 @@
 #
 # Tests for the base model class
 #
-from tests import TestCase
+
 import pybamm
 
 import numpy as np
@@ -18,7 +18,7 @@
 from scipy.sparse.linalg import inv
 
 
-class TestDiscretise(TestCase):
+class TestDiscretise(unittest.TestCase):
     def test_concatenate_in_order(self):
         a = pybamm.Variable("a")
         b = pybamm.Variable("b")

tests/unit/test_experiments/test_experiment.py

@@ -1,13 +1,13 @@
 #
 # Test the base experiment class
 #
-from tests import TestCase
+
 from datetime import datetime
 import pybamm
 import unittest
 
 
-class TestExperiment(TestCase):
+class TestExperiment(unittest.TestCase):
     def test_cycle_unpacking(self):
         experiment = pybamm.Experiment(
             [

tests/unit/test_experiments/test_simulation_with_experiment.py

@@ -1,7 +1,6 @@
 #
 # Test setting up a simulation with an experiment
 #
-from tests import TestCase
 import casadi
 import pybamm
 import numpy as np
@@ -16,7 +15,7 @@ def default_duration(self, value):
         return 1
 
 
-class TestSimulationExperiment(TestCase):
+class TestSimulationExperiment(unittest.TestCase):
     def test_set_up(self):
         experiment = pybamm.Experiment(
             [

tests/unit/test_expression_tree/test_averages.py

@@ -2,12 +2,12 @@
 # Tests for the Unary Operator classes
 #
 import unittest
-from tests import TestCase
 import numpy as np
 import pybamm
+from tests import assert_domain_equal
 
 
-class TestUnaryOperators(TestCase):
+class TestUnaryOperators(unittest.TestCase):
     def test_x_average(self):
         a = pybamm.Scalar(4)
         average_a = pybamm.x_average(a)
@@ -112,7 +112,7 @@ def test_x_average(self):
         )
         average_conc_broad = pybamm.x_average(conc_broad)
         self.assertIsInstance(average_conc_broad, pybamm.FullBroadcast)
-        self.assertDomainEqual(
+        assert_domain_equal(
             average_conc_broad.domains,
             {"primary": ["current collector"], "secondary": ["test"]},
         )

tests/unit/test_expression_tree/test_binary_operators.py

@@ -1,7 +1,7 @@
 #
 # Tests for the Binary Operator classes
 #
-from tests import TestCase
+
 import unittest
 import unittest.mock as mock
 
@@ -19,7 +19,7 @@
 }
 
 
-class TestBinaryOperators(TestCase):
+class TestBinaryOperators(unittest.TestCase):
     def test_binary_operator(self):
         a = pybamm.Symbol("a")
         b = pybamm.Symbol("b")