diff --git a/tests/adapters/test_regrid.py b/tests/adapters/test_regrid.py index 49f0b5421685b2069cc060cf1003d960aade4098..e201360264f0381df3c626f3e9bd93fa8f7211c0 100644 --- a/tests/adapters/test_regrid.py +++ b/tests/adapters/test_regrid.py @@ -61,7 +61,7 @@ class TestRegrid(unittest.TestCase): (source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"]) - composition.run(end_time=datetime(2000, 1, 5)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -114,7 +114,7 @@ class TestRegrid(unittest.TestCase): (source.outputs["Output"] >> RegridNearest() >> sink.inputs["Input"]) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -158,7 +158,7 @@ class TestRegrid(unittest.TestCase): (source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"]) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -206,7 +206,7 @@ class TestRegrid(unittest.TestCase): >> sink.inputs["Input"] ) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertAlmostEqual(fdata.get_magnitude(sink.data["Input"])[0, 0, 0], 1.0) @@ -251,7 +251,7 @@ class TestRegrid(unittest.TestCase): >> sink.inputs["Input"] ) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -291,7 +291,7 @@ class TestRegrid(unittest.TestCase): (source.outputs["Output"] >> RegridLinear() >> sink.inputs["Input"]) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -340,7 +340,7 @@ class TestRegrid(unittest.TestCase): regrid >> sink_1.inputs["Input"] regrid >> sink_2.inputs["Input"] - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink_1.inputs["Input"].info.grid, out_spec_1) self.assertEqual(sink_1.data["Input"][0, 0, 0], 1.0 * UNITS.meter) @@ -448,7 +448,7 @@ class TestRegrid(unittest.TestCase): >> sink.inputs["Input"] ) - composition.run(end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.grid, out_spec) self.assertEqual(sink.data["Input"][0, 0], 1.0 * UNITS.meter) diff --git a/tests/core/test_schedule.py b/tests/core/test_schedule.py index ad7d5ae80e085b30b2d5dbc8088c227bf3bb5081..d81dab5db6d0e04f952fdc9f612e91891e127566 100644 --- a/tests/core/test_schedule.py +++ b/tests/core/test_schedule.py @@ -160,8 +160,8 @@ class MockupCircularComponent(TimeComponent): pass def _update(self): - pulled = self.inputs["Input"].pull_data(self.time) self._time += self._step + pulled = self.inputs["Input"].pull_data(self.time) self.outputs["Output"].push_data( tools.get_data(tools.strip_time(pulled)), self.time ) diff --git a/tests/core/test_sdk.py b/tests/core/test_sdk.py index 7da839fe3802190c3b855d07fda0bd5128ccf00b..86f9f471f57934b4c8868e7bbfadcebd4064bfaa 100644 --- a/tests/core/test_sdk.py +++ b/tests/core/test_sdk.py @@ -184,7 +184,7 @@ class TestOutput(unittest.TestCase): with self.assertRaises(FinamNoDataError): out.push_data(100, t) - self._out_infos_exchanged = 1 + out._out_infos_exchanged = 1 out.get_info(info) @@ -374,11 +374,8 @@ class TestOutput(unittest.TestCase): in_data = fm.data.full(0.0, "test", info, t) out.push_data(in_data, t) - out_data = in1.pull_data(t, in1) - - self.assertEqual(out_data[0, 0, 0], 0.0) - in_data[0, 0, 0] = 1.0 - self.assertEqual(out_data[0, 0, 0], 0.0) + with self.assertRaises(FinamDataError): + out.push_data(in_data, t) def test_data_copied_xarray_units(self): t = datetime(2000, 1, 1) @@ -419,11 +416,8 @@ class TestOutput(unittest.TestCase): in_data = fm.data.strip_data(fm.data.full(0.0, "test", info, t)) out.push_data(in_data, t) - out_data = in1.pull_data(t, in1) - - self.assertEqual(out_data[0, 0, 0], 0.0) - in_data[0, 0] = 1.0 - self.assertEqual(out_data[0, 0, 0], 0.0) + with self.assertRaises(FinamDataError): + out.push_data(in_data, t) def test_data_copied_numpy_units(self): t = datetime(2000, 1, 1) diff --git a/tests/core/test_units.py b/tests/core/test_units.py index d0ba6844a8938ccfa76418964082a8dc3dd92c00..08dc807d0e41bf4d6569860ed09f63ce8874ee62 100644 --- a/tests/core/test_units.py +++ b/tests/core/test_units.py @@ -80,7 +80,7 @@ class TestUnits(unittest.TestCase): (source.outputs["Output"] >> sink.inputs["Input"]) - composition.run(start_time=time, end_time=datetime(2000, 1, 2)) + composition.connect() self.assertEqual(sink.inputs["Input"].info.meta, {"units": UNITS.kilometer}) self.assertEqual(tools.get_units(sink.data), UNITS.kilometer)