From 89de059c31be67725cfa4ffe3775a3bdb24e0e85 Mon Sep 17 00:00:00 2001 From: Anthony Charlton Date: Fri, 26 Jun 2026 10:54:37 +1000 Subject: [PATCH] Removed the positional arg tests in prep for dataclassy removal. Signed-off-by: Anthony Charlton --- .../iec61968/common/test_contact_details.py | 39 +---- .../test_pan_demand_response_function.py | 42 ++--- .../iec61970/base/core/test_hv_customer.py | 9 +- .../iec61970/base/core/test_site.py | 8 +- .../iec61970/base/feeder/test_loop.py | 24 +-- .../iec61970/base/feeder/test_lv_feeder.py | 39 +---- .../base/feeder/test_lv_substation.py | 19 +-- .../test_directional_current_relay.py | 32 +--- .../base/wires/test_battery_control.py | 20 +-- .../cim/iec61968/assetinfo/test_cable_info.py | 8 +- .../iec61968/assetinfo/test_no_load_test.py | 31 +--- .../assetinfo/test_open_circuit_test.py | 31 +--- .../assetinfo/test_overhead_wire_info.py | 8 +- .../assetinfo/test_power_transformer_info.py | 15 +- .../assetinfo/test_short_circuit_test.py | 52 ++---- .../assetinfo/test_shunt_compensator_info.py | 30 +--- .../iec61968/assetinfo/test_switch_info.py | 16 +- .../assetinfo/test_transformer_end_info.py | 66 ++------ .../assetinfo/test_transformer_tank_info.py | 18 +- .../assetinfo/test_transformer_test.py | 12 +- test/cim/iec61968/assetinfo/test_wire_info.py | 20 +-- test/cim/iec61968/assets/test_asset.py | 19 +-- .../iec61968/assets/test_asset_container.py | 8 +- .../iec61968/assets/test_asset_function.py | 9 +- test/cim/iec61968/assets/test_asset_info.py | 8 +- .../assets/test_asset_organisation_role.py | 8 +- test/cim/iec61968/assets/test_asset_owner.py | 8 +- test/cim/iec61968/assets/test_pole.py | 24 +-- test/cim/iec61968/assets/test_streelight.py | 28 +--- test/cim/iec61968/assets/test_structure.py | 9 +- test/cim/iec61968/common/test_agreement.py | 17 +- test/cim/iec61968/common/test_document.py | 17 +- .../common/test_electronic_address.py | 10 -- test/cim/iec61968/common/test_location.py | 17 +- .../iec61968/common/test_organisation_role.py | 13 +- .../iec61968/common/test_position_point.py | 11 -- .../iec61968/common/test_street_address.py | 15 -- .../cim/iec61968/common/test_street_detail.py | 16 -- .../iec61968/common/test_telephone_number.py | 23 +-- test/cim/iec61968/common/test_town_detail.py | 12 -- test/cim/iec61968/customers/test_customer.py | 20 +-- .../customers/test_customer_agreement.py | 21 +-- .../customers/test_pricing_structure.py | 19 +-- test/cim/iec61968/customers/test_tariff.py | 9 +- .../test_current_transformer_info.py | 35 +--- .../test_potential_transformer_info.py | 23 +-- .../infassetinfo/test_relay_info.py | 18 +- .../infiec61968/infcommon/test_ratio.py | 12 -- test/cim/iec61968/metering/test_end_device.py | 18 +- .../metering/test_end_device_function.py | 13 +- test/cim/iec61968/metering/test_meter.py | 9 +- .../cim/iec61968/metering/test_usage_point.py | 52 ++---- .../test_operational_restriction.py | 18 +- .../test_auxiliary_equipment.py | 13 +- .../test_current_transformer.py | 13 +- .../test_fault_indicator.py | 8 +- .../test_potential_transformer.py | 13 +- .../base/auxiliaryequipment/test_sensor.py | 15 +- .../iec61970/base/core/test_ac_dc_terminal.py | 8 +- .../iec61970/base/core/test_base_voltage.py | 13 +- .../base/core/test_conducting_equipment.py | 16 +- .../base/core/test_connectivity_node.py | 15 +- .../core/test_connectivity_node_container.py | 8 +- test/cim/iec61970/base/core/test_curve.py | 12 +- .../cim/iec61970/base/core/test_curve_data.py | 13 -- test/cim/iec61970/base/core/test_equipment.py | 43 ++--- .../base/core/test_equipment_container.py | 14 +- test/cim/iec61970/base/core/test_feeder.py | 59 ++----- .../base/core/test_geographical_region.py | 15 +- .../base/core/test_identified_object.py | 15 +- .../base/core/test_power_system_resource.py | 26 +-- .../base/core/test_sub_geographical_region.py | 25 +-- .../cim/iec61970/base/core/test_substation.py | 46 ++---- test/cim/iec61970/base/core/test_terminal.py | 48 ++---- .../base/diagramlayout/test_diagram.py | 29 +--- .../base/diagramlayout/test_diagram_object.py | 35 ++-- .../test_diagram_object_point.py | 11 -- .../base/domain/test_date_time_interval.py | 14 +- .../equivalents/test_equivalent_branch.py | 38 +---- .../equivalents/test_equivalent_equipment.py | 8 +- .../iec61970/base/meas/test_accumulator.py | 8 +- .../base/meas/test_accumulator_value.py | 17 +- test/cim/iec61970/base/meas/test_analog.py | 10 +- .../iec61970/base/meas/test_analog_value.py | 17 +- test/cim/iec61970/base/meas/test_control.py | 16 +- test/cim/iec61970/base/meas/test_discrete.py | 8 +- .../iec61970/base/meas/test_discrete_value.py | 17 +- test/cim/iec61970/base/meas/test_io_point.py | 8 +- .../iec61970/base/meas/test_measurement.py | 17 +- .../base/meas/test_measurement_value.py | 9 - .../base/protection/test_current_relay.py | 19 +-- .../base/protection/test_distance_relay.py | 27 +-- .../test_protection_relay_function.py | 48 +----- .../test_protection_relay_scheme.py | 26 +-- .../test_protection_relay_system.py | 24 +-- .../base/protection/test_voltage_relay.py | 12 +- .../base/scada/test_remote_control.py | 16 +- .../iec61970/base/scada/test_remote_point.py | 8 +- .../iec61970/base/scada/test_remote_source.py | 15 +- .../production/test_battery_unit.py | 21 +-- .../production/test_photo_voltaic_unit.py | 9 +- .../production/test_power_electronics_unit.py | 15 +- .../test_power_electronics_wind_unit.py | 9 +- .../base/wires/test_ac_line_segment.py | 15 +- .../base/wires/test_ac_line_segment_phase.py | 20 +-- test/cim/iec61970/base/wires/test_breaker.py | 13 +- .../base/wires/test_busbar_section.py | 8 +- .../cim/iec61970/base/wires/test_conductor.py | 13 +- .../cim/iec61970/base/wires/test_connector.py | 8 +- .../iec61970/base/wires/test_disconnector.py | 9 +- .../wires/test_earth_fault_compensator.py | 12 +- .../base/wires/test_energy_connection.py | 8 +- .../base/wires/test_energy_consumer.py | 24 +-- .../iec61970/base/wires/test_energy_source.py | 78 +-------- test/cim/iec61970/base/wires/test_fuse.py | 13 +- test/cim/iec61970/base/wires/test_ground.py | 10 +- .../base/wires/test_ground_disconnector.py | 9 +- .../base/wires/test_grounding_impedance.py | 15 +- test/cim/iec61970/base/wires/test_jumper.py | 9 +- test/cim/iec61970/base/wires/test_junction.py | 8 +- test/cim/iec61970/base/wires/test_line.py | 8 +- .../wires/test_linear_shunt_compensator.py | 23 +-- .../base/wires/test_load_break_switch.py | 8 +- .../base/wires/test_per_length_impedance.py | 8 +- .../wires/test_per_length_line_parameter.py | 8 +- .../wires/test_per_length_phase_impedance.py | 16 +- .../test_per_length_sequence_impedance.py | 21 +-- .../iec61970/base/wires/test_petersen_coil.py | 15 +- .../base/wires/test_phase_impedance_data.py | 15 -- .../test_power_electronics_connection.py | 154 +++++------------- .../base/wires/test_power_transformer.py | 26 +-- .../base/wires/test_power_transformer_end.py | 39 +---- .../base/wires/test_protected_switch.py | 18 +- .../base/wires/test_ratio_tap_changer.py | 15 +- .../wires/test_reactive_capability_curve.py | 9 +- test/cim/iec61970/base/wires/test_recloser.py | 8 +- .../base/wires/test_regulating_cond_eq.py | 14 +- .../base/wires/test_regulating_control.py | 46 +----- .../base/wires/test_rotating_machine.py | 16 +- .../base/wires/test_series_compensator.py | 20 +-- .../base/wires/test_shunt_compensator.py | 15 +- .../base/wires/test_static_var_compensator.py | 19 +-- test/cim/iec61970/base/wires/test_switch.py | 14 +- .../base/wires/test_synchronous_machine.py | 43 +---- .../iec61970/base/wires/test_tap_changer.py | 34 +--- .../base/wires/test_tap_changer_control.py | 28 +--- .../base/wires/test_transformer_end.py | 43 ++--- .../wires/test_transformer_star_impedance.py | 21 +-- .../infiec61970/feeder/test_circuit.py | 22 +-- .../production/test_ev_charging_unit.py | 8 +- 150 files changed, 513 insertions(+), 2520 deletions(-) diff --git a/test/cim/extensions/iec61968/common/test_contact_details.py b/test/cim/extensions/iec61968/common/test_contact_details.py index d215a9d2c..2215dd5bf 100644 --- a/test/cim/extensions/iec61968/common/test_contact_details.py +++ b/test/cim/extensions/iec61968/common/test_contact_details.py @@ -3,26 +3,12 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. from hypothesis import given -from hypothesis.strategies import text, sampled_from, booleans -from cim.fill_fields import ALPHANUM, contact_details_kwargs +from cim.fill_fields import contact_details_kwargs from cim.private_collection_validator import validate_unordered_other, DuplicateBehaviour from util import assert_or_empty from zepben.ewb import ContactMethodType, TelephoneNumber, ElectronicAddress, ContactDetails -contact_details_args = [ - text(alphabet=ALPHANUM), - text(alphabet=ALPHANUM), - text(alphabet=ALPHANUM), - text(alphabet=ALPHANUM), - text(alphabet=ALPHANUM), - sampled_from(ContactMethodType), - booleans(), - text(alphabet=ALPHANUM), - [TelephoneNumber()], - [ElectronicAddress()], -] - def test_contact_details_constructor_default(): c = ContactDetails(id="test") @@ -49,7 +35,7 @@ def test_contact_details_constructor_kwargs( is_primary, business_name, phone_numbers, - electronic_addresses + electronic_addresses, ): c = ContactDetails( id=id, @@ -61,7 +47,7 @@ def test_contact_details_constructor_kwargs( is_primary=is_primary, business_name=business_name, phone_numbers=phone_numbers, - electronic_addresses=electronic_addresses + electronic_addresses=electronic_addresses, ) assert c.contact_address == contact_address @@ -75,21 +61,6 @@ def test_contact_details_constructor_kwargs( assert_or_empty(c.electronic_addresses, electronic_addresses) -def test_contact_details_constructor_args(): - c = ContactDetails(*contact_details_args) - - assert c.id == contact_details_args[-10] - assert c.contact_address == contact_details_args[-9] - assert c.contact_type == contact_details_args[-8] - assert c.first_name == contact_details_args[-7] - assert c.last_name == contact_details_args[-6] - assert c.preferred_contact_method == contact_details_args[-5] - assert c.is_primary == contact_details_args[-4] - assert c.business_name == contact_details_args[-3] - assert list(c.phone_numbers) == contact_details_args[-2] - assert list(c.electronic_addresses) == contact_details_args[-1] - - def test_phone_number_collection(): def get_phone_number(it: ContactDetails, number: str): for tn in it.phone_numbers: @@ -109,7 +80,7 @@ def get_phone_number(it: ContactDetails, number: str): ContactDetails.remove_phone_number, ContactDetails.clear_phone_numbers, lambda it: it.local_number, - duplicate_behaviour=DuplicateBehaviour.SUPPORTED + duplicate_behaviour=DuplicateBehaviour.SUPPORTED, ) @@ -132,5 +103,5 @@ def get_electronic_address(it: ContactDetails, number: str): ContactDetails.remove_electronic_address, ContactDetails.clear_electronic_addresses, lambda it: it.email1, - duplicate_behaviour=DuplicateBehaviour.SUPPORTED + duplicate_behaviour=DuplicateBehaviour.SUPPORTED, ) diff --git a/test/cim/extensions/iec61968/metering/test_pan_demand_response_function.py b/test/cim/extensions/iec61968/metering/test_pan_demand_response_function.py index 01a0c74e2..a877aafc6 100644 --- a/test/cim/extensions/iec61968/metering/test_pan_demand_response_function.py +++ b/test/cim/extensions/iec61968/metering/test_pan_demand_response_function.py @@ -6,14 +6,11 @@ from pytest import raises from cim.fill_fields import pan_demand_response_function_kwargs -from cim.iec61968.metering.test_end_device_function import end_device_function_args, \ - verify_end_device_function_constructor_default, verify_end_device_function_constructor_args +from cim.iec61968.metering.test_end_device_function import verify_end_device_function_constructor_default from test.cim.iec61968.metering.test_end_device_function import verify_end_device_function_constructor_kwargs from zepben.ewb import PanDemandResponseFunction, ControlledAppliance, Appliance, generate_id from zepben.ewb.model.cim.iec61968.metering.end_device_function_kind import EndDeviceFunctionKind -pan_demand_response_function_args = [*end_device_function_args, EndDeviceFunctionKind.demandResponse, Appliance.IRRIGATION_PUMP] - def test_pan_demand_response_function_constructor_default(): pdrf = PanDemandResponseFunction(mrid=generate_id()) @@ -33,15 +30,6 @@ def test_pan_demand_response_function_constructor_kwargs(kind, appliance, **kwar assert pdrf.appliance.bitmask == appliance -def test_pan_demand_response_function_constructor_args(): - pdrf = PanDemandResponseFunction(*pan_demand_response_function_args) - - verify_end_device_function_constructor_args(pdrf) - - assert pan_demand_response_function_args[-2] == pdrf.kind - assert pan_demand_response_function_args[-1].bitmask == pdrf.appliance.bitmask - - def test_constructor_with_controlled_appliance(): ca = ControlledAppliance([Appliance.SMART_APPLIANCE, Appliance.IRRIGATION_PUMP]) pdrf = PanDemandResponseFunction(mrid=generate_id(), appliance=ca) @@ -135,19 +123,21 @@ def test_removing_appliances_initialises_bitmask(): validate_appliance(pdrf.appliance) -def validate_appliance(controlled_appliance: ControlledAppliance, - is_electric_vehicle: bool = False, - is_exterior_lighting: bool = False, - is_generation_system: bool = False, - is_hvac_compressor_or_furnace: bool = False, - is_interior_lighting: bool = False, - is_irrigation_pump: bool = False, - is_managed_commercial_industrial_load: bool = False, - is_pool_pump_spa_jacuzzi: bool = False, - is_simple_misc_load: bool = False, - is_smart_appliance: bool = False, - is_strip_and_baseboard_heater: bool = False, - is_water_heater: bool = False): +def validate_appliance( + controlled_appliance: ControlledAppliance, + is_electric_vehicle: bool = False, + is_exterior_lighting: bool = False, + is_generation_system: bool = False, + is_hvac_compressor_or_furnace: bool = False, + is_interior_lighting: bool = False, + is_irrigation_pump: bool = False, + is_managed_commercial_industrial_load: bool = False, + is_pool_pump_spa_jacuzzi: bool = False, + is_simple_misc_load: bool = False, + is_smart_appliance: bool = False, + is_strip_and_baseboard_heater: bool = False, + is_water_heater: bool = False, +): assert controlled_appliance is not None assert controlled_appliance.is_electric_vehicle == is_electric_vehicle assert controlled_appliance.is_exterior_lighting == is_exterior_lighting diff --git a/test/cim/extensions/iec61970/base/core/test_hv_customer.py b/test/cim/extensions/iec61970/base/core/test_hv_customer.py index 81bf4c7c9..1da3621ff 100644 --- a/test/cim/extensions/iec61970/base/core/test_hv_customer.py +++ b/test/cim/extensions/iec61970/base/core/test_hv_customer.py @@ -5,13 +5,10 @@ from hypothesis import given from cim.fill_fields import hv_customer_kwargs -from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, verify_equipment_container_constructor_kwargs, \ - verify_equipment_container_constructor_args, equipment_container_args +from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, verify_equipment_container_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.extensions.iec61970.base.core.hv_customer import HvCustomer -hv_customer_args = equipment_container_args - def test_hv_customer_constructor_default(): verify_equipment_container_constructor_default(HvCustomer(mrid=generate_id())) @@ -20,7 +17,3 @@ def test_hv_customer_constructor_default(): @given(**hv_customer_kwargs()) def test_hv_customer_constructor_kwargs(**kwargs): verify_equipment_container_constructor_kwargs(HvCustomer(**kwargs), **kwargs) - - -def test_hv_customer_constructor_args(): - verify_equipment_container_constructor_args(HvCustomer(*hv_customer_args)) diff --git a/test/cim/extensions/iec61970/base/core/test_site.py b/test/cim/extensions/iec61970/base/core/test_site.py index a18f219e3..49f3d3fa2 100644 --- a/test/cim/extensions/iec61970/base/core/test_site.py +++ b/test/cim/extensions/iec61970/base/core/test_site.py @@ -7,11 +7,9 @@ from cim.fill_fields import site_kwargs from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, \ - verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args + verify_equipment_container_constructor_kwargs from zepben.ewb import Site, TestNetworkBuilder, Equipment, AssignToLvFeeders, LvFeeder, NetworkStateOperators, generate_id -site_args = equipment_container_args - def test_site_constructor_default(): verify_equipment_container_constructor_default(Site(mrid=generate_id())) @@ -22,10 +20,6 @@ def test_site_constructor_kwargs(**kwargs): verify_equipment_container_constructor_kwargs(Site(**kwargs), **kwargs) -def test_site_constructor_args(): - verify_equipment_container_constructor_args(Site(*site_args)) - - @pytest.mark.asyncio async def test_find_lv_feeders_excludes_open_switches(): # diff --git a/test/cim/extensions/iec61970/base/feeder/test_loop.py b/test/cim/extensions/iec61970/base/feeder/test_loop.py index 2eed87888..63c81f891 100644 --- a/test/cim/extensions/iec61970/base/feeder/test_loop.py +++ b/test/cim/extensions/iec61970/base/feeder/test_loop.py @@ -5,13 +5,10 @@ from hypothesis import given from cim.fill_fields import loop_kwargs -from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, verify_identified_object_constructor_kwargs, \ - verify_identified_object_constructor_args, identified_object_args +from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Loop, Circuit, Substation, generate_id -loop_args = [*identified_object_args, [Circuit(mrid=generate_id())], [Substation(mrid=generate_id())], [Substation(mrid=generate_id())]] - def test_loop_constructor_default(): loop = Loop(mrid=generate_id()) @@ -28,7 +25,7 @@ def test_loop_constructor_kwargs(circuits, substations, energizing_substations, circuits=circuits, substations=substations, energizing_substations=energizing_substations, - **kwargs + **kwargs, ) verify_identified_object_constructor_kwargs(loop, **kwargs) @@ -37,17 +34,6 @@ def test_loop_constructor_kwargs(circuits, substations, energizing_substations, assert list(loop.energizing_substations) == energizing_substations -def test_loop_constructor_args(): - loop = Loop(*loop_args) - - verify_identified_object_constructor_args(loop) - assert loop_args[-3:] == [ - list(loop.circuits), - list(loop.substations), - list(loop.energizing_substations) - ] - - def test_circuits_collection(): validate_unordered( Loop, @@ -57,7 +43,7 @@ def test_circuits_collection(): Loop.get_circuit, Loop.add_circuit, Loop.remove_circuit, - Loop.clear_circuits + Loop.clear_circuits, ) @@ -70,7 +56,7 @@ def test_substations_collection(): Loop.get_substation, Loop.add_substation, Loop.remove_substation, - Loop.clear_substations + Loop.clear_substations, ) @@ -83,5 +69,5 @@ def test_energizing_substations_collection(): Loop.get_energizing_substation, Loop.add_energizing_substation, Loop.remove_energizing_substation, - Loop.clear_energizing_substations + Loop.clear_energizing_substations, ) diff --git a/test/cim/extensions/iec61970/base/feeder/test_lv_feeder.py b/test/cim/extensions/iec61970/base/feeder/test_lv_feeder.py index 3786c4c35..6830d634d 100644 --- a/test/cim/extensions/iec61970/base/feeder/test_lv_feeder.py +++ b/test/cim/extensions/iec61970/base/feeder/test_lv_feeder.py @@ -6,21 +6,11 @@ from cim.fill_fields import lv_feeder_kwargs from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, \ - verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args + verify_equipment_container_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import Terminal, Equipment, LvFeeder, generate_id -from zepben.ewb.model.cim.extensions.iec61970.base.feeder.lv_substation import LvSubstation +from zepben.ewb import Equipment, LvFeeder, generate_id from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder -lv_feeder_args = [ - *equipment_container_args, - Terminal(mrid=generate_id()), - {"f": Feeder(mrid=generate_id())}, - {"ce": Equipment(mrid=generate_id())}, - {"cef": Feeder(mrid=generate_id())}, - LvSubstation(mrid=generate_id()), -] - def test_lv_feeder_constructor_default(): lvf = LvFeeder(mrid=generate_id()) @@ -40,7 +30,7 @@ def test_lv_feeder_constructor_kwargs( current_equipment, current_energizing_feeders, normal_energizing_lv_substation, - **kwargs + **kwargs, ): lvf = LvFeeder( normal_head_terminal=normal_head_terminal, @@ -48,7 +38,7 @@ def test_lv_feeder_constructor_kwargs( current_equipment=current_equipment, current_energizing_feeders=current_energizing_feeders, normal_energizing_lv_substation=normal_energizing_lv_substation, - **kwargs + **kwargs, ) verify_equipment_container_constructor_kwargs(lvf, **kwargs) @@ -59,21 +49,6 @@ def test_lv_feeder_constructor_kwargs( assert lvf.normal_energizing_lv_substation == normal_energizing_lv_substation -def test_lv_feeder_constructor_args(): - lvf = LvFeeder(*lv_feeder_args) - - verify_equipment_container_constructor_args(lvf) - assert lv_feeder_args[-5:-4] == [ - lvf.normal_head_terminal - ] - # We use a different style of matching here as the passed in args for normal_energizing_feeders and current_equipment - # are maps and the stored collections are lists. - assert list(lvf.normal_energizing_feeders) == list(lv_feeder_args[-4].values()) - assert list(lvf.current_equipment) == list(lv_feeder_args[-3].values()) - assert list(lvf.current_energizing_feeders) == list(lv_feeder_args[-2].values()) - assert lvf.normal_energizing_lv_substation == lv_feeder_args[-1] - - def test_current_equipment_collection(): validate_unordered( LvFeeder, @@ -83,7 +58,7 @@ def test_current_equipment_collection(): LvFeeder.get_current_equipment, LvFeeder.add_current_equipment, LvFeeder.remove_current_equipment, - LvFeeder.clear_current_equipment + LvFeeder.clear_current_equipment, ) @@ -96,7 +71,7 @@ def test_normal_energizing_feeder_collection(): LvFeeder.get_normal_energizing_feeder, LvFeeder.add_normal_energizing_feeder, LvFeeder.remove_normal_energizing_feeder, - LvFeeder.clear_normal_energizing_feeders + LvFeeder.clear_normal_energizing_feeders, ) @@ -109,5 +84,5 @@ def test_current_energizing_feeder_collection(): LvFeeder.get_current_energizing_feeder, LvFeeder.add_current_energizing_feeder, LvFeeder.remove_current_energizing_feeder, - LvFeeder.clear_current_energizing_feeders + LvFeeder.clear_current_energizing_feeders, ) diff --git a/test/cim/extensions/iec61970/base/feeder/test_lv_substation.py b/test/cim/extensions/iec61970/base/feeder/test_lv_substation.py index 0cfc201af..2275cda2d 100644 --- a/test/cim/extensions/iec61970/base/feeder/test_lv_substation.py +++ b/test/cim/extensions/iec61970/base/feeder/test_lv_substation.py @@ -5,15 +5,12 @@ from hypothesis import given from cim.fill_fields import lv_substation_kwargs -from cim.iec61970.base.core.test_equipment_container import equipment_container_args, \ - verify_equipment_container_constructor_default, verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args +from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, verify_equipment_container_constructor_kwargs from cim.private_collection_validator import validate_unordered from util import assert_or_empty from zepben.ewb import generate_id, LvFeeder, Feeder, Terminal, PowerTransformer, Fuse from zepben.ewb.model.cim.extensions.iec61970.base.feeder.lv_substation import LvSubstation -lv_substation_args = equipment_container_args - def test_lv_substation_constructor_default(): verify_equipment_container_constructor_default(LvSubstation(mrid=generate_id())) @@ -24,13 +21,13 @@ def test_lv_substation_constructor_kwargs( normal_energizing_feeders, current_energizing_feeders, normal_energized_lv_feeders, - **kwargs + **kwargs, ): lv_sub = LvSubstation( normal_energizing_feeders=normal_energizing_feeders, current_energizing_feeders=current_energizing_feeders, normal_energized_lv_feeders=normal_energized_lv_feeders, - **kwargs + **kwargs, ) verify_equipment_container_constructor_kwargs(lv_sub, **kwargs) @@ -40,10 +37,6 @@ def test_lv_substation_constructor_kwargs( assert_or_empty(lv_sub.normal_energized_lv_feeders, normal_energized_lv_feeders) -def test_lv_substation_constructor_args(): - verify_equipment_container_constructor_args(LvSubstation(*lv_substation_args)) - - def test_normal_energized_lv_feeder_collection(): validate_unordered( LvSubstation, @@ -53,7 +46,7 @@ def test_normal_energized_lv_feeder_collection(): LvSubstation.get_normal_energized_lv_feeder, LvSubstation.add_normal_energized_lv_feeder, LvSubstation.remove_normal_energized_lv_feeder, - LvSubstation.clear_normal_energized_lv_feeders + LvSubstation.clear_normal_energized_lv_feeders, ) @@ -66,7 +59,7 @@ def test_normal_energizing_feeder_collection(): LvSubstation.get_normal_energizing_feeder, LvSubstation.add_normal_energizing_feeder, LvSubstation.remove_normal_energizing_feeder, - LvSubstation.clear_normal_energizing_feeders + LvSubstation.clear_normal_energizing_feeders, ) @@ -79,7 +72,7 @@ def test_current_energizing_feeder_collection(): LvSubstation.get_current_energizing_feeder, LvSubstation.add_current_energizing_feeder, LvSubstation.remove_current_energizing_feeder, - LvSubstation.clear_current_energizing_feeders + LvSubstation.clear_current_energizing_feeders, ) diff --git a/test/cim/extensions/iec61970/base/protection/test_directional_current_relay.py b/test/cim/extensions/iec61970/base/protection/test_directional_current_relay.py index cadcf8247..32ee22728 100644 --- a/test/cim/extensions/iec61970/base/protection/test_directional_current_relay.py +++ b/test/cim/extensions/iec61970/base/protection/test_directional_current_relay.py @@ -5,21 +5,10 @@ from hypothesis import given from cim.fill_fields import directional_current_relay_kwargs -from cim.iec61970.base.protection.test_protection_relay_function import protection_relay_function_args, \ - verify_protection_relay_function_constructor_default, verify_protection_relay_function_constructor_args, verify_protection_relay_function_constructor_kwargs +from cim.iec61970.base.protection.test_protection_relay_function import verify_protection_relay_function_constructor_default, \ + verify_protection_relay_function_constructor_kwargs from zepben.ewb import PolarizingQuantityType, PhaseCode, generate_id, DirectionalCurrentRelay -directional_current_relay_args = [ - *protection_relay_function_args, - 1.1, - PolarizingQuantityType.NEGATIVE_SEQUENCE_VOLTAGE, - PhaseCode.ABCN, - 2.2, - 3.3, - False, - 4.4, -] - def test_directional_current_relay_constructor_default(): dcr = DirectionalCurrentRelay(mrid=generate_id()) @@ -43,7 +32,7 @@ def test_directional_current_relay_constructor_kwargs( current_limit_1, inverse_time_flag, time_delay_1, - **kwargs + **kwargs, ): dcr = DirectionalCurrentRelay( directional_characteristic_angle=directional_characteristic_angle, @@ -53,7 +42,7 @@ def test_directional_current_relay_constructor_kwargs( current_limit_1=current_limit_1, inverse_time_flag=inverse_time_flag, time_delay_1=time_delay_1, - **kwargs + **kwargs, ) verify_protection_relay_function_constructor_kwargs(dcr, **kwargs) @@ -64,16 +53,3 @@ def test_directional_current_relay_constructor_kwargs( assert dcr.current_limit_1 == current_limit_1 assert dcr.inverse_time_flag == inverse_time_flag assert dcr.time_delay_1 == time_delay_1 - - -def test_directional_current_relay_constructor_args(): - dcr = DirectionalCurrentRelay(*directional_current_relay_args) - - verify_protection_relay_function_constructor_args(dcr) - assert dcr.directional_characteristic_angle == directional_current_relay_args[-7] - assert dcr.polarizing_quantity_type == directional_current_relay_args[-6] - assert dcr.relay_element_phase == directional_current_relay_args[-5] - assert dcr.minimum_pickup_current == directional_current_relay_args[-4] - assert dcr.current_limit_1 == directional_current_relay_args[-3] - assert dcr.inverse_time_flag == directional_current_relay_args[-2] - assert dcr.time_delay_1 == directional_current_relay_args[-1] diff --git a/test/cim/extensions/iec61970/base/wires/test_battery_control.py b/test/cim/extensions/iec61970/base/wires/test_battery_control.py index 3848b6daa..51fdc6973 100644 --- a/test/cim/extensions/iec61970/base/wires/test_battery_control.py +++ b/test/cim/extensions/iec61970/base/wires/test_battery_control.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import battery_control_kwargs -from cim.iec61970.base.wires.test_regulating_control import regulating_control_args, verify_regulating_control_constructor_default, \ - verify_regulating_control_constructor_kwargs, verify_regulating_control_constructor_args +from cim.iec61970.base.wires.test_regulating_control import verify_regulating_control_constructor_default, \ + verify_regulating_control_constructor_kwargs from zepben.ewb import BatteryControl, BatteryControlMode, generate_id -battery_control_args = [*regulating_control_args, 1.1, 2.2, 3.3, BatteryControlMode.time] - def test_battery_control_constructor_default(): bc = BatteryControl(mrid=generate_id()) @@ -30,7 +28,7 @@ def test_battery_control_constructor_kwargs(charging_rate, discharging_rate, res discharging_rate=discharging_rate, reserve_percent=reserve_percent, control_mode=control_mode, - **kwargs + **kwargs, ) verify_regulating_control_constructor_kwargs(bc, **kwargs) @@ -38,15 +36,3 @@ def test_battery_control_constructor_kwargs(charging_rate, discharging_rate, res assert bc.discharging_rate == discharging_rate assert bc.reserve_percent == reserve_percent assert bc.control_mode == control_mode - - -def test_battery_control_constructor_args(): - bc = BatteryControl(*battery_control_args) - - verify_regulating_control_constructor_args(bc) - assert battery_control_args[-4:] == [ - bc.charging_rate, - bc.discharging_rate, - bc.reserve_percent, - bc.control_mode - ] diff --git a/test/cim/iec61968/assetinfo/test_cable_info.py b/test/cim/iec61968/assetinfo/test_cable_info.py index e3d5576be..bf3c1e3fd 100644 --- a/test/cim/iec61968/assetinfo/test_cable_info.py +++ b/test/cim/iec61968/assetinfo/test_cable_info.py @@ -6,12 +6,10 @@ from cim.fill_fields import cable_info_kwargs from cim.iec61968.assetinfo.test_wire_info import verify_wire_info_constructor_default, \ - verify_wire_info_constructor_kwargs, verify_wire_info_constructor_args, wire_info_args + verify_wire_info_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61968.assetinfo.cable_info import CableInfo -cable_info_args = wire_info_args - def test_cable_info_constructor_default(): verify_wire_info_constructor_default(CableInfo(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_cable_info_constructor_default(): @given(**cable_info_kwargs()) def test_cable_info_constructor_kwargs(**kwargs): verify_wire_info_constructor_kwargs(CableInfo(**kwargs), **kwargs) - - -def test_cable_info_constructor_args(): - verify_wire_info_constructor_args(CableInfo(*cable_info_args)) diff --git a/test/cim/iec61968/assetinfo/test_no_load_test.py b/test/cim/iec61968/assetinfo/test_no_load_test.py index 66cf93c74..1dacc5795 100644 --- a/test/cim/iec61968/assetinfo/test_no_load_test.py +++ b/test/cim/iec61968/assetinfo/test_no_load_test.py @@ -6,11 +6,9 @@ from cim.fill_fields import no_load_test_kwargs from cim.iec61968.assetinfo.test_transformer_test import verify_transformer_test_constructor_default, \ - verify_transformer_test_constructor_kwargs, verify_transformer_test_constructor_args, transformer_test_args + verify_transformer_test_constructor_kwargs from zepben.ewb import NoLoadTest, generate_id -no_load_test_args = [*transformer_test_args, 1, 2.2, 3.3, 4, 5] - def test_no_load_test_constructor_default(): nlt = NoLoadTest(mrid=generate_id()) @@ -25,12 +23,14 @@ def test_no_load_test_constructor_default(): @given(**no_load_test_kwargs()) def test_no_load_test_constructor_kwargs(energised_end_voltage, exciting_current, exciting_current_zero, loss, loss_zero, **kwargs): - nlt = NoLoadTest(energised_end_voltage=energised_end_voltage, - exciting_current=exciting_current, - exciting_current_zero=exciting_current_zero, - loss=loss, - loss_zero=loss_zero, - **kwargs) + nlt = NoLoadTest( + energised_end_voltage=energised_end_voltage, + exciting_current=exciting_current, + exciting_current_zero=exciting_current_zero, + loss=loss, + loss_zero=loss_zero, + **kwargs, + ) verify_transformer_test_constructor_kwargs(nlt, **kwargs) assert nlt.energised_end_voltage == energised_end_voltage @@ -38,16 +38,3 @@ def test_no_load_test_constructor_kwargs(energised_end_voltage, exciting_current assert nlt.exciting_current_zero == exciting_current_zero assert nlt.loss == loss assert nlt.loss_zero == loss_zero - - -def test_no_load_test_constructor_args(): - nlt = NoLoadTest(*no_load_test_args) - - verify_transformer_test_constructor_args(nlt) - assert no_load_test_args[-5:] == [ - nlt.energised_end_voltage, - nlt.exciting_current, - nlt.exciting_current_zero, - nlt.loss, - nlt.loss_zero - ] diff --git a/test/cim/iec61968/assetinfo/test_open_circuit_test.py b/test/cim/iec61968/assetinfo/test_open_circuit_test.py index 7d42599d5..2ec3f22f7 100644 --- a/test/cim/iec61968/assetinfo/test_open_circuit_test.py +++ b/test/cim/iec61968/assetinfo/test_open_circuit_test.py @@ -6,11 +6,9 @@ from cim.fill_fields import open_circuit_test_kwargs from cim.iec61968.assetinfo.test_transformer_test import verify_transformer_test_constructor_default, \ - verify_transformer_test_constructor_kwargs, verify_transformer_test_constructor_args, transformer_test_args + verify_transformer_test_constructor_kwargs from zepben.ewb import OpenCircuitTest, generate_id -open_circuit_test_args = [*transformer_test_args, 1, 2, 3, 4, 5.5] - def test_open_circuit_test_constructor_default(): test = OpenCircuitTest(mrid=generate_id()) @@ -25,12 +23,14 @@ def test_open_circuit_test_constructor_default(): @given(**open_circuit_test_kwargs()) def test_open_circuit_test_constructor_kwargs(energised_end_step, energised_end_voltage, open_end_step, open_end_voltage, phase_shift, **kwargs): - test = OpenCircuitTest(energised_end_step=energised_end_step, - energised_end_voltage=energised_end_voltage, - open_end_step=open_end_step, - open_end_voltage=open_end_voltage, - phase_shift=phase_shift, - **kwargs) + test = OpenCircuitTest( + energised_end_step=energised_end_step, + energised_end_voltage=energised_end_voltage, + open_end_step=open_end_step, + open_end_voltage=open_end_voltage, + phase_shift=phase_shift, + **kwargs, + ) verify_transformer_test_constructor_kwargs(test, **kwargs) assert test.energised_end_step == energised_end_step @@ -38,16 +38,3 @@ def test_open_circuit_test_constructor_kwargs(energised_end_step, energised_end_ assert test.open_end_step == open_end_step assert test.open_end_voltage == open_end_voltage assert test.phase_shift == phase_shift - - -def test_open_circuit_test_constructor_args(): - test = OpenCircuitTest(*open_circuit_test_args) - - verify_transformer_test_constructor_args(test) - assert open_circuit_test_args[-5:] == [ - test.energised_end_step, - test.energised_end_voltage, - test.open_end_step, - test.open_end_voltage, - test.phase_shift - ] diff --git a/test/cim/iec61968/assetinfo/test_overhead_wire_info.py b/test/cim/iec61968/assetinfo/test_overhead_wire_info.py index a68c1300b..04bff42bc 100644 --- a/test/cim/iec61968/assetinfo/test_overhead_wire_info.py +++ b/test/cim/iec61968/assetinfo/test_overhead_wire_info.py @@ -6,12 +6,10 @@ from cim.fill_fields import overhead_wire_info_kwargs from cim.iec61968.assetinfo.test_wire_info import verify_wire_info_constructor_default, \ - verify_wire_info_constructor_kwargs, verify_wire_info_constructor_args, wire_info_args + verify_wire_info_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61968.assetinfo.overhead_wire_info import OverheadWireInfo -overhead_wire_info_args = wire_info_args - def test_overhead_wire_info_constructor_default(): verify_wire_info_constructor_default(OverheadWireInfo(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_overhead_wire_info_constructor_default(): @given(**overhead_wire_info_kwargs()) def test_overhead_wire_info_constructor_kwargs(**kwargs): verify_wire_info_constructor_kwargs(OverheadWireInfo(**kwargs), **kwargs) - - -def test_overhead_wire_info_constructor_args(): - verify_wire_info_constructor_args(OverheadWireInfo(*overhead_wire_info_args)) diff --git a/test/cim/iec61968/assetinfo/test_power_transformer_info.py b/test/cim/iec61968/assetinfo/test_power_transformer_info.py index 6aebcdcc9..e3808f791 100644 --- a/test/cim/iec61968/assetinfo/test_power_transformer_info.py +++ b/test/cim/iec61968/assetinfo/test_power_transformer_info.py @@ -6,12 +6,10 @@ from cim.fill_fields import power_transformer_info_kwargs from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, \ - verify_asset_info_constructor_kwargs, verify_asset_info_constructor_args, asset_info_args + verify_asset_info_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import PowerTransformerInfo, TransformerTankInfo, generate_id -power_transformer_info_args = [*asset_info_args, [TransformerTankInfo(mrid=generate_id()), TransformerTankInfo(mrid=generate_id())]] - def test_power_transformer_info_constructor_default(): pti = PowerTransformerInfo(mrid=generate_id()) @@ -28,15 +26,6 @@ def test_power_transformer_info_constructor_kwargs(transformer_tank_infos, **kwa assert list(pti.transformer_tank_infos) == transformer_tank_infos -def test_power_transformer_info_constructor_args(): - pti = PowerTransformerInfo(*power_transformer_info_args) - - verify_asset_info_constructor_args(pti) - assert power_transformer_info_args[-1:] == [ - list(pti.transformer_tank_infos) - ] - - def test_transformer_tank_info_collection(): validate_unordered( PowerTransformerInfo, @@ -46,5 +35,5 @@ def test_transformer_tank_info_collection(): PowerTransformerInfo.get_transformer_tank_info, PowerTransformerInfo.add_transformer_tank_info, PowerTransformerInfo.remove_transformer_tank_info, - PowerTransformerInfo.clear_transformer_tank_infos + PowerTransformerInfo.clear_transformer_tank_infos, ) diff --git a/test/cim/iec61968/assetinfo/test_short_circuit_test.py b/test/cim/iec61968/assetinfo/test_short_circuit_test.py index 87444875e..48b55c054 100644 --- a/test/cim/iec61968/assetinfo/test_short_circuit_test.py +++ b/test/cim/iec61968/assetinfo/test_short_circuit_test.py @@ -6,11 +6,9 @@ from cim.fill_fields import short_circuit_test_kwargs from cim.iec61968.assetinfo.test_transformer_test import verify_transformer_test_constructor_default, \ - verify_transformer_test_constructor_kwargs, verify_transformer_test_constructor_args, transformer_test_args + verify_transformer_test_constructor_kwargs from zepben.ewb import ShortCircuitTest, generate_id -short_circuit_test_args = [*transformer_test_args, 1.1, 2, 3, 4.4, 5.5, 6, 7, 8, 9.9, 10.01] - def test_short_circuit_test_constructor_default(): sct = ShortCircuitTest(mrid=generate_id()) @@ -29,19 +27,23 @@ def test_short_circuit_test_constructor_default(): @given(**short_circuit_test_kwargs()) -def test_short_circuit_test_constructor_kwargs(current, energised_end_step, grounded_end_step, leakage_impedance, leakage_impedance_zero, loss, loss_zero, - power, voltage, voltage_ohmic_part, **kwargs): - sct = ShortCircuitTest(current=current, - energised_end_step=energised_end_step, - grounded_end_step=grounded_end_step, - leakage_impedance=leakage_impedance, - leakage_impedance_zero=leakage_impedance_zero, - loss=loss, - loss_zero=loss_zero, - power=power, - voltage=voltage, - voltage_ohmic_part=voltage_ohmic_part, - **kwargs) +def test_short_circuit_test_constructor_kwargs( + current, energised_end_step, grounded_end_step, leakage_impedance, leakage_impedance_zero, loss, loss_zero, + power, voltage, voltage_ohmic_part, **kwargs, +): + sct = ShortCircuitTest( + current=current, + energised_end_step=energised_end_step, + grounded_end_step=grounded_end_step, + leakage_impedance=leakage_impedance, + leakage_impedance_zero=leakage_impedance_zero, + loss=loss, + loss_zero=loss_zero, + power=power, + voltage=voltage, + voltage_ohmic_part=voltage_ohmic_part, + **kwargs, + ) verify_transformer_test_constructor_kwargs(sct, **kwargs) assert sct.current == current @@ -54,21 +56,3 @@ def test_short_circuit_test_constructor_kwargs(current, energised_end_step, grou assert sct.power == power assert sct.voltage == voltage assert sct.voltage_ohmic_part == voltage_ohmic_part - - -def test_short_circuit_test_constructor_args(): - sct = ShortCircuitTest(*short_circuit_test_args) - - verify_transformer_test_constructor_args(sct) - assert short_circuit_test_args[-10:] == [ - sct.current, - sct.energised_end_step, - sct.grounded_end_step, - sct.leakage_impedance, - sct.leakage_impedance_zero, - sct.loss, - sct.loss_zero, - sct.power, - sct.voltage, - sct.voltage_ohmic_part - ] diff --git a/test/cim/iec61968/assetinfo/test_shunt_compensator_info.py b/test/cim/iec61968/assetinfo/test_shunt_compensator_info.py index a6b7809d8..b57a33850 100644 --- a/test/cim/iec61968/assetinfo/test_shunt_compensator_info.py +++ b/test/cim/iec61968/assetinfo/test_shunt_compensator_info.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import shunt_compensator_info_kwargs -from cim.iec61968.assets.test_asset_info import asset_info_args, verify_asset_info_constructor_default, \ - verify_asset_info_constructor_kwargs, verify_asset_info_constructor_args +from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, \ + verify_asset_info_constructor_kwargs from zepben.ewb import ShuntCompensatorInfo, generate_id -shunt_compensator_info_args = [*asset_info_args, 1, 2, 3, 4] - def test_shunt_compensator_info_constructor_default(): sci = ShuntCompensatorInfo(mrid=generate_id()) @@ -24,26 +22,16 @@ def test_shunt_compensator_info_constructor_default(): @given(**shunt_compensator_info_kwargs()) def test_shunt_compensator_info_constructor_kwargs(max_power_loss, rated_current, rated_reactive_power, rated_voltage, **kwargs): - sci = ShuntCompensatorInfo(max_power_loss=max_power_loss, - rated_current=rated_current, - rated_reactive_power=rated_reactive_power, - rated_voltage=rated_voltage, - **kwargs) + sci = ShuntCompensatorInfo( + max_power_loss=max_power_loss, + rated_current=rated_current, + rated_reactive_power=rated_reactive_power, + rated_voltage=rated_voltage, + **kwargs, + ) verify_asset_info_constructor_kwargs(sci, **kwargs) assert sci.max_power_loss == max_power_loss assert sci.rated_current == rated_current assert sci.rated_reactive_power == rated_reactive_power assert sci.rated_voltage == rated_voltage - - -def test_shunt_compensator_info_constructor_args(): - sci = ShuntCompensatorInfo(*shunt_compensator_info_args) - - verify_asset_info_constructor_args(sci) - assert shunt_compensator_info_args[-4:] == [ - sci.max_power_loss, - sci.rated_current, - sci.rated_reactive_power, - sci.rated_voltage - ] diff --git a/test/cim/iec61968/assetinfo/test_switch_info.py b/test/cim/iec61968/assetinfo/test_switch_info.py index fe6d1b7c8..570951f25 100644 --- a/test/cim/iec61968/assetinfo/test_switch_info.py +++ b/test/cim/iec61968/assetinfo/test_switch_info.py @@ -5,12 +5,9 @@ from hypothesis import given from cim.fill_fields import switch_info_kwargs -from cim.iec61968.assets.test_asset_info import asset_info_args, verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs, \ - verify_asset_info_constructor_args +from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs from zepben.ewb import SwitchInfo, generate_id -switch_info_args = [*asset_info_args, 1.1] - def test_switch_info_constructor_default(): si = SwitchInfo(mrid=generate_id()) @@ -23,17 +20,8 @@ def test_switch_info_constructor_default(): def test_switch_info_constructor_kwargs(rated_interrupting_time, **kwargs): si = SwitchInfo( rated_interrupting_time=rated_interrupting_time, - **kwargs + **kwargs, ) verify_asset_info_constructor_kwargs(si, **kwargs) assert si.rated_interrupting_time == rated_interrupting_time - - -def test_switch_info_constructor_args(): - si = SwitchInfo(*switch_info_args) - - verify_asset_info_constructor_args(si) - assert switch_info_args[-1:] == [ - si.rated_interrupting_time - ] diff --git a/test/cim/iec61968/assetinfo/test_transformer_end_info.py b/test/cim/iec61968/assetinfo/test_transformer_end_info.py index e4d7149c0..aec569200 100644 --- a/test/cim/iec61968/assetinfo/test_transformer_end_info.py +++ b/test/cim/iec61968/assetinfo/test_transformer_end_info.py @@ -7,30 +7,8 @@ from hypothesis import given from cim.fill_fields import transformer_end_info_kwargs -from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs, \ - verify_asset_info_constructor_args, asset_info_args -from zepben.ewb import TransformerEndInfo, WindingConnection, TransformerStarImpedance, TransformerTankInfo, ResistanceReactance, NoLoadTest, \ - ShortCircuitTest, OpenCircuitTest, generate_id - -transformer_end_info_args = [ - *asset_info_args, - WindingConnection.UNKNOWN, - 1, - 2, - 3, - 4, - 5.0, - 6, - 7, - 8, - TransformerTankInfo(mrid=generate_id()), - TransformerStarImpedance(mrid=generate_id()), - NoLoadTest(mrid=generate_id()), - ShortCircuitTest(mrid=generate_id()), - ShortCircuitTest(mrid=generate_id()), - OpenCircuitTest(mrid=generate_id()), - OpenCircuitTest(mrid=generate_id()), -] +from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs +from zepben.ewb import TransformerEndInfo, WindingConnection, TransformerStarImpedance, ResistanceReactance, ShortCircuitTest, generate_id def test_transformer_end_info_constructor_default(): @@ -56,10 +34,12 @@ def test_transformer_end_info_constructor_default(): @given(**transformer_end_info_kwargs()) -def test_transformer_end_info_constructor_kwargs(connection_kind, emergency_s, end_number, insulation_u, phase_angle_clock, r, rated_s, rated_u, short_term_s, - transformer_tank_info, transformer_star_impedance, energised_end_no_load_tests, - energised_end_short_circuit_tests, grounded_end_short_circuit_tests, open_end_open_circuit_tests, - energised_end_open_circuit_tests, **kwargs): +def test_transformer_end_info_constructor_kwargs( + connection_kind, emergency_s, end_number, insulation_u, phase_angle_clock, r, rated_s, rated_u, short_term_s, + transformer_tank_info, transformer_star_impedance, energised_end_no_load_tests, + energised_end_short_circuit_tests, grounded_end_short_circuit_tests, open_end_open_circuit_tests, + energised_end_open_circuit_tests, **kwargs, +): tei = TransformerEndInfo( connection_kind=connection_kind, emergency_s=emergency_s, @@ -77,7 +57,7 @@ def test_transformer_end_info_constructor_kwargs(connection_kind, emergency_s, e grounded_end_short_circuit_tests=grounded_end_short_circuit_tests, open_end_open_circuit_tests=open_end_open_circuit_tests, energised_end_open_circuit_tests=energised_end_open_circuit_tests, - **kwargs + **kwargs, ) verify_asset_info_constructor_kwargs(tei, **kwargs) @@ -99,30 +79,6 @@ def test_transformer_end_info_constructor_kwargs(connection_kind, emergency_s, e assert tei.energised_end_open_circuit_tests is energised_end_open_circuit_tests -def test_transformer_end_info_constructor_args(): - tei = TransformerEndInfo(*transformer_end_info_args) - - verify_asset_info_constructor_args(tei) - assert transformer_end_info_args[-16:] == [ - tei.connection_kind, - tei.emergency_s, - tei.end_number, - tei.insulation_u, - tei.phase_angle_clock, - tei.r, - tei.rated_s, - tei.rated_u, - tei.short_term_s, - tei.transformer_tank_info, - tei.transformer_star_impedance, - tei.energised_end_no_load_tests, - tei.energised_end_short_circuit_tests, - tei.grounded_end_short_circuit_tests, - tei.open_end_open_circuit_tests, - tei.energised_end_open_circuit_tests - ] - - def test_populates_resistance_reactance_off_end_star_impedance_if_available(): with patch.object(TransformerEndInfo, "calculate_resistance_reactance_from_tests") as method: info = TransformerEndInfo(mrid=generate_id(), transformer_star_impedance=TransformerStarImpedance(mrid=generate_id(), r=1.1, x=1.2, r0=1.3, x0=1.4)) @@ -143,7 +99,7 @@ def test_merges_resistance_reactance_if_required(): method.return_value = ResistanceReactance(None, 2.2, None, None) info = TransformerEndInfo( mrid=generate_id(), - transformer_star_impedance=TransformerStarImpedance(mrid=generate_id(), r=1.1, x=None, r0=None, x0=None) + transformer_star_impedance=TransformerStarImpedance(mrid=generate_id(), r=1.1, x=None, r0=None, x0=None), ) validate_resistance_reactance(info.resistance_reactance(), 1.1, 2.2, None, None) method.assert_called_once() @@ -182,7 +138,7 @@ def validate_resistance_reactance_from_test(rated_u, rated_s, energised_test, gr rated_u=rated_u, rated_s=rated_s, grounded_end_short_circuit_tests=grounded_test, - energised_end_short_circuit_tests=energised_test + energised_end_short_circuit_tests=energised_test, ) if expected_rr is not None: diff --git a/test/cim/iec61968/assetinfo/test_transformer_tank_info.py b/test/cim/iec61968/assetinfo/test_transformer_tank_info.py index a8148eb0d..dcd46eba9 100644 --- a/test/cim/iec61968/assetinfo/test_transformer_tank_info.py +++ b/test/cim/iec61968/assetinfo/test_transformer_tank_info.py @@ -7,12 +7,9 @@ from cim.fill_fields import transformer_tank_info_kwargs from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, \ - verify_asset_info_constructor_kwargs, verify_asset_info_constructor_args, asset_info_args + verify_asset_info_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import TransformerTankInfo, TransformerEndInfo, PowerTransformerInfo, generate_id - -transformer_tank_info_args = [*asset_info_args, PowerTransformerInfo(mrid=generate_id()), - [TransformerEndInfo(mrid=generate_id()), TransformerEndInfo(mrid=generate_id())]] +from zepben.ewb import TransformerTankInfo, TransformerEndInfo, generate_id def test_transformer_tank_info_constructor_default(): @@ -30,15 +27,6 @@ def test_transformer_tank_info_constructor_kwargs(power_transformer_info, transf assert list(tti.transformer_end_infos) == transformer_end_infos -def test_transformer_tank_info_constructor_args(): - tti = TransformerTankInfo(*transformer_tank_info_args) - - verify_asset_info_constructor_args(tti) - assert transformer_tank_info_args[-1:] == [ - list(tti.transformer_end_infos) - ] - - def test_transformer_tank_info_collection(): validate_unordered( TransformerTankInfo, @@ -48,5 +36,5 @@ def test_transformer_tank_info_collection(): TransformerTankInfo.get_transformer_end_info, TransformerTankInfo.add_transformer_end_info, TransformerTankInfo.remove_transformer_end_info, - TransformerTankInfo.clear_transformer_end_infos + TransformerTankInfo.clear_transformer_end_infos, ) diff --git a/test/cim/iec61968/assetinfo/test_transformer_test.py b/test/cim/iec61968/assetinfo/test_transformer_test.py index ced416f9b..1ff85b51b 100644 --- a/test/cim/iec61968/assetinfo/test_transformer_test.py +++ b/test/cim/iec61968/assetinfo/test_transformer_test.py @@ -3,11 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import TransformerTest -transformer_test_args = [*identified_object_args, 1, 2.2] - def verify_transformer_test_constructor_default(tt: TransformerTest): verify_identified_object_constructor_default(tt) @@ -19,11 +17,3 @@ def verify_transformer_test_constructor_kwargs(tt: TransformerTest, base_power, verify_identified_object_constructor_kwargs(tt, **kwargs) assert tt.base_power == base_power assert tt.temperature == temperature - - -def verify_transformer_test_constructor_args(tt: TransformerTest): - verify_identified_object_constructor_args(tt) - assert transformer_test_args[-2:] == [ - tt.base_power, - tt.temperature - ] diff --git a/test/cim/iec61968/assetinfo/test_wire_info.py b/test/cim/iec61968/assetinfo/test_wire_info.py index a2444e55b..7e90d3ba7 100644 --- a/test/cim/iec61968/assetinfo/test_wire_info.py +++ b/test/cim/iec61968/assetinfo/test_wire_info.py @@ -4,12 +4,10 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import WireInfo, WireMaterialKind from zepben.ewb.model.cim.iec61968.assetinfo.wire_insulation_kind import WireInsulationKind -wire_info_args = [*identified_object_args, 1, WireMaterialKind.acsr, "6.7", "8", "4", True, WireInsulationKind.doubleWireArmour, 1.2] - def verify_wire_info_constructor_default(wi: WireInfo): verify_identified_object_constructor_default(wi) @@ -33,7 +31,7 @@ def verify_wire_info_constructor_kwargs( insulated, insulation_material, insulation_thickness, - **kwargs + **kwargs, ): verify_identified_object_constructor_kwargs(wi, **kwargs) assert wi.rated_current == rated_current @@ -44,17 +42,3 @@ def verify_wire_info_constructor_kwargs( assert wi.insulated == insulated assert wi.insulation_material == insulation_material assert wi.insulation_thickness == insulation_thickness - - -def verify_wire_info_constructor_args(wi: WireInfo): - verify_identified_object_constructor_args(wi) - assert wire_info_args[-8:] == [ - wi.rated_current, - wi.material, - wi.size_description, - wi.strand_count, - wi.core_strand_count, - wi.insulated, - wi.insulation_material, - wi.insulation_thickness, - ] diff --git a/test/cim/iec61968/assets/test_asset.py b/test/cim/iec61968/assets/test_asset.py index 2fcd15a3b..0f8950745 100644 --- a/test/cim/iec61968/assets/test_asset.py +++ b/test/cim/iec61968/assets/test_asset.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import Asset, Location, AssetOrganisationRole, PowerSystemResource, generate_id - -asset_args = [*identified_object_args, Location(mrid=generate_id()), [AssetOrganisationRole(mrid=generate_id())], [PowerSystemResource(mrid=generate_id())]] +from zepben.ewb import Asset, AssetOrganisationRole, PowerSystemResource def verify_asset_constructor_default(a: Asset): @@ -25,15 +23,6 @@ def verify_asset_constructor_kwargs(a: Asset, location, organisation_roles, powe assert list(a.power_system_resources) == power_system_resources -def verify_asset_constructor_args(a: Asset): - verify_identified_object_constructor_args(a) - assert asset_args[-3:] == [ - a.location, - list(a.organisation_roles), - list(a.power_system_resources) - ] - - def test_organisation_roles_collection(): validate_unordered( Asset, @@ -43,7 +32,7 @@ def test_organisation_roles_collection(): Asset.get_organisation_role, Asset.add_organisation_role, Asset.remove_organisation_role, - Asset.clear_organisation_roles + Asset.clear_organisation_roles, ) @@ -56,5 +45,5 @@ def test_power_system_resources_collection(): Asset.get_power_system_resource, Asset.add_power_system_resource, Asset.remove_power_system_resource, - Asset.clear_power_system_resources + Asset.clear_power_system_resources, ) diff --git a/test/cim/iec61968/assets/test_asset_container.py b/test/cim/iec61968/assets/test_asset_container.py index d813137e5..734dda831 100644 --- a/test/cim/iec61968/assets/test_asset_container.py +++ b/test/cim/iec61968/assets/test_asset_container.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61968.assets.test_asset import verify_asset_constructor_default, \ - verify_asset_constructor_kwargs, verify_asset_constructor_args, asset_args + verify_asset_constructor_kwargs from zepben.ewb.model.cim.iec61968.assets.asset_container import AssetContainer -asset_container_args = asset_args - def verify_asset_container_constructor_default(ac: AssetContainer): verify_asset_constructor_default(ac) @@ -16,7 +14,3 @@ def verify_asset_container_constructor_default(ac: AssetContainer): def verify_asset_container_constructor_kwargs(ac: AssetContainer, **kwargs): verify_asset_constructor_kwargs(ac, **kwargs) - - -def verify_asset_container_constructor_args(ac: AssetContainer): - verify_asset_constructor_args(ac) diff --git a/test/cim/iec61968/assets/test_asset_function.py b/test/cim/iec61968/assets/test_asset_function.py index b696c5f38..6d4727cac 100644 --- a/test/cim/iec61968/assets/test_asset_function.py +++ b/test/cim/iec61968/assets/test_asset_function.py @@ -3,12 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from test.cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, verify_identified_object_constructor_kwargs, \ - verify_identified_object_constructor_args, identified_object_args +from test.cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, verify_identified_object_constructor_kwargs from zepben.ewb.model.cim.iec61968.assets.asset_function import AssetFunction -asset_function_args = identified_object_args - def verify_asset_function_constructor_default(af: AssetFunction): verify_identified_object_constructor_default(af) @@ -16,7 +13,3 @@ def verify_asset_function_constructor_default(af: AssetFunction): def verify_asset_function_constructor_kwargs(af: AssetFunction, **kwargs): verify_identified_object_constructor_kwargs(af, **kwargs) - - -def verify_asset_function_constructor_args(af: AssetFunction): - verify_identified_object_constructor_args(af) diff --git a/test/cim/iec61968/assets/test_asset_info.py b/test/cim/iec61968/assets/test_asset_info.py index 9d813c400..f7680f216 100644 --- a/test/cim/iec61968/assets/test_asset_info.py +++ b/test/cim/iec61968/assets/test_asset_info.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import AssetInfo -asset_info_args = identified_object_args - def verify_asset_info_constructor_default(ai: AssetInfo): verify_identified_object_constructor_default(ai) @@ -16,7 +14,3 @@ def verify_asset_info_constructor_default(ai: AssetInfo): def verify_asset_info_constructor_kwargs(ai: AssetInfo, **kwargs): verify_identified_object_constructor_kwargs(ai, **kwargs) - - -def verify_asset_info_constructor_args(ai: AssetInfo): - verify_identified_object_constructor_args(ai) diff --git a/test/cim/iec61968/assets/test_asset_organisation_role.py b/test/cim/iec61968/assets/test_asset_organisation_role.py index b6c589b97..2553741a3 100644 --- a/test/cim/iec61968/assets/test_asset_organisation_role.py +++ b/test/cim/iec61968/assets/test_asset_organisation_role.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61968.common.test_organisation_role import verify_organisation_role_constructor_default, \ - verify_organisation_role_constructor_kwargs, verify_organisation_role_constructor_args, organisation_role_args + verify_organisation_role_constructor_kwargs from zepben.ewb import AssetOrganisationRole -asset_organisation_role_args = organisation_role_args - def verify_asset_organisation_role_constructor_default(aor: AssetOrganisationRole): verify_organisation_role_constructor_default(aor) @@ -16,7 +14,3 @@ def verify_asset_organisation_role_constructor_default(aor: AssetOrganisationRol def verify_asset_organisation_role_constructor_kwargs(aor: AssetOrganisationRole, **kwargs): verify_organisation_role_constructor_kwargs(aor, **kwargs) - - -def verify_asset_organisation_role_constructor_args(aor: AssetOrganisationRole): - verify_organisation_role_constructor_args(aor) diff --git a/test/cim/iec61968/assets/test_asset_owner.py b/test/cim/iec61968/assets/test_asset_owner.py index 035105221..d785dd51f 100644 --- a/test/cim/iec61968/assets/test_asset_owner.py +++ b/test/cim/iec61968/assets/test_asset_owner.py @@ -6,12 +6,10 @@ from cim.fill_fields import asset_owner_kwargs from cim.iec61968.assets.test_asset_organisation_role import verify_asset_organisation_role_constructor_default, \ - verify_asset_organisation_role_constructor_kwargs, verify_asset_organisation_role_constructor_args, asset_organisation_role_args + verify_asset_organisation_role_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61968.assets.asset_owner import AssetOwner -asset_owner_args = asset_organisation_role_args - def test_asset_owner_constructor_default(): verify_asset_organisation_role_constructor_default(AssetOwner(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_asset_owner_constructor_default(): @given(**asset_owner_kwargs()) def test_asset_owner_constructor_kwargs(**kwargs): verify_asset_organisation_role_constructor_kwargs(AssetOwner(**kwargs), **kwargs) - - -def test_asset_owner_constructor_args(): - verify_asset_organisation_role_constructor_args(AssetOwner(*asset_owner_args)) diff --git a/test/cim/iec61968/assets/test_pole.py b/test/cim/iec61968/assets/test_pole.py index 86e7ad657..f32ef90ff 100644 --- a/test/cim/iec61968/assets/test_pole.py +++ b/test/cim/iec61968/assets/test_pole.py @@ -6,12 +6,10 @@ from cim.fill_fields import pole_kwargs from cim.iec61968.assets.test_structure import verify_structure_constructor_default, \ - verify_structure_constructor_kwargs, verify_structure_constructor_args, structure_args + verify_structure_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Pole, Streetlight, generate_id -pole_args = [*structure_args, "a", [Streetlight(mrid=generate_id())]] - def test_pole_constructor_default(): p = Pole(mrid=generate_id()) @@ -23,25 +21,17 @@ def test_pole_constructor_default(): @given(**pole_kwargs()) def test_pole_constructor_kwargs(classification, streetlights, **kwargs): - p = Pole(classification=classification, - streetlights=streetlights, - **kwargs) + p = Pole( + classification=classification, + streetlights=streetlights, + **kwargs, + ) verify_structure_constructor_kwargs(p, **kwargs) assert p.classification == classification assert list(p.streetlights) == streetlights -def test_pole_constructor_args(): - p = Pole(*pole_args) - - verify_structure_constructor_args(p) - assert pole_args[-2:] == [ - p.classification, - list(p.streetlights) - ] - - def test_streetlights_collection(): validate_unordered( Pole, @@ -51,5 +41,5 @@ def test_streetlights_collection(): Pole.get_streetlight, Pole.add_streetlight, Pole.remove_streetlight, - Pole.clear_streetlights + Pole.clear_streetlights, ) diff --git a/test/cim/iec61968/assets/test_streelight.py b/test/cim/iec61968/assets/test_streelight.py index dcf2af55d..65957420c 100644 --- a/test/cim/iec61968/assets/test_streelight.py +++ b/test/cim/iec61968/assets/test_streelight.py @@ -5,13 +5,10 @@ from hypothesis import given from cim.fill_fields import streetlight_kwargs -from cim.iec61968.assets.test_asset import verify_asset_constructor_default, \ - verify_asset_constructor_kwargs, verify_asset_constructor_args, asset_args -from zepben.ewb import Streetlight, Pole, generate_id +from cim.iec61968.assets.test_asset import verify_asset_constructor_default, verify_asset_constructor_kwargs +from zepben.ewb import Streetlight, generate_id from zepben.ewb.model.cim.iec61968.infiec61968.infassets.streetlight_lamp_kind import StreetlightLampKind -streetlight_args = [*asset_args, Pole(mrid=generate_id()), 1, StreetlightLampKind.HIGH_PRESSURE_SODIUM] - def test_streetlight_constructor_default(): p = Streetlight(mrid=generate_id()) @@ -24,23 +21,14 @@ def test_streetlight_constructor_default(): @given(**streetlight_kwargs()) def test_streetlight_constructor_kwargs(pole, light_rating, lamp_kind, **kwargs): - p = Streetlight(pole=pole, - light_rating=light_rating, - lamp_kind=lamp_kind, - **kwargs) + p = Streetlight( + pole=pole, + light_rating=light_rating, + lamp_kind=lamp_kind, + **kwargs, + ) verify_asset_constructor_kwargs(p, **kwargs) assert p.pole == pole assert p.light_rating == light_rating assert p.lamp_kind == lamp_kind - - -def test_streetlight_constructor_args(): - p = Streetlight(*streetlight_args) - - verify_asset_constructor_args(p) - assert streetlight_args[-3:] == [ - p.pole, - p.light_rating, - p.lamp_kind - ] diff --git a/test/cim/iec61968/assets/test_structure.py b/test/cim/iec61968/assets/test_structure.py index b0a87dd54..33840bade 100644 --- a/test/cim/iec61968/assets/test_structure.py +++ b/test/cim/iec61968/assets/test_structure.py @@ -3,12 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from cim.iec61968.assets.test_asset_container import verify_asset_container_constructor_default, \ - verify_asset_container_constructor_kwargs, verify_asset_container_constructor_args, asset_container_args +from cim.iec61968.assets.test_asset_container import verify_asset_container_constructor_default, verify_asset_container_constructor_kwargs from zepben.ewb import Structure -structure_args = asset_container_args - def verify_structure_constructor_default(wi: Structure): verify_asset_container_constructor_default(wi) @@ -16,7 +13,3 @@ def verify_structure_constructor_default(wi: Structure): def verify_structure_constructor_kwargs(wi: Structure, **kwargs): verify_asset_container_constructor_kwargs(wi, **kwargs) - - -def verify_structure_constructor_args(wi: Structure): - verify_asset_container_constructor_args(wi) diff --git a/test/cim/iec61968/common/test_agreement.py b/test/cim/iec61968/common/test_agreement.py index b7b8db022..ecba51eac 100644 --- a/test/cim/iec61968/common/test_agreement.py +++ b/test/cim/iec61968/common/test_agreement.py @@ -2,18 +2,10 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -import datetime - -from hypothesis.strategies import builds, datetimes, none from cim.iec61968.common.test_document import verify_document_constructor_default, \ - verify_document_constructor_kwargs, verify_document_constructor_args, document_args + verify_document_constructor_kwargs from zepben.ewb.model.cim.iec61968.common.agreement import Agreement -from zepben.ewb.model.cim.iec61970.base.domain.date_time_interval import DateTimeInterval - -MIN_MAX = datetime.datetime(2020, 1, 1) - -agreement_args = [*document_args, builds(DateTimeInterval, start=datetimes(max_value=MIN_MAX), end=none())] def verify_agreement_constructor_default(a: Agreement): @@ -23,10 +15,3 @@ def verify_agreement_constructor_default(a: Agreement): def verify_agreement_constructor_kwargs(a: Agreement, validity_interval, **kwargs): assert a.validity_interval == validity_interval verify_document_constructor_kwargs(a, **kwargs) - - -def verify_agreement_constructor_args(a: Agreement): - verify_document_constructor_args(a) - assert agreement_args[-1:] == [ - a.validity_interval - ] diff --git a/test/cim/iec61968/common/test_document.py b/test/cim/iec61968/common/test_document.py index 4fccf8c39..e81569558 100644 --- a/test/cim/iec61968/common/test_document.py +++ b/test/cim/iec61968/common/test_document.py @@ -2,14 +2,11 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from datetime import datetime from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import Document -document_args = [*identified_object_args, "a", datetime(2021, 1, 1), "b", "c", "d", "e"] - def verify_document_constructor_default(d: Document): verify_identified_object_constructor_default(d) @@ -30,15 +27,3 @@ def verify_document_constructor_kwargs(d: Document, title, created_date_time, au assert d.type == type assert d.status == status assert d.comment == comment - - -def verify_document_constructor_args(d: Document): - verify_identified_object_constructor_args(d) - assert document_args[-6:] == [ - d.title, - d.created_date_time, - d.author_name, - d.type, - d.status, - d.comment - ] diff --git a/test/cim/iec61968/common/test_electronic_address.py b/test/cim/iec61968/common/test_electronic_address.py index e223272c6..2bd0a32fe 100644 --- a/test/cim/iec61968/common/test_electronic_address.py +++ b/test/cim/iec61968/common/test_electronic_address.py @@ -7,8 +7,6 @@ from cim.fill_fields import electronic_address_kwargs from zepben.ewb import ElectronicAddress -electronic_address_args = ['email1', False, 'descript'] - def test_electronic_address_constructor_default(): e = ElectronicAddress() @@ -25,11 +23,3 @@ def test_electronic_address_constructor_kwargs(is_primary, description, email1): assert e.is_primary == is_primary assert e.description == description assert e.email1 == email1 - - -def test_electronic_address_constructor_args(): - e = ElectronicAddress(*electronic_address_args) - - assert e.email1 == electronic_address_args[-3] - assert e.is_primary == electronic_address_args[-2] - assert e.description == electronic_address_args[-1] diff --git a/test/cim/iec61968/common/test_location.py b/test/cim/iec61968/common/test_location.py index 5038d4acb..f9d4c3399 100644 --- a/test/cim/iec61968/common/test_location.py +++ b/test/cim/iec61968/common/test_location.py @@ -6,13 +6,10 @@ from cim.fill_fields import location_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_ordered_other from zepben.ewb import Location, generate_id from zepben.ewb.model.cim.iec61968.common.position_point import PositionPoint -from zepben.ewb.model.cim.iec61968.common.street_address import StreetAddress - -location_args = [*identified_object_args, StreetAddress(), [PositionPoint(1.1, 2.2)]] def test_location_constructor_default(): @@ -32,16 +29,6 @@ def test_location_constructor_kwargs(main_address, position_points, **kwargs): assert list(loc.points) == position_points -def test_location_constructor_args(): - loc = Location(*location_args) - - verify_identified_object_constructor_args(loc) - assert location_args[-2:] == [ - loc.main_address, - list(loc.points) - ] - - def test_points_collection(): validate_ordered_other( Location, @@ -54,5 +41,5 @@ def test_points_collection(): Location.insert_point, Location.remove_point, Location.remove_point_by_sequence_number, - Location.clear_points + Location.clear_points, ) diff --git a/test/cim/iec61968/common/test_organisation_role.py b/test/cim/iec61968/common/test_organisation_role.py index e51b119d6..23bb2b84c 100644 --- a/test/cim/iec61968/common/test_organisation_role.py +++ b/test/cim/iec61968/common/test_organisation_role.py @@ -4,10 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args -from zepben.ewb import OrganisationRole, Organisation, generate_id - -organisation_role_args = [*identified_object_args, Organisation(mrid=generate_id())] + verify_identified_object_constructor_kwargs +from zepben.ewb import OrganisationRole def verify_organisation_role_constructor_default(or_: OrganisationRole): @@ -18,10 +16,3 @@ def verify_organisation_role_constructor_default(or_: OrganisationRole): def verify_organisation_role_constructor_kwargs(or_: OrganisationRole, organisation, **kwargs): verify_identified_object_constructor_kwargs(or_, **kwargs) assert or_.organisation == organisation - - -def verify_organisation_role_constructor_args(or_: OrganisationRole): - verify_identified_object_constructor_args(or_) - assert organisation_role_args[-1:] == [ - or_.organisation - ] diff --git a/test/cim/iec61968/common/test_position_point.py b/test/cim/iec61968/common/test_position_point.py index 3495e0b98..2bba79685 100644 --- a/test/cim/iec61968/common/test_position_point.py +++ b/test/cim/iec61968/common/test_position_point.py @@ -8,8 +8,6 @@ from cim.fill_fields import position_point_kwargs from zepben.ewb.model.cim.iec61968.common.position_point import PositionPoint -position_point_args = [1.1, 2.2] - # noinspection PyArgumentList def test_position_point_constructor_default(): @@ -36,15 +34,6 @@ def test_position_point_constructor_kwargs(x_position, y_position, **kwargs): assert pp.y_position == y_position -def test_position_point_constructor_args(): - pp = PositionPoint(*position_point_args) - - assert position_point_args[-2:] == [ - pp.x_position, - pp.y_position - ] - - def test_position_point_constructor_validates(): with raises(ValueError, match="Longitude is out of range. Expected -180 to 180, got -181.0."): PositionPoint(-181.0, 0) diff --git a/test/cim/iec61968/common/test_street_address.py b/test/cim/iec61968/common/test_street_address.py index 424b93234..63292dd47 100644 --- a/test/cim/iec61968/common/test_street_address.py +++ b/test/cim/iec61968/common/test_street_address.py @@ -7,10 +7,6 @@ from cim.fill_fields import street_address_kwargs from zepben.ewb.model.cim.iec61968.common.street_address import StreetAddress -from zepben.ewb.model.cim.iec61968.common.street_detail import StreetDetail -from zepben.ewb.model.cim.iec61968.common.town_detail import TownDetail - -street_address_args = ["a", TownDetail(), "b", StreetDetail()] def test_street_address_constructor_default(): @@ -30,14 +26,3 @@ def test_street_address_constructor_kwargs(postal_code, town_detail, po_box, str assert sa.town_detail == town_detail assert sa.po_box == po_box assert sa.street_detail == street_detail - - -def test_street_address_constructor_args(): - sa = StreetAddress(*street_address_args) - - assert street_address_args[-4:] == [ - sa.postal_code, - sa.town_detail, - sa.po_box, - sa.street_detail - ] diff --git a/test/cim/iec61968/common/test_street_detail.py b/test/cim/iec61968/common/test_street_detail.py index ff754d112..f9b696066 100644 --- a/test/cim/iec61968/common/test_street_detail.py +++ b/test/cim/iec61968/common/test_street_detail.py @@ -8,8 +8,6 @@ from cim.fill_fields import street_detail_kwargs from zepben.ewb.model.cim.iec61968.common.street_detail import StreetDetail -street_detail_args = ["a", "b", "c", "d", "e", "f", "g"] - def test_street_detail_constructor_default(): sd = StreetDetail() @@ -48,20 +46,6 @@ def test_street_detail_constructor_kwargs(building_number, building_name, floor_ assert sd.building_number == building_number -def test_street_detail_constructor_args(): - sd = StreetDetail(*street_detail_args) - - assert street_detail_args[-7:] == [ - sd.building_name, - sd.floor_identification, - sd.name, - sd.number, - sd.suite_number, - sd.type, - sd.display_address - ] - - def test_all_fields_empty(): assert StreetDetail().all_fields_empty() diff --git a/test/cim/iec61968/common/test_telephone_number.py b/test/cim/iec61968/common/test_telephone_number.py index 785cdbe56..bdf70b079 100644 --- a/test/cim/iec61968/common/test_telephone_number.py +++ b/test/cim/iec61968/common/test_telephone_number.py @@ -7,10 +7,6 @@ from cim.fill_fields import telephone_number_kwargs from zepben.ewb import TelephoneNumber -telephone_number_args = ['area_code', 'city_code', 'country_code', 'dial_out', 'extension', - 'international_prefix', 'itu_phone', None, 'local_number', - 'is_primary', 'description'] - def test_telephone_number_constructor_default(): t = TelephoneNumber() @@ -38,7 +34,7 @@ def test_telephone_number_constructor_kwargs( international_prefix, local_number, is_primary, - description + description, ): t = TelephoneNumber( area_code=area_code, @@ -49,7 +45,7 @@ def test_telephone_number_constructor_kwargs( international_prefix=international_prefix, local_number=local_number, is_primary=is_primary, - description=description + description=description, ) assert t.area_code == area_code @@ -61,18 +57,3 @@ def test_telephone_number_constructor_kwargs( assert t.local_number == local_number assert t.is_primary == is_primary assert t.description == description - - -def test_telephone_number_constructor_args(): - t = TelephoneNumber(*telephone_number_args) - - assert t.area_code == telephone_number_args[-11] - assert t.city_code == telephone_number_args[-10] - assert t.country_code == telephone_number_args[-9] - assert t.dial_out == telephone_number_args[-8] - assert t.extension == telephone_number_args[-7] - assert t.international_prefix == telephone_number_args[-6] - assert t.itu_phone == telephone_number_args[-5] - assert t.local_number == telephone_number_args[-3] - assert t.is_primary == telephone_number_args[-2] - assert t.description == telephone_number_args[-1] diff --git a/test/cim/iec61968/common/test_town_detail.py b/test/cim/iec61968/common/test_town_detail.py index 37b7e06e0..fb4a89416 100644 --- a/test/cim/iec61968/common/test_town_detail.py +++ b/test/cim/iec61968/common/test_town_detail.py @@ -8,8 +8,6 @@ from cim.fill_fields import town_detail_kwargs from zepben.ewb.model.cim.iec61968.common.town_detail import TownDetail -town_detail_args = ["a", "b", "c"] - def test_town_detail_constructor_default(): td = TownDetail() @@ -30,16 +28,6 @@ def test_town_detail_constructor_kwargs(name, state_or_province, country, **kwar assert td.country == country -def test_town_detail_constructor_args(): - td = TownDetail(*town_detail_args) - - assert town_detail_args[-3:] == [ - td.name, - td.state_or_province, - td.country - ] - - def test_all_fields_empty(): assert TownDetail().all_fields_null_or_empty() assert TownDetail("", "").all_fields_null_or_empty() diff --git a/test/cim/iec61968/customers/test_customer.py b/test/cim/iec61968/customers/test_customer.py index 0b0651c5f..96b9888d4 100644 --- a/test/cim/iec61968/customers/test_customer.py +++ b/test/cim/iec61968/customers/test_customer.py @@ -7,13 +7,10 @@ from cim.fill_fields import customer_kwargs from cim.iec61968.common.test_organisation_role import verify_organisation_role_constructor_default, \ - verify_organisation_role_constructor_kwargs, \ - verify_organisation_role_constructor_args, organisation_role_args + verify_organisation_role_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Customer, CustomerKind, CustomerAgreement, generate_id -customer_args = [*organisation_role_args, CustomerKind.residential, "special", [CustomerAgreement(mrid=generate_id())]] - def test_customer_constructor_default(): c = Customer(mrid=generate_id()) @@ -30,7 +27,7 @@ def test_customer_constructor_kwargs(kind, special_need, customer_agreements, ** kind=kind, special_need=special_need, customer_agreements=customer_agreements, - **kwargs + **kwargs, ) verify_organisation_role_constructor_kwargs(c, **kwargs) @@ -39,17 +36,6 @@ def test_customer_constructor_kwargs(kind, special_need, customer_agreements, ** assert list(c.agreements) == customer_agreements -def test_customer_constructor_args(): - c = Customer(*customer_args) - - verify_organisation_role_constructor_args(c) - assert customer_args[-3:] == [ - c.kind, - c.special_need, - list(c.agreements) - ] - - def test_customer_agreements_collection(): validate_unordered( Customer, @@ -59,5 +45,5 @@ def test_customer_agreements_collection(): Customer.get_agreement, Customer.add_agreement, Customer.remove_agreement, - Customer.clear_agreements + Customer.clear_agreements, ) diff --git a/test/cim/iec61968/customers/test_customer_agreement.py b/test/cim/iec61968/customers/test_customer_agreement.py index c86ed1599..c35164093 100644 --- a/test/cim/iec61968/customers/test_customer_agreement.py +++ b/test/cim/iec61968/customers/test_customer_agreement.py @@ -6,12 +6,9 @@ from hypothesis import given from cim.fill_fields import customer_agreement_kwargs -from cim.iec61968.common.test_agreement import verify_agreement_constructor_default, verify_agreement_constructor_kwargs, \ - verify_agreement_constructor_args, agreement_args +from cim.iec61968.common.test_agreement import verify_agreement_constructor_default, verify_agreement_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import CustomerAgreement, Customer, PricingStructure, generate_id - -customer_agreement_args = [*agreement_args, Customer(mrid=generate_id()), [PricingStructure(mrid=generate_id())]] +from zepben.ewb import CustomerAgreement, PricingStructure, generate_id def test_customer_agreement_constructor_default(): @@ -27,7 +24,7 @@ def test_customer_agreement_constructor_kwargs(customer, pricing_structures, **k ca = CustomerAgreement( customer=customer, pricing_structures=pricing_structures, - **kwargs + **kwargs, ) verify_agreement_constructor_kwargs(ca, **kwargs) @@ -35,16 +32,6 @@ def test_customer_agreement_constructor_kwargs(customer, pricing_structures, **k assert list(ca.pricing_structures) == pricing_structures -def test_customer_agreement_constructor_args(): - ca = CustomerAgreement(*customer_agreement_args) - - verify_agreement_constructor_args(ca) - assert [ - ca.customer, - list(ca.pricing_structures) - ] == customer_agreement_args[-2:] - - def test_pricing_structures_collection(): validate_unordered( CustomerAgreement, @@ -54,5 +41,5 @@ def test_pricing_structures_collection(): CustomerAgreement.get_pricing_structure, CustomerAgreement.add_pricing_structure, CustomerAgreement.remove_pricing_structure, - CustomerAgreement.clear_pricing_structures + CustomerAgreement.clear_pricing_structures, ) diff --git a/test/cim/iec61968/customers/test_pricing_structure.py b/test/cim/iec61968/customers/test_pricing_structure.py index 002fc90eb..4d2d08592 100644 --- a/test/cim/iec61968/customers/test_pricing_structure.py +++ b/test/cim/iec61968/customers/test_pricing_structure.py @@ -6,13 +6,10 @@ from hypothesis import given from cim.fill_fields import pricing_structure_kwargs -from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs, \ - verify_document_constructor_args, document_args +from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import PricingStructure, Tariff, generate_id -pricing_structure_args = [*document_args, [Tariff(mrid=generate_id())], "asd"] - def test_pricing_structure_constructor_default(): ps = PricingStructure(mrid=generate_id()) @@ -27,7 +24,7 @@ def test_pricing_structure_constructor_kwargs(tariffs, code, **kwargs): ps = PricingStructure( tariffs=tariffs, code=code, - **kwargs + **kwargs, ) verify_document_constructor_kwargs(ps, **kwargs) @@ -35,16 +32,6 @@ def test_pricing_structure_constructor_kwargs(tariffs, code, **kwargs): assert ps.code == code -def test_pricing_structure_constructor_args(): - ps = PricingStructure(*pricing_structure_args) - - verify_document_constructor_args(ps) - assert pricing_structure_args[-2:] == [ - list(ps.tariffs), - ps.code - ] - - def test_tariffs_collection(): validate_unordered( PricingStructure, @@ -54,5 +41,5 @@ def test_tariffs_collection(): PricingStructure.get_tariff, PricingStructure.add_tariff, PricingStructure.remove_tariff, - PricingStructure.clear_tariffs + PricingStructure.clear_tariffs, ) diff --git a/test/cim/iec61968/customers/test_tariff.py b/test/cim/iec61968/customers/test_tariff.py index c6da20cd1..5113cdef4 100644 --- a/test/cim/iec61968/customers/test_tariff.py +++ b/test/cim/iec61968/customers/test_tariff.py @@ -6,12 +6,9 @@ from hypothesis import given from cim.fill_fields import tariff_kwargs -from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs, \ - verify_document_constructor_args, document_args +from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs from zepben.ewb import Tariff, generate_id -tariff_args = document_args - def test_tariff_constructor_default(): verify_document_constructor_default(Tariff(mrid=generate_id())) @@ -20,7 +17,3 @@ def test_tariff_constructor_default(): @given(**tariff_kwargs()) def test_tariff_constructor_kwargs(**kwargs): verify_document_constructor_kwargs(Tariff(**kwargs), **kwargs) - - -def test_tariff_constructor_args(): - verify_document_constructor_args(Tariff(*tariff_args)) diff --git a/test/cim/iec61968/infiec61968/infassetinfo/test_current_transformer_info.py b/test/cim/iec61968/infiec61968/infassetinfo/test_current_transformer_info.py index afed0a083..5c5925b45 100644 --- a/test/cim/iec61968/infiec61968/infassetinfo/test_current_transformer_info.py +++ b/test/cim/iec61968/infiec61968/infassetinfo/test_current_transformer_info.py @@ -7,11 +7,8 @@ from cim.fill_fields import current_transformer_info_kwargs from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, \ - verify_asset_info_constructor_kwargs, verify_asset_info_constructor_args, asset_info_args -from zepben.ewb import CurrentTransformerInfo, Ratio, generate_id - -# noinspection PyArgumentList -current_transformer_info_args = [*asset_info_args, "a", 1.1, 2, "b", 3, Ratio(4.4, 5.5), Ratio(6.6, 7.7), 8.8, 9, 10, 11.11, "c"] + verify_asset_info_constructor_kwargs +from zepben.ewb import CurrentTransformerInfo, generate_id def test_current_transformer_info_constructor_default(): @@ -33,8 +30,10 @@ def test_current_transformer_info_constructor_default(): @given(**current_transformer_info_kwargs()) -def test_current_transformer_info_constructor_kwargs(accuracy_class, accuracy_limit, core_count, ct_class, knee_point_voltage, max_ratio, nominal_ratio, - primary_ratio, rated_current, secondary_fls_rating, secondary_ratio, usage, **kwargs): +def test_current_transformer_info_constructor_kwargs( + accuracy_class, accuracy_limit, core_count, ct_class, knee_point_voltage, max_ratio, nominal_ratio, + primary_ratio, rated_current, secondary_fls_rating, secondary_ratio, usage, **kwargs, +): cti = CurrentTransformerInfo( accuracy_class=accuracy_class, accuracy_limit=accuracy_limit, @@ -48,7 +47,7 @@ def test_current_transformer_info_constructor_kwargs(accuracy_class, accuracy_li secondary_fls_rating=secondary_fls_rating, secondary_ratio=secondary_ratio, usage=usage, - **kwargs + **kwargs, ) verify_asset_info_constructor_kwargs(cti, **kwargs) @@ -64,23 +63,3 @@ def test_current_transformer_info_constructor_kwargs(accuracy_class, accuracy_li assert cti.secondary_fls_rating == secondary_fls_rating assert cti.secondary_ratio == secondary_ratio assert cti.usage == usage - - -def test_current_transformer_info_constructor_args(): - cti = CurrentTransformerInfo(*current_transformer_info_args) - - verify_asset_info_constructor_args(cti) - assert [ - cti.accuracy_class, - cti.accuracy_limit, - cti.core_count, - cti.ct_class, - cti.knee_point_voltage, - cti.max_ratio, - cti.nominal_ratio, - cti.primary_ratio, - cti.rated_current, - cti.secondary_fls_rating, - cti.secondary_ratio, - cti.usage - ] == current_transformer_info_args[-12:] diff --git a/test/cim/iec61968/infiec61968/infassetinfo/test_potential_transformer_info.py b/test/cim/iec61968/infiec61968/infassetinfo/test_potential_transformer_info.py index 2ad776f57..d41e3c37f 100644 --- a/test/cim/iec61968/infiec61968/infassetinfo/test_potential_transformer_info.py +++ b/test/cim/iec61968/infiec61968/infassetinfo/test_potential_transformer_info.py @@ -7,11 +7,8 @@ from cim.fill_fields import potential_transformer_info_kwargs from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, \ - verify_asset_info_constructor_kwargs, verify_asset_info_constructor_args, asset_info_args -from zepben.ewb import PotentialTransformerInfo, Ratio, generate_id - -# noinspection PyArgumentList -potential_transformer_info_args = [*asset_info_args, "a", Ratio(1.1, 2.2), 3.3, "b", 4, 5.5] + verify_asset_info_constructor_kwargs +from zepben.ewb import PotentialTransformerInfo, generate_id def test_potential_transformer_info_constructor_default(): @@ -35,7 +32,7 @@ def test_potential_transformer_info_constructor_kwargs(accuracy_class, nominal_r pt_class=pt_class, rated_voltage=rated_voltage, secondary_ratio=secondary_ratio, - **kwargs + **kwargs, ) verify_asset_info_constructor_kwargs(vti, **kwargs) @@ -45,17 +42,3 @@ def test_potential_transformer_info_constructor_kwargs(accuracy_class, nominal_r assert vti.pt_class == pt_class assert vti.rated_voltage == rated_voltage assert vti.secondary_ratio == secondary_ratio - - -def test_potential_transformer_info_constructor_args(): - vti = PotentialTransformerInfo(*potential_transformer_info_args) - - verify_asset_info_constructor_args(vti) - assert potential_transformer_info_args[-6:] == [ - vti.accuracy_class, - vti.nominal_ratio, - vti.primary_ratio, - vti.pt_class, - vti.rated_voltage, - vti.secondary_ratio - ] diff --git a/test/cim/iec61968/infiec61968/infassetinfo/test_relay_info.py b/test/cim/iec61968/infiec61968/infassetinfo/test_relay_info.py index eb4530f83..7337ca7f9 100644 --- a/test/cim/iec61968/infiec61968/infassetinfo/test_relay_info.py +++ b/test/cim/iec61968/infiec61968/infassetinfo/test_relay_info.py @@ -5,13 +5,10 @@ from hypothesis import given from cim.fill_fields import relay_info_kwargs -from cim.iec61968.assets.test_asset_info import asset_info_args, verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs, \ - verify_asset_info_constructor_args +from cim.iec61968.assets.test_asset_info import verify_asset_info_constructor_default, verify_asset_info_constructor_kwargs from cim.private_collection_validator import validate_ordered_other from zepben.ewb import RelayInfo, generate_id -relay_info_args = [*asset_info_args, "a", True, [0.1, 0.2, 0.3]] - def test_relay_info_constructor_default(): ri = RelayInfo(mrid=generate_id()) @@ -28,7 +25,7 @@ def test_relay_info_constructor_kwargs(curve_setting, reclose_fast, reclose_dela curve_setting=curve_setting, reclose_fast=reclose_fast, reclose_delays=reclose_delays, - **kwargs + **kwargs, ) verify_asset_info_constructor_kwargs(ri, **kwargs) @@ -37,15 +34,6 @@ def test_relay_info_constructor_kwargs(curve_setting, reclose_fast, reclose_dela assert list(ri.reclose_delays) == reclose_delays -def test_relay_info_constructor_args(): - ri = RelayInfo(*relay_info_args) - - verify_asset_info_constructor_args(ri) - assert ri.curve_setting == relay_info_args[-3] - assert ri.reclose_fast == relay_info_args[-2] - assert list(ri.reclose_delays) == relay_info_args[-1] - - def test_relay_info_reclose_delays(): validate_ordered_other( RelayInfo, @@ -58,5 +46,5 @@ def test_relay_info_reclose_delays(): RelayInfo.add_delay, RelayInfo.remove_delay, RelayInfo.remove_delay_at, - RelayInfo.clear_delays + RelayInfo.clear_delays, ) diff --git a/test/cim/iec61968/infiec61968/infcommon/test_ratio.py b/test/cim/iec61968/infiec61968/infcommon/test_ratio.py index 480bfbb2e..962e621e3 100644 --- a/test/cim/iec61968/infiec61968/infcommon/test_ratio.py +++ b/test/cim/iec61968/infiec61968/infcommon/test_ratio.py @@ -9,8 +9,6 @@ from cim.fill_fields import ratio_kwargs from zepben.ewb import Ratio -ratio_args = [9.0, 6.0] - # noinspection PyArgumentList def test_ratio_constructor_default(): @@ -37,16 +35,6 @@ def test_ratio_constructor_kwargs(denominator, numerator, **kwargs): assert ratio.numerator == numerator -def test_ratio_constructor_args(): - ratio = Ratio(*ratio_args) - - # non-alphabetic order is due to mathematical convention (numerator before denominator) - assert ratio_args[-2:] == [ - ratio.numerator, - ratio.denominator - ] - - def test_quotient_nonzero_denominator(): ratio = Ratio(9.0, 6.0) diff --git a/test/cim/iec61968/metering/test_end_device.py b/test/cim/iec61968/metering/test_end_device.py index 627418b29..ba39c4375 100644 --- a/test/cim/iec61968/metering/test_end_device.py +++ b/test/cim/iec61968/metering/test_end_device.py @@ -4,16 +4,13 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61968.assets.test_asset_container import verify_asset_container_constructor_default, \ - verify_asset_container_constructor_kwargs, verify_asset_container_constructor_args, asset_container_args + verify_asset_container_constructor_kwargs from cim.private_collection_validator import validate_unordered from util import assert_or_empty -from zepben.ewb import Location, generate_id from zepben.ewb.model.cim.iec61968.metering.end_device import EndDevice from zepben.ewb.model.cim.iec61968.metering.end_device_function import EndDeviceFunction from zepben.ewb.model.cim.iec61968.metering.usage_point import UsagePoint -end_device_args = [*asset_container_args, "a", Location(mrid=generate_id()), [UsagePoint(mrid=generate_id())]] - def verify_end_device_constructor_default(ed: EndDevice): verify_asset_container_constructor_default(ed) @@ -30,15 +27,6 @@ def verify_end_device_constructor_kwargs(ed: EndDevice, customer_mrid, service_l assert_or_empty(ed.functions, functions) -def verify_end_device_constructor_args(ed: EndDevice): - verify_asset_container_constructor_args(ed) - assert end_device_args[-3:] == [ - ed.customer_mrid, - ed.service_location, - list(ed.usage_points) - ] - - def test_usage_points_collection(): validate_unordered( EndDevice, @@ -48,7 +36,7 @@ def test_usage_points_collection(): EndDevice.get_usage_point, EndDevice.add_usage_point, EndDevice.remove_usage_point, - EndDevice.clear_usage_points + EndDevice.clear_usage_points, ) @@ -61,5 +49,5 @@ def test_end_device_function_collection(): EndDevice.get_function, EndDevice.add_function, EndDevice.remove_function, - EndDevice.clear_functions + EndDevice.clear_functions, ) diff --git a/test/cim/iec61968/metering/test_end_device_function.py b/test/cim/iec61968/metering/test_end_device_function.py index 2cf7c05ce..cdc5a4202 100644 --- a/test/cim/iec61968/metering/test_end_device_function.py +++ b/test/cim/iec61968/metering/test_end_device_function.py @@ -3,12 +3,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from test.cim.iec61968.assets.test_asset_function import asset_function_args, verify_asset_function_constructor_default, \ - verify_asset_function_constructor_kwargs, verify_asset_function_constructor_args +from test.cim.iec61968.assets.test_asset_function import verify_asset_function_constructor_default, \ + verify_asset_function_constructor_kwargs from zepben.ewb.model.cim.iec61968.metering.end_device_function import EndDeviceFunction -end_device_function_args = [*asset_function_args, False] - def verify_end_device_function_constructor_default(edf: EndDeviceFunction): verify_asset_function_constructor_default(edf) @@ -18,10 +16,3 @@ def verify_end_device_function_constructor_default(edf: EndDeviceFunction): def verify_end_device_function_constructor_kwargs(edf: EndDeviceFunction, enabled, **kwargs): verify_asset_function_constructor_kwargs(edf, **kwargs) assert edf.enabled == enabled - - -def verify_end_device_function_constructor_args(edf: EndDeviceFunction): - verify_asset_function_constructor_args(edf) - assert end_device_function_args[-1:] == [ - edf.enabled - ] diff --git a/test/cim/iec61968/metering/test_meter.py b/test/cim/iec61968/metering/test_meter.py index 608502769..66b107c92 100644 --- a/test/cim/iec61968/metering/test_meter.py +++ b/test/cim/iec61968/metering/test_meter.py @@ -6,13 +6,10 @@ from hypothesis import given from cim.fill_fields import meter_kwargs -from cim.iec61968.metering.test_end_device import verify_end_device_constructor_default, verify_end_device_constructor_kwargs, \ - verify_end_device_constructor_args, end_device_args +from cim.iec61968.metering.test_end_device import verify_end_device_constructor_default, verify_end_device_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61968.metering.meter import Meter -meter_args = end_device_args - def test_meter_constructor_default(): meter = Meter(mrid=generate_id()) @@ -24,7 +21,3 @@ def test_meter_constructor_default(): @given(**meter_kwargs()) def test_meter_constructor_kwargs(**kwargs): verify_end_device_constructor_kwargs(Meter(**kwargs), **kwargs) - - -def test_meter_constructor_args(): - verify_end_device_constructor_args(Meter(*meter_args)) diff --git a/test/cim/iec61968/metering/test_usage_point.py b/test/cim/iec61968/metering/test_usage_point.py index f4f020f7c..a3083f758 100644 --- a/test/cim/iec61968/metering/test_usage_point.py +++ b/test/cim/iec61968/metering/test_usage_point.py @@ -7,17 +7,14 @@ from cim.fill_fields import usage_point_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered, validate_unordered_other from util import assert_or_empty -from zepben.ewb import Location, Equipment, PhaseCode, generate_id +from zepben.ewb import Equipment, generate_id from zepben.ewb.model.cim.extensions.iec61968.common.contact_details import ContactDetails from zepben.ewb.model.cim.iec61968.metering.end_device import EndDevice from zepben.ewb.model.cim.iec61968.metering.usage_point import UsagePoint -usage_point_args = [*identified_object_args, Location(mrid=generate_id()), True, "1", 1, 2, PhaseCode.XYN, [Equipment(mrid=generate_id())], - [EndDevice(mrid=generate_id())]] - def test_usage_point_constructor_default(): up = UsagePoint(mrid=generate_id()) @@ -43,18 +40,20 @@ def test_usage_point_constructor_kwargs( equipment, end_devices, contacts, - **kwargs + **kwargs, ): - up = UsagePoint(usage_point_location=usage_point_location, - is_virtual=is_virtual, - connection_category=connection_category, - rated_power=rated_power, - approved_inverter_capacity=approved_inverter_capacity, - phase_code=phase_code, - equipment=equipment, - end_devices=end_devices, - contacts=contacts, - **kwargs) + up = UsagePoint( + usage_point_location=usage_point_location, + is_virtual=is_virtual, + connection_category=connection_category, + rated_power=rated_power, + approved_inverter_capacity=approved_inverter_capacity, + phase_code=phase_code, + equipment=equipment, + end_devices=end_devices, + contacts=contacts, + **kwargs, + ) verify_identified_object_constructor_kwargs(up, **kwargs) assert up.usage_point_location == usage_point_location @@ -68,23 +67,6 @@ def test_usage_point_constructor_kwargs( assert_or_empty(up.contacts, contacts) -def test_usage_point_constructor_args(): - up = UsagePoint(*usage_point_args) - - verify_identified_object_constructor_args(up) - - assert usage_point_args[-8:] == [ - up.usage_point_location, - up.is_virtual, - up.connection_category, - up.rated_power, - up.approved_inverter_capacity, - up.phase_code, - list(up.equipment), - list(up.end_devices) - ] - - def test_equipment_collection(): validate_unordered( UsagePoint, @@ -94,7 +76,7 @@ def test_equipment_collection(): UsagePoint.get_equipment, UsagePoint.add_equipment, UsagePoint.remove_equipment, - UsagePoint.clear_equipment + UsagePoint.clear_equipment, ) @@ -107,7 +89,7 @@ def test_end_devices_collection(): UsagePoint.get_end_device, UsagePoint.add_end_device, UsagePoint.remove_end_device, - UsagePoint.clear_end_devices + UsagePoint.clear_end_devices, ) diff --git a/test/cim/iec61968/operations/test_operational_restriction.py b/test/cim/iec61968/operations/test_operational_restriction.py index 8528ae772..fa0c79b62 100644 --- a/test/cim/iec61968/operations/test_operational_restriction.py +++ b/test/cim/iec61968/operations/test_operational_restriction.py @@ -6,13 +6,10 @@ from hypothesis import given from cim.fill_fields import operational_restriction_kwargs -from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs, \ - verify_document_constructor_args, document_args +from cim.iec61968.common.test_document import verify_document_constructor_default, verify_document_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import OperationalRestriction, Equipment, generate_id -operational_restriction_args = [*document_args, [Equipment(mrid=generate_id())]] - def test_operational_restriction_constructor_default(): or_ = OperationalRestriction(mrid=generate_id()) @@ -25,22 +22,13 @@ def test_operational_restriction_constructor_default(): def test_operational_restriction_constructor_kwargs(equipment, **kwargs): or_ = OperationalRestriction( equipment=equipment, - **kwargs + **kwargs, ) verify_document_constructor_kwargs(or_, **kwargs) assert list(or_.equipment) == equipment -def test_operational_restriction_constructor_args(): - or_ = OperationalRestriction(*operational_restriction_args) - - verify_document_constructor_args(or_) - assert operational_restriction_args[-1:] == [ - list(or_.equipment) - ] - - def test_equipment_collection(): validate_unordered( OperationalRestriction, @@ -50,5 +38,5 @@ def test_equipment_collection(): OperationalRestriction.get_equipment, OperationalRestriction.add_equipment, OperationalRestriction.remove_equipment, - OperationalRestriction.clear_equipment + OperationalRestriction.clear_equipment, ) diff --git a/test/cim/iec61970/base/auxiliaryequipment/test_auxiliary_equipment.py b/test/cim/iec61970/base/auxiliaryequipment/test_auxiliary_equipment.py index fd94f207d..e96b5adfb 100644 --- a/test/cim/iec61970/base/auxiliaryequipment/test_auxiliary_equipment.py +++ b/test/cim/iec61970/base/auxiliaryequipment/test_auxiliary_equipment.py @@ -4,10 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_equipment import verify_equipment_constructor_default, \ - verify_equipment_constructor_kwargs, verify_equipment_constructor_args, equipment_args -from zepben.ewb import AuxiliaryEquipment, Terminal, generate_id - -auxiliary_equipment_args = [*equipment_args, Terminal(mrid=generate_id())] + verify_equipment_constructor_kwargs +from zepben.ewb import AuxiliaryEquipment def verify_auxiliary_equipment_constructor_default(ae: AuxiliaryEquipment): @@ -18,10 +16,3 @@ def verify_auxiliary_equipment_constructor_default(ae: AuxiliaryEquipment): def verify_auxiliary_equipment_constructor_kwargs(ae: AuxiliaryEquipment, terminal, **kwargs): verify_equipment_constructor_kwargs(ae, **kwargs) assert ae.terminal == terminal - - -def verify_auxiliary_equipment_constructor_args(ae: AuxiliaryEquipment): - verify_equipment_constructor_args(ae) - assert auxiliary_equipment_args[-1:] == [ - ae.terminal - ] diff --git a/test/cim/iec61970/base/auxiliaryequipment/test_current_transformer.py b/test/cim/iec61970/base/auxiliaryequipment/test_current_transformer.py index cbdddc5a3..ab7b5d792 100644 --- a/test/cim/iec61970/base/auxiliaryequipment/test_current_transformer.py +++ b/test/cim/iec61970/base/auxiliaryequipment/test_current_transformer.py @@ -7,11 +7,9 @@ from cim.fill_fields import current_transformer_kwargs from cim.iec61970.base.auxiliaryequipment.test_sensor import verify_sensor_constructor_default, \ - verify_sensor_constructor_kwargs, verify_sensor_constructor_args, sensor_args + verify_sensor_constructor_kwargs from zepben.ewb import CurrentTransformer, generate_id -current_transformer_args = [*sensor_args, 1] - def test_current_transformer_constructor_default(): ct = CurrentTransformer(mrid=generate_id()) @@ -26,12 +24,3 @@ def test_current_transformer_constructor_kwargs(core_burden, **kwargs): verify_sensor_constructor_kwargs(ct, **kwargs) assert ct.core_burden == core_burden - - -def test_current_transformer_constructor_args(): - ct = CurrentTransformer(*current_transformer_args) - - verify_sensor_constructor_args(ct) - assert current_transformer_args[-1:] == [ - ct.core_burden - ] diff --git a/test/cim/iec61970/base/auxiliaryequipment/test_fault_indicator.py b/test/cim/iec61970/base/auxiliaryequipment/test_fault_indicator.py index 750cb3ad3..f0223e4cc 100644 --- a/test/cim/iec61970/base/auxiliaryequipment/test_fault_indicator.py +++ b/test/cim/iec61970/base/auxiliaryequipment/test_fault_indicator.py @@ -6,12 +6,10 @@ from cim.fill_fields import fault_indicator_kwargs from cim.iec61970.base.auxiliaryequipment.test_auxiliary_equipment import verify_auxiliary_equipment_constructor_default, \ - verify_auxiliary_equipment_constructor_kwargs, verify_auxiliary_equipment_constructor_args, auxiliary_equipment_args + verify_auxiliary_equipment_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.auxiliaryequipment.fault_indicator import FaultIndicator -fault_indicator_args = auxiliary_equipment_args - def test_fault_indicator_constructor_default(): verify_auxiliary_equipment_constructor_default(FaultIndicator(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_fault_indicator_constructor_default(): @given(**fault_indicator_kwargs()) def test_fault_indicator_constructor_kwargs(**kwargs): verify_auxiliary_equipment_constructor_kwargs(FaultIndicator(**kwargs), **kwargs) - - -def test_fault_indicator_constructor_args(): - verify_auxiliary_equipment_constructor_args(FaultIndicator(*fault_indicator_args)) diff --git a/test/cim/iec61970/base/auxiliaryequipment/test_potential_transformer.py b/test/cim/iec61970/base/auxiliaryequipment/test_potential_transformer.py index ec18ee087..0321005c5 100644 --- a/test/cim/iec61970/base/auxiliaryequipment/test_potential_transformer.py +++ b/test/cim/iec61970/base/auxiliaryequipment/test_potential_transformer.py @@ -7,11 +7,9 @@ from cim.fill_fields import potential_transformer_kwargs from cim.iec61970.base.auxiliaryequipment.test_sensor import verify_sensor_constructor_default, \ - verify_sensor_constructor_kwargs, verify_sensor_constructor_args, sensor_args + verify_sensor_constructor_kwargs from zepben.ewb import PotentialTransformer, PotentialTransformerKind, generate_id -potential_transformer_args = [*sensor_args, PotentialTransformerKind.capacitiveCoupling] - def test_potential_transformer_constructor_default(): vt = PotentialTransformer(mrid=generate_id()) @@ -27,12 +25,3 @@ def test_potential_transformer_constructor_kwargs(type, **kwargs): verify_sensor_constructor_kwargs(vt, **kwargs) assert vt.type == type - - -def test_potential_transformer_constructor_args(): - vt = PotentialTransformer(*potential_transformer_args) - - verify_sensor_constructor_args(vt) - assert potential_transformer_args[-1:] == [ - vt.type - ] diff --git a/test/cim/iec61970/base/auxiliaryequipment/test_sensor.py b/test/cim/iec61970/base/auxiliaryequipment/test_sensor.py index ba8f6dc3f..dc48ac801 100644 --- a/test/cim/iec61970/base/auxiliaryequipment/test_sensor.py +++ b/test/cim/iec61970/base/auxiliaryequipment/test_sensor.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.auxiliaryequipment.test_auxiliary_equipment import verify_auxiliary_equipment_constructor_default, \ - verify_auxiliary_equipment_constructor_kwargs, verify_auxiliary_equipment_constructor_args, auxiliary_equipment_args + verify_auxiliary_equipment_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import Sensor, ProtectionRelayFunction, generate_id - -sensor_args = [*auxiliary_equipment_args, [ProtectionRelayFunction(mrid=generate_id())]] +from zepben.ewb import Sensor, ProtectionRelayFunction def verify_sensor_constructor_default(sn: Sensor): @@ -22,13 +20,6 @@ def verify_sensor_constructor_kwargs(sn: Sensor, relay_functions, **kwargs): assert list(sn.relay_functions) == relay_functions -def verify_sensor_constructor_args(sn: Sensor): - verify_auxiliary_equipment_constructor_args(sn) - assert sensor_args[-1:] == [ - list(sn.relay_functions) - ] - - def test_relay_functions_collection(): validate_unordered( Sensor, @@ -38,5 +29,5 @@ def test_relay_functions_collection(): Sensor.get_relay_function, Sensor.add_relay_function, Sensor.remove_relay_function, - Sensor.clear_relay_function + Sensor.clear_relay_function, ) diff --git a/test/cim/iec61970/base/core/test_ac_dc_terminal.py b/test/cim/iec61970/base/core/test_ac_dc_terminal.py index d32aea3fe..0bab92b6a 100644 --- a/test/cim/iec61970/base/core/test_ac_dc_terminal.py +++ b/test/cim/iec61970/base/core/test_ac_dc_terminal.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.core.ac_dc_terminal import AcDcTerminal -ac_dc_terminal_args = identified_object_args - def verify_ac_dc_terminal_constructor_default(adt: AcDcTerminal): verify_identified_object_constructor_default(adt) @@ -16,7 +14,3 @@ def verify_ac_dc_terminal_constructor_default(adt: AcDcTerminal): def verify_ac_dc_terminal_constructor_kwargs(adt: AcDcTerminal, **kwargs): verify_identified_object_constructor_kwargs(adt, **kwargs) - - -def verify_ac_dc_terminal_constructor_args(adt: AcDcTerminal): - verify_identified_object_constructor_args(adt) diff --git a/test/cim/iec61970/base/core/test_base_voltage.py b/test/cim/iec61970/base/core/test_base_voltage.py index 4fe6c6679..495a283a2 100644 --- a/test/cim/iec61970/base/core/test_base_voltage.py +++ b/test/cim/iec61970/base/core/test_base_voltage.py @@ -6,11 +6,9 @@ from cim.fill_fields import base_voltage_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import BaseVoltage, generate_id -base_voltage_args = [*identified_object_args, 1] - def test_base_voltage_constructor_default(): bv = BaseVoltage(mrid=generate_id()) @@ -25,12 +23,3 @@ def test_base_voltage_constructor_kwargs(nominal_voltage, **kwargs): verify_identified_object_constructor_kwargs(bv, **kwargs) assert bv.nominal_voltage == nominal_voltage - - -def test_base_voltage_constructor_args(): - bv = BaseVoltage(*base_voltage_args) - - verify_identified_object_constructor_args(bv) - assert base_voltage_args[-1:] == [ - bv.nominal_voltage - ] diff --git a/test/cim/iec61970/base/core/test_conducting_equipment.py b/test/cim/iec61970/base/core/test_conducting_equipment.py index 3cb9540a3..561fd0ec4 100644 --- a/test/cim/iec61970/base/core/test_conducting_equipment.py +++ b/test/cim/iec61970/base/core/test_conducting_equipment.py @@ -7,11 +7,9 @@ import pytest from cim.iec61970.base.core.test_equipment import verify_equipment_constructor_default, \ - verify_equipment_constructor_kwargs, verify_equipment_constructor_args, equipment_args + verify_equipment_constructor_kwargs from cim.private_collection_validator import validate_ordered -from zepben.ewb import ConductingEquipment, BaseVoltage, Terminal, generate_id - -conducting_equipment_args = [*equipment_args, BaseVoltage(mrid=generate_id()), [Terminal(mrid=generate_id()), Terminal(mrid=generate_id())]] +from zepben.ewb import ConductingEquipment, Terminal, generate_id def verify_conducting_equipment_constructor_default(ce: ConductingEquipment): @@ -26,14 +24,6 @@ def verify_conducting_equipment_constructor_kwargs(ce: ConductingEquipment, base assert list(ce.terminals) == terminals -def verify_conducting_equipment_constructor_args(ce: ConductingEquipment): - verify_equipment_constructor_args(ce) - assert conducting_equipment_args[-2:] == [ - ce.base_voltage, - list(ce.terminals) - ] - - def test_terminals_collection(): validate_ordered( ConductingEquipment, @@ -45,7 +35,7 @@ def test_terminals_collection(): ConductingEquipment.add_terminal, ConductingEquipment.remove_terminal, ConductingEquipment.clear_terminals, - lambda t: t.sequence_number + lambda t: t.sequence_number, ) diff --git a/test/cim/iec61970/base/core/test_connectivity_node.py b/test/cim/iec61970/base/core/test_connectivity_node.py index 0fc90ef38..fa29f8490 100644 --- a/test/cim/iec61970/base/core/test_connectivity_node.py +++ b/test/cim/iec61970/base/core/test_connectivity_node.py @@ -6,12 +6,10 @@ from cim.fill_fields import connectivity_node_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import ConnectivityNode, Terminal, generate_id -connectivity_node_args = [*identified_object_args, [Terminal(mrid=generate_id())]] - def test_connectivity_node_constructor_default(): cn = ConnectivityNode(mrid=generate_id()) @@ -28,15 +26,6 @@ def test_connectivity_node_constructor_kwargs(terminals, **kwargs): assert list(cn.terminals) == terminals -def test_connectivity_node_constructor_args(): - cn = ConnectivityNode(*connectivity_node_args) - - verify_identified_object_constructor_args(cn) - assert connectivity_node_args[-1:] == [ - list(cn.terminals) - ] - - def test_terminals_collection(): validate_unordered( ConnectivityNode, @@ -46,5 +35,5 @@ def test_terminals_collection(): ConnectivityNode.get_terminal, ConnectivityNode.add_terminal, ConnectivityNode.remove_terminal, - ConnectivityNode.clear_terminals + ConnectivityNode.clear_terminals, ) diff --git a/test/cim/iec61970/base/core/test_connectivity_node_container.py b/test/cim/iec61970/base/core/test_connectivity_node_container.py index eba6709e3..ff58c0840 100644 --- a/test/cim/iec61970/base/core/test_connectivity_node_container.py +++ b/test/cim/iec61970/base/core/test_connectivity_node_container.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, \ - verify_power_system_resource_constructor_kwargs, verify_power_system_resource_constructor_args, power_system_resource_args + verify_power_system_resource_constructor_kwargs from zepben.ewb import ConnectivityNodeContainer -connectivity_node_container_args = power_system_resource_args - def verify_connectivity_node_container_constructor_default(cnc: ConnectivityNodeContainer): verify_power_system_resource_constructor_default(cnc) @@ -16,7 +14,3 @@ def verify_connectivity_node_container_constructor_default(cnc: ConnectivityNode def verify_connectivity_node_container_constructor_kwargs(cnc: ConnectivityNodeContainer, **kwargs): verify_power_system_resource_constructor_kwargs(cnc, **kwargs) - - -def verify_connectivity_node_container_constructor_args(cnc: ConnectivityNodeContainer): - verify_power_system_resource_constructor_args(cnc) diff --git a/test/cim/iec61970/base/core/test_curve.py b/test/cim/iec61970/base/core/test_curve.py index a204458ff..fecab99c0 100644 --- a/test/cim/iec61970/base/core/test_curve.py +++ b/test/cim/iec61970/base/core/test_curve.py @@ -6,13 +6,11 @@ from pytest import raises -from cim.iec61970.base.core.test_identified_object import identified_object_args, verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args +from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered_other from zepben.ewb import Curve, CurveData, generate_id -curve_args = identified_object_args - def verify_curve_constructor_default(curve: Curve): verify_identified_object_constructor_default(curve) @@ -22,10 +20,6 @@ def verify_curve_constructor_kwargs(curve: Curve, **kwargs): verify_identified_object_constructor_kwargs(curve, **kwargs) -def verify_curve_constructor_args(curve: Curve): - verify_identified_object_constructor_args(curve) - - def test_curve_data_collection(): validate_unordered_other( Curve, @@ -36,7 +30,7 @@ def test_curve_data_collection(): Curve.add_curve_data, Curve.remove_data, Curve.clear_data, - lambda rs: rs.x_value + lambda rs: rs.x_value, ) diff --git a/test/cim/iec61970/base/core/test_curve_data.py b/test/cim/iec61970/base/core/test_curve_data.py index 2ee2fdd19..a711ef418 100644 --- a/test/cim/iec61970/base/core/test_curve_data.py +++ b/test/cim/iec61970/base/core/test_curve_data.py @@ -8,8 +8,6 @@ from cim.fill_fields import curve_data_kwargs from zepben.ewb import CurveData -curve_data_args = [1.1, 2.2, 3.3, 4.4] - # noinspection PyArgumentList def test_curve_data_constructor_default(): @@ -42,14 +40,3 @@ def test_curve_data_constructor_kwargs(x_value, y1_value, y2_value, y3_value, ** assert curve_data.y1_value == y1_value assert curve_data.y2_value == y2_value assert curve_data.y3_value == y3_value - - -def test_curve_data_constructor_args(): - curve_data = CurveData(*curve_data_args) - - assert curve_data_args[-4:] == [ - curve_data.x_value, - curve_data.y1_value, - curve_data.y2_value, - curve_data.y3_value - ] diff --git a/test/cim/iec61970/base/core/test_equipment.py b/test/cim/iec61970/base/core/test_equipment.py index 4a82c9163..077e26b61 100644 --- a/test/cim/iec61970/base/core/test_equipment.py +++ b/test/cim/iec61970/base/core/test_equipment.py @@ -2,26 +2,14 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -import datetime from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, \ - verify_power_system_resource_constructor_kwargs, verify_power_system_resource_constructor_args, power_system_resource_args + verify_power_system_resource_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Equipment, OperationalRestriction, EquipmentContainer, generate_id, Site, LvFeeder, Substation, LvSubstation from zepben.ewb.model.cim.iec61968.metering.usage_point import UsagePoint from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder -equipment_args = [ - *power_system_resource_args, - False, - False, - datetime.datetime(2023, 1, 2), - [UsagePoint(mrid=generate_id()), UsagePoint(mrid=generate_id())], - [EquipmentContainer(mrid=generate_id()), EquipmentContainer(mrid=generate_id())], - [OperationalRestriction(mrid=generate_id()), OperationalRestriction(mrid=generate_id())], - [Feeder(mrid=generate_id()), Feeder(mrid=generate_id())] -] - def verify_equipment_constructor_default(eq: Equipment): verify_power_system_resource_constructor_default(eq) @@ -34,9 +22,11 @@ def verify_equipment_constructor_default(eq: Equipment): assert not list(eq.current_containers) -def verify_equipment_constructor_kwargs(eq: Equipment, in_service, normally_in_service, commissioned_date, usage_points, equipment_containers, - operational_restrictions, - current_containers, **kwargs): +def verify_equipment_constructor_kwargs( + eq: Equipment, in_service, normally_in_service, commissioned_date, usage_points, equipment_containers, + operational_restrictions, + current_containers, **kwargs, +): verify_power_system_resource_constructor_kwargs(eq, **kwargs) assert eq.in_service == in_service assert eq.normally_in_service == normally_in_service @@ -47,19 +37,6 @@ def verify_equipment_constructor_kwargs(eq: Equipment, in_service, normally_in_s assert list(eq.current_containers) == current_containers -def verify_equipment_constructor_args(eq: Equipment): - verify_power_system_resource_constructor_args(eq) - assert equipment_args[-7:] == [ - eq.in_service, - eq.normally_in_service, - eq.commissioned_date, - list(eq.usage_points), - list(eq.containers), - list(eq.operational_restrictions), - list(eq.current_containers) - ] - - def test_usage_points_collection(): validate_unordered( Equipment, @@ -69,7 +46,7 @@ def test_usage_points_collection(): Equipment.get_usage_point, Equipment.add_usage_point, Equipment.remove_usage_point, - Equipment.clear_usage_points + Equipment.clear_usage_points, ) @@ -82,7 +59,7 @@ def test_equipment_containers_collection(): Equipment.get_container, Equipment.add_container, Equipment.remove_container, - Equipment.clear_containers + Equipment.clear_containers, ) @@ -95,7 +72,7 @@ def test_operational_restrictions_collection(): Equipment.get_operational_restriction, Equipment.add_operational_restriction, Equipment.remove_operational_restriction, - Equipment.clear_operational_restrictions + Equipment.clear_operational_restrictions, ) @@ -108,7 +85,7 @@ def test_current_containers_collection(): Equipment.get_current_container, Equipment.add_current_container, Equipment.remove_current_container, - Equipment.clear_current_containers + Equipment.clear_current_containers, ) diff --git a/test/cim/iec61970/base/core/test_equipment_container.py b/test/cim/iec61970/base/core/test_equipment_container.py index 8cf80f88f..77c98ffc4 100644 --- a/test/cim/iec61970/base/core/test_equipment_container.py +++ b/test/cim/iec61970/base/core/test_equipment_container.py @@ -7,14 +7,11 @@ import pytest from cim.iec61970.base.core.test_connectivity_node_container import \ - verify_connectivity_node_container_constructor_default, verify_connectivity_node_container_constructor_kwargs, \ - verify_connectivity_node_container_constructor_args, connectivity_node_container_args + verify_connectivity_node_container_constructor_default, verify_connectivity_node_container_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import EquipmentContainer, Equipment, LvFeeder, Substation, generate_id, TestNetworkBuilder, NetworkStateOperators from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder -equipment_container_args = [*connectivity_node_container_args, {"e": Equipment(mrid=generate_id())}] - def verify_equipment_container_constructor_default(ec: EquipmentContainer): verify_connectivity_node_container_constructor_default(ec) @@ -26,13 +23,6 @@ def verify_equipment_container_constructor_kwargs(ec: EquipmentContainer, equipm assert list(ec.equipment) == equipment -def verify_equipment_container_constructor_args(ec: EquipmentContainer): - verify_connectivity_node_container_constructor_args(ec) - - # We use a different style of matching here as the passed in arg for equipment is a map and the stored collection is a list. - assert list(ec.equipment) == list(equipment_container_args[-1].values()) - - def test_equipment_collection(): validate_unordered( EquipmentContainer, @@ -42,7 +32,7 @@ def test_equipment_collection(): EquipmentContainer.get_equipment, EquipmentContainer.add_equipment, EquipmentContainer.remove_equipment, - EquipmentContainer.clear_equipment + EquipmentContainer.clear_equipment, ) diff --git a/test/cim/iec61970/base/core/test_feeder.py b/test/cim/iec61970/base/core/test_feeder.py index b682cbe39..e25357efa 100644 --- a/test/cim/iec61970/base/core/test_feeder.py +++ b/test/cim/iec61970/base/core/test_feeder.py @@ -7,21 +7,12 @@ from cim.fill_fields import feeder_kwargs from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, \ - verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args + verify_equipment_container_constructor_kwargs from cim.private_collection_validator import validate_unordered from util import assert_or_empty -from zepben.ewb import Terminal, Substation, Equipment, LvFeeder, Switch, generate_id, LvSubstation +from zepben.ewb import Terminal, Equipment, LvFeeder, Switch, generate_id, LvSubstation from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder -feeder_args = [ - *equipment_container_args, - Terminal(mrid=generate_id()), - Substation(mrid=generate_id()), - {"lvf": LvFeeder(mrid=generate_id())}, - {"ce": Equipment(mrid=generate_id())}, - {"celvf": Equipment(mrid=generate_id())} -] - def test_feeder_constructor_default(): f = Feeder(mrid=generate_id()) @@ -43,16 +34,18 @@ def test_feeder_constructor_kwargs( current_energized_lv_feeders, normal_energized_lv_substations, current_energized_lv_substations, - **kwargs + **kwargs, ): - f = Feeder(normal_head_terminal=normal_head_terminal, - normal_energizing_substation=normal_energizing_substation, - normal_energized_lv_feeders=normal_energized_lv_feeders, - current_equipment=current_equipment, - current_energized_lv_feeders=current_energized_lv_feeders, - normal_energized_lv_substations=normal_energized_lv_substations, - current_energized_lv_substations=current_energized_lv_substations, - **kwargs) + f = Feeder( + normal_head_terminal=normal_head_terminal, + normal_energizing_substation=normal_energizing_substation, + normal_energized_lv_feeders=normal_energized_lv_feeders, + current_equipment=current_equipment, + current_energized_lv_feeders=current_energized_lv_feeders, + normal_energized_lv_substations=normal_energized_lv_substations, + current_energized_lv_substations=current_energized_lv_substations, + **kwargs, + ) verify_equipment_container_constructor_kwargs(f, **kwargs) assert f.normal_head_terminal == normal_head_terminal @@ -64,22 +57,6 @@ def test_feeder_constructor_kwargs( assert_or_empty(f.current_energized_lv_substations, current_energized_lv_substations) -def test_feeder_constructor_args(): - f = Feeder(*feeder_args) - - verify_equipment_container_constructor_args(f) - - assert feeder_args[-5:-3] == [ - f.normal_head_terminal, - f.normal_energizing_substation - ] - # We use a different style of matching here as the passed in args for current_equipment and normal_energized_lv_feeders - # are maps and the stored collections are lists. - assert list(f.current_equipment) == list(feeder_args[-3].values()) - assert list(f.normal_energized_lv_feeders) == list(feeder_args[-2].values()) - assert list(f.current_energized_lv_feeders) == list(feeder_args[-1].values()) - - def test_current_equipment_collection(): validate_unordered( Feeder, @@ -89,7 +66,7 @@ def test_current_equipment_collection(): Feeder.get_current_equipment, Feeder.add_current_equipment, Feeder.remove_current_equipment, - Feeder.clear_current_equipment + Feeder.clear_current_equipment, ) @@ -102,7 +79,7 @@ def test_normal_energized_lv_feeder_collection(): Feeder.get_normal_energized_lv_feeder, Feeder.add_normal_energized_lv_feeder, Feeder.remove_normal_energized_lv_feeder, - Feeder.clear_normal_energized_lv_feeders + Feeder.clear_normal_energized_lv_feeders, ) @@ -115,7 +92,7 @@ def test_current_energized_lv_feeder_collection(): Feeder.get_current_energized_lv_feeder, Feeder.add_current_energized_lv_feeder, Feeder.remove_current_energized_lv_feeder, - Feeder.clear_current_energized_lv_feeders + Feeder.clear_current_energized_lv_feeders, ) @@ -128,7 +105,7 @@ def test_normal_energized_lv_substations_collection(): Feeder.get_normal_energized_lv_substation, Feeder.add_normal_energized_lv_substation, Feeder.remove_normal_energized_lv_substation, - Feeder.clear_normal_energized_lv_substations + Feeder.clear_normal_energized_lv_substations, ) @@ -141,7 +118,7 @@ def test_current_energized_lv_substations_collection(): Feeder.get_current_energized_lv_substation, Feeder.add_current_energized_lv_substation, Feeder.remove_current_energized_lv_substation, - Feeder.clear_current_energized_lv_substations + Feeder.clear_current_energized_lv_substations, ) diff --git a/test/cim/iec61970/base/core/test_geographical_region.py b/test/cim/iec61970/base/core/test_geographical_region.py index 41c3da764..4290aabd3 100644 --- a/test/cim/iec61970/base/core/test_geographical_region.py +++ b/test/cim/iec61970/base/core/test_geographical_region.py @@ -6,14 +6,12 @@ from cim.fill_fields import geographical_region_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.core.geographical_region import GeographicalRegion from zepben.ewb.model.cim.iec61970.base.core.sub_geographical_region import SubGeographicalRegion -geographical_region_args = [*identified_object_args, [SubGeographicalRegion(mrid=generate_id())]] - def test_geographical_region_constructor_default(): gr = GeographicalRegion(mrid=generate_id()) @@ -30,15 +28,6 @@ def test_geographical_region_constructor_kwargs(sub_geographical_regions, **kwar assert list(gr.sub_geographical_regions) == sub_geographical_regions -def test_geographical_region_constructor_args(): - gr = GeographicalRegion(*geographical_region_args) - - verify_identified_object_constructor_args(gr) - assert geographical_region_args[-1:] == [ - list(gr.sub_geographical_regions) - ] - - def test_sub_geographical_regions_collection(): validate_unordered( GeographicalRegion, @@ -48,5 +37,5 @@ def test_sub_geographical_regions_collection(): GeographicalRegion.get_sub_geographical_region, GeographicalRegion.add_sub_geographical_region, GeographicalRegion.remove_sub_geographical_region, - GeographicalRegion.clear_sub_geographical_regions + GeographicalRegion.clear_sub_geographical_regions, ) diff --git a/test/cim/iec61970/base/core/test_identified_object.py b/test/cim/iec61970/base/core/test_identified_object.py index 7c881a2fe..f1792539b 100644 --- a/test/cim/iec61970/base/core/test_identified_object.py +++ b/test/cim/iec61970/base/core/test_identified_object.py @@ -8,9 +8,10 @@ import pytest from zepben.ewb import IdentifiedObject, generate_id -from zepben.ewb.model.cim.iec61970.base.core.name_type import Name, NameType +from zepben.ewb.model.cim.iec61970.base.core.name_type import NameType from zepben.ewb.model.cim.iec61970.base.wires.junction import Junction + # # NOTE: The following should be called in a chain through the inheritance hierarchy: # 1. verify...default verifies the constructor with no args. @@ -21,9 +22,6 @@ # # noinspection PyArgumentList -identified_object_args = [ - "test_mrid", "test_name", "test_description", [Name(name="1", type=NameType(name="nt1"), identified_object=Junction(mrid=generate_id()))] -] def verify_identified_object_constructor_default(io: IdentifiedObject): @@ -49,15 +47,6 @@ def verify_identified_object_constructor_kwargs(io: IdentifiedObject, mrid, name assert not list(io.names) -def verify_identified_object_constructor_args(io: IdentifiedObject): - assert identified_object_args == [ - io.mrid, - io.name, - io.description, - list(io.names) - ] - - def test_user_can_add_names_to_identified_object(): identified_object = IdentifiedObject(mrid=generate_id()) # noinspection PyArgumentList diff --git a/test/cim/iec61970/base/core/test_power_system_resource.py b/test/cim/iec61970/base/core/test_power_system_resource.py index 1b66fbed9..d72efc27e 100644 --- a/test/cim/iec61970/base/core/test_power_system_resource.py +++ b/test/cim/iec61970/base/core/test_power_system_resource.py @@ -4,17 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import PowerSystemResource, Location, PowerTransformerInfo, Asset, generate_id - -power_system_resource_args = [ - *identified_object_args, - Location(mrid=generate_id()), - PowerTransformerInfo(mrid=generate_id()), - 1, - [Asset(mrid=generate_id())] -] +from zepben.ewb import PowerSystemResource, Asset def verify_power_system_resource_constructor_default(psr: PowerSystemResource): @@ -25,7 +17,7 @@ def verify_power_system_resource_constructor_default(psr: PowerSystemResource): assert not list(psr.assets) -def verify_power_system_resource_constructor_kwargs(psr: PowerSystemResource, location, num_controls, assets, asset_info = None, **kwargs): +def verify_power_system_resource_constructor_kwargs(psr: PowerSystemResource, location, num_controls, assets, asset_info=None, **kwargs): verify_identified_object_constructor_kwargs(psr, **kwargs) assert psr.location is location assert psr.asset_info is asset_info @@ -33,16 +25,6 @@ def verify_power_system_resource_constructor_kwargs(psr: PowerSystemResource, lo assert list(psr.assets) == assets -def verify_power_system_resource_constructor_args(psr: PowerSystemResource): - verify_identified_object_constructor_args(psr) - assert power_system_resource_args[-4:] == [ - psr.location, - psr.asset_info, - psr.num_controls, - list(psr.assets) - ] - - def test_assets_collection(): validate_unordered( PowerSystemResource, @@ -52,5 +34,5 @@ def test_assets_collection(): PowerSystemResource.get_asset, PowerSystemResource.add_asset, PowerSystemResource.remove_asset, - PowerSystemResource.clear_assets + PowerSystemResource.clear_assets, ) diff --git a/test/cim/iec61970/base/core/test_sub_geographical_region.py b/test/cim/iec61970/base/core/test_sub_geographical_region.py index 6b25eb6b1..736219d6e 100644 --- a/test/cim/iec61970/base/core/test_sub_geographical_region.py +++ b/test/cim/iec61970/base/core/test_sub_geographical_region.py @@ -6,14 +6,11 @@ from cim.fill_fields import sub_geographical_region_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Substation, generate_id -from zepben.ewb.model.cim.iec61970.base.core.geographical_region import GeographicalRegion from zepben.ewb.model.cim.iec61970.base.core.sub_geographical_region import SubGeographicalRegion -sub_geographical_region_args = [*identified_object_args, GeographicalRegion(mrid=generate_id()), [Substation(mrid=generate_id())]] - def test_sub_geographical_region_constructor_default(): sgr = SubGeographicalRegion(mrid=generate_id()) @@ -24,25 +21,17 @@ def test_sub_geographical_region_constructor_default(): @given(**sub_geographical_region_kwargs()) def test_sub_geographical_region_constructor_kwargs(geographical_region, substations, **kwargs): - sgr = SubGeographicalRegion(geographical_region=geographical_region, - substations=substations, - **kwargs) + sgr = SubGeographicalRegion( + geographical_region=geographical_region, + substations=substations, + **kwargs, + ) verify_identified_object_constructor_kwargs(sgr, **kwargs) assert sgr.geographical_region == geographical_region assert list(sgr.substations) == substations -def test_sub_geographical_region_constructor_args(): - sgr = SubGeographicalRegion(*sub_geographical_region_args) - - verify_identified_object_constructor_args(sgr) - assert sub_geographical_region_args[-2:] == [ - sgr.geographical_region, - list(sgr.substations) - ] - - def test_substations_collection(): validate_unordered( SubGeographicalRegion, @@ -52,5 +41,5 @@ def test_substations_collection(): SubGeographicalRegion.get_substation, SubGeographicalRegion.add_substation, SubGeographicalRegion.remove_substation, - SubGeographicalRegion.clear_substations + SubGeographicalRegion.clear_substations, ) diff --git a/test/cim/iec61970/base/core/test_substation.py b/test/cim/iec61970/base/core/test_substation.py index 60013aba6..15ff78502 100644 --- a/test/cim/iec61970/base/core/test_substation.py +++ b/test/cim/iec61970/base/core/test_substation.py @@ -6,19 +6,10 @@ from cim.fill_fields import substation_kwargs from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, \ - verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args + verify_equipment_container_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import Substation, Feeder, Loop, Circuit, generate_id -substation_args = [ - *equipment_container_args, - Substation(mrid=generate_id()), - [Feeder(mrid=generate_id())], - [Loop(mrid=generate_id())], - [Loop(mrid=generate_id())], - [Circuit(mrid=generate_id())] -] - def test_substation_constructor_default(): cn = Substation(mrid=generate_id()) @@ -33,12 +24,14 @@ def test_substation_constructor_default(): @given(**substation_kwargs()) def test_substation_constructor_kwargs(sub_geographical_region, normal_energized_feeders, loops, energized_loops, circuits, **kwargs): - cn = Substation(sub_geographical_region=sub_geographical_region, - normal_energized_feeders=normal_energized_feeders, - loops=loops, - energized_loops=energized_loops, - circuits=circuits, - **kwargs) + cn = Substation( + sub_geographical_region=sub_geographical_region, + normal_energized_feeders=normal_energized_feeders, + loops=loops, + energized_loops=energized_loops, + circuits=circuits, + **kwargs, + ) verify_equipment_container_constructor_kwargs(cn, **kwargs) assert cn.sub_geographical_region == sub_geographical_region @@ -48,19 +41,6 @@ def test_substation_constructor_kwargs(sub_geographical_region, normal_energized assert list(cn.circuits) == circuits -def test_substation_constructor_args(): - cn = Substation(*substation_args) - - verify_equipment_container_constructor_args(cn) - assert substation_args[-5:] == [ - cn.sub_geographical_region, - list(cn.feeders), - list(cn.loops), - list(cn.energized_loops), - list(cn.circuits) - ] - - def test_normal_energized_feeders_collection(): validate_unordered( Substation, @@ -70,7 +50,7 @@ def test_normal_energized_feeders_collection(): Substation.get_feeder, Substation.add_feeder, Substation.remove_feeder, - Substation.clear_feeders + Substation.clear_feeders, ) @@ -83,7 +63,7 @@ def test_loops_collection(): Substation.get_loop, Substation.add_loop, Substation.remove_loop, - Substation.clear_loops + Substation.clear_loops, ) @@ -96,7 +76,7 @@ def test_energized_loops_collection(): Substation.get_energized_loop, Substation.add_energized_loop, Substation.remove_energized_loop, - Substation.clear_energized_loops + Substation.clear_energized_loops, ) @@ -109,5 +89,5 @@ def test_circuits_collection(): Substation.get_circuit, Substation.add_circuit, Substation.remove_circuit, - Substation.clear_circuits + Substation.clear_circuits, ) diff --git a/test/cim/iec61970/base/core/test_terminal.py b/test/cim/iec61970/base/core/test_terminal.py index 5a4322e6e..7c08a83c9 100644 --- a/test/cim/iec61970/base/core/test_terminal.py +++ b/test/cim/iec61970/base/core/test_terminal.py @@ -6,21 +6,10 @@ from cim.fill_fields import terminal_kwargs from cim.iec61970.base.core.test_ac_dc_terminal import verify_ac_dc_terminal_constructor_default, \ - verify_ac_dc_terminal_constructor_kwargs, verify_ac_dc_terminal_constructor_args, ac_dc_terminal_args -from zepben.ewb import Terminal, ConnectivityNode, ConductingEquipment, PhaseCode, generate_id, NetworkService, Junction + verify_ac_dc_terminal_constructor_kwargs +from zepben.ewb import Terminal, ConnectivityNode, PhaseCode, generate_id, NetworkService, Junction from zepben.ewb.services.network.tracing.feeder.feeder_direction import FeederDirection -# noinspection PyArgumentList -terminal_args = [ - *ac_dc_terminal_args, - ConductingEquipment(mrid=generate_id()), - PhaseCode.XYN, - 1, - FeederDirection.UPSTREAM, - FeederDirection.DOWNSTREAM, - ConnectivityNode(mrid=generate_id()) -] - def test_terminal_constructor_default(): t = Terminal(mrid=generate_id()) @@ -44,15 +33,17 @@ def test_terminal_constructor_kwargs( normal_feeder_direction, current_feeder_direction, connectivity_node, - **kwargs + **kwargs, ): - t = Terminal(conducting_equipment=conducting_equipment, - phases=phases, - sequence_number=sequence_number, - normal_feeder_direction=normal_feeder_direction, - current_feeder_direction=current_feeder_direction, - connectivity_node=connectivity_node, - **kwargs) + t = Terminal( + conducting_equipment=conducting_equipment, + phases=phases, + sequence_number=sequence_number, + normal_feeder_direction=normal_feeder_direction, + current_feeder_direction=current_feeder_direction, + connectivity_node=connectivity_node, + **kwargs, + ) verify_ac_dc_terminal_constructor_kwargs(t, **kwargs) assert t.conducting_equipment == conducting_equipment @@ -63,21 +54,6 @@ def test_terminal_constructor_kwargs( assert t.connectivity_node == connectivity_node -def test_terminal_constructor_args(): - t = Terminal(*terminal_args) - - verify_ac_dc_terminal_constructor_args(t) - expected_args = [ - t.conducting_equipment, - t.phases, - t.sequence_number, - t.normal_feeder_direction, - t.current_feeder_direction, - t.connectivity_node - ] - assert (terminal_args[-len(expected_args):] == expected_args) - - def test_connectivity(): terminal = Terminal(mrid=generate_id()) connectivity_node = ConnectivityNode(mrid=generate_id()) diff --git a/test/cim/iec61970/base/diagramlayout/test_diagram.py b/test/cim/iec61970/base/diagramlayout/test_diagram.py index d0371bfaf..f6cfb6ab2 100644 --- a/test/cim/iec61970/base/diagramlayout/test_diagram.py +++ b/test/cim/iec61970/base/diagramlayout/test_diagram.py @@ -6,15 +6,12 @@ from cim.fill_fields import diagram_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import DiagramStyle, OrientationKind, generate_id from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram import Diagram from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object import DiagramObject -# noinspection PyArgumentList -diagram_args = [*identified_object_args, DiagramStyle.GEOGRAPHIC, OrientationKind.NEGATIVE, {"do": DiagramObject(mrid=generate_id())}] - def test_diagram_constructor_default(): d = Diagram(mrid=generate_id()) @@ -27,10 +24,12 @@ def test_diagram_constructor_default(): @given(**diagram_kwargs()) def test_diagram_constructor_kwargs(diagram_style, orientation_kind, diagram_objects, **kwargs): - d = Diagram(diagram_style=diagram_style, - orientation_kind=orientation_kind, - diagram_objects=diagram_objects, - **kwargs) + d = Diagram( + diagram_style=diagram_style, + orientation_kind=orientation_kind, + diagram_objects=diagram_objects, + **kwargs, + ) verify_identified_object_constructor_kwargs(d, **kwargs) assert d.diagram_style == diagram_style @@ -38,18 +37,6 @@ def test_diagram_constructor_kwargs(diagram_style, orientation_kind, diagram_obj assert list(d.diagram_objects) == diagram_objects -def test_diagram_constructor_args(): - d = Diagram(*diagram_args) - - verify_identified_object_constructor_args(d) - assert diagram_args[-3:-1] == [ - d.diagram_style, - d.orientation_kind - ] - # We use a different style of matching here as the passed in arg for diagram_objects is a map and the stored collection is a list. - assert list(d.diagram_objects) == list(diagram_args[-1].values()) - - def test_diagram_objects_collection(): validate_unordered( Diagram, @@ -59,5 +46,5 @@ def test_diagram_objects_collection(): Diagram.get_diagram_object, Diagram.add_diagram_object, Diagram.remove_diagram_object, - Diagram.clear_diagram_objects + Diagram.clear_diagram_objects, ) diff --git a/test/cim/iec61970/base/diagramlayout/test_diagram_object.py b/test/cim/iec61970/base/diagramlayout/test_diagram_object.py index 6adb970b9..041100f8a 100644 --- a/test/cim/iec61970/base/diagramlayout/test_diagram_object.py +++ b/test/cim/iec61970/base/diagramlayout/test_diagram_object.py @@ -6,16 +6,12 @@ from cim.fill_fields import diagram_object_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_ordered_other from zepben.ewb import generate_id -from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram import Diagram from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object import DiagramObject from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object_point import DiagramObjectPoint -# noinspection PyArgumentList -diagram_object_args = [*identified_object_args, Diagram(mrid=generate_id()), "a", "CB", 1.1, [DiagramObjectPoint(1.1, 2.2)]] - def test_diagram_object_constructor_default(): do = DiagramObject(mrid=generate_id()) @@ -30,12 +26,14 @@ def test_diagram_object_constructor_default(): @given(**diagram_object_kwargs()) def test_diagram_object_constructor_kwargs(diagram, identified_object_mrid, style, rotation, diagram_object_points, **kwargs): - do = DiagramObject(diagram=diagram, - identified_object_mrid=identified_object_mrid, - style=style, - rotation=rotation, - diagram_object_points=diagram_object_points, - **kwargs) + do = DiagramObject( + diagram=diagram, + identified_object_mrid=identified_object_mrid, + style=style, + rotation=rotation, + diagram_object_points=diagram_object_points, + **kwargs, + ) verify_identified_object_constructor_kwargs(do, **kwargs) assert do.diagram == diagram @@ -45,19 +43,6 @@ def test_diagram_object_constructor_kwargs(diagram, identified_object_mrid, styl assert list(do.points) == diagram_object_points -def test_diagram_object_constructor_args(): - do = DiagramObject(*diagram_object_args) - - verify_identified_object_constructor_args(do) - assert diagram_object_args[-5:] == [ - do.diagram, - do.identified_object_mrid, - do.style, - do.rotation, - list(do.points) - ] - - def test_points_collection(): # noinspection PyArgumentList validate_ordered_other( @@ -71,5 +56,5 @@ def test_points_collection(): DiagramObject.insert_point, DiagramObject.remove_point, DiagramObject.remove_point_by_sequence_number, - DiagramObject.clear_points + DiagramObject.clear_points, ) diff --git a/test/cim/iec61970/base/diagramlayout/test_diagram_object_point.py b/test/cim/iec61970/base/diagramlayout/test_diagram_object_point.py index a86543637..bf7b316eb 100644 --- a/test/cim/iec61970/base/diagramlayout/test_diagram_object_point.py +++ b/test/cim/iec61970/base/diagramlayout/test_diagram_object_point.py @@ -8,8 +8,6 @@ from cim.fill_fields import diagram_object_point_kwargs from zepben.ewb.model.cim.iec61970.base.diagramlayout.diagram_object_point import DiagramObjectPoint -diagram_object_point_args = [1.1, 2.2] - # noinspection PyArgumentList def test_diagram_object_point_constructor_default(): @@ -34,12 +32,3 @@ def test_diagram_object_point_constructor_kwargs(x_position, y_position, **kwarg assert dop.x_position == x_position assert dop.y_position == y_position - - -def test_diagram_object_point_constructor_args(): - dop = DiagramObjectPoint(*diagram_object_point_args) - - assert diagram_object_point_args[-2:] == [ - dop.x_position, - dop.y_position - ] diff --git a/test/cim/iec61970/base/domain/test_date_time_interval.py b/test/cim/iec61970/base/domain/test_date_time_interval.py index 74dc6ee58..0f62d2988 100644 --- a/test/cim/iec61970/base/domain/test_date_time_interval.py +++ b/test/cim/iec61970/base/domain/test_date_time_interval.py @@ -8,19 +8,12 @@ from zepben.ewb.model.cim.iec61970.base.domain.date_time_interval import DateTimeInterval - datetime_interval_kwargs = { 'start': datetime(2000, 1, 1), 'end': datetime(2005, 1, 1), } -datetime_interval_args = [ - datetime(2000, 1, 1), - datetime(2000, 2, 1), -] - - def test_datetime_interval_constructor_default(): with pytest.raises(ValueError, match="You must provide a start or end time."): # noinspection PyUnusedLocal @@ -31,6 +24,7 @@ def test_datetime_interval_constructor_default(): assert a.end is None assert b.start is None + def test_datetime_interval_constructor_kwargs(): dti = DateTimeInterval(**datetime_interval_kwargs) @@ -38,12 +32,6 @@ def test_datetime_interval_constructor_kwargs(): assert dti.end == datetime_interval_kwargs['end'] -def test_datetime_interval_constructor_args(): - dti = DateTimeInterval(*datetime_interval_args) - - assert dti.start == datetime_interval_args[-2] - assert dti.end == datetime_interval_args[-1] - def test_must_have_a_valid_start_or_end(): with pytest.raises(ValueError, match="The start time must be before the end time."): DateTimeInterval(start=datetime(2020, 12, 1), end=datetime(2020, 1, 1)) diff --git a/test/cim/iec61970/base/equivalents/test_equivalent_branch.py b/test/cim/iec61970/base/equivalents/test_equivalent_branch.py index 2ebc60c1f..b622b0ed0 100644 --- a/test/cim/iec61970/base/equivalents/test_equivalent_branch.py +++ b/test/cim/iec61970/base/equivalents/test_equivalent_branch.py @@ -6,11 +6,9 @@ from cim.fill_fields import equivalent_branch_kwargs from cim.iec61970.base.equivalents.test_equivalent_equipment import verify_equivalent_equipment_constructor_default, \ - verify_equivalent_equipment_constructor_kwargs, verify_equivalent_equipment_constructor_args, equivalent_equipment_args + verify_equivalent_equipment_constructor_kwargs from zepben.ewb import EquivalentBranch, generate_id -equivalent_branch_args = [*equivalent_equipment_args, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.01, 11.11, 12.21, 13.31, 14.41, 15.51, 16.61] - def test_equivalent_branch_constructor_default(): t = EquivalentBranch(mrid=generate_id()) @@ -35,9 +33,11 @@ def test_equivalent_branch_constructor_default(): @given(**equivalent_branch_kwargs()) -def test_equivalent_branch_constructor_kwargs(negative_r12, negative_r21, negative_x12, negative_x21, positive_r12, positive_r21, positive_x12, positive_x21, r, - r21, x, - x21, zero_r12, zero_r21, zero_x12, zero_x21, **kwargs): +def test_equivalent_branch_constructor_kwargs( + negative_r12, negative_r21, negative_x12, negative_x21, positive_r12, positive_r21, positive_x12, positive_x21, r, + r21, x, + x21, zero_r12, zero_r21, zero_x12, zero_x21, **kwargs, +): t = EquivalentBranch( negative_r12=negative_r12, negative_r21=negative_r21, @@ -55,7 +55,7 @@ def test_equivalent_branch_constructor_kwargs(negative_r12, negative_r21, negati zero_r21=zero_r21, zero_x12=zero_x12, zero_x21=zero_x21, - **kwargs + **kwargs, ) verify_equivalent_equipment_constructor_kwargs(t, **kwargs) @@ -75,27 +75,3 @@ def test_equivalent_branch_constructor_kwargs(negative_r12, negative_r21, negati assert t.zero_r21 == zero_r21 assert t.zero_x12 == zero_x12 assert t.zero_x21 == zero_x21 - - -def test_equivalent_branch_constructor_args(): - t = EquivalentBranch(*equivalent_branch_args) - - verify_equivalent_equipment_constructor_args(t) - assert equivalent_branch_args[-16:] == [ - t.negative_r12, - t.negative_r21, - t.negative_x12, - t.negative_x21, - t.positive_r12, - t.positive_r21, - t.positive_x12, - t.positive_x21, - t.r, - t.r21, - t.x, - t.x21, - t.zero_r12, - t.zero_r21, - t.zero_x12, - t.zero_x21 - ] diff --git a/test/cim/iec61970/base/equivalents/test_equivalent_equipment.py b/test/cim/iec61970/base/equivalents/test_equivalent_equipment.py index f2f8dfd56..3c23941af 100644 --- a/test/cim/iec61970/base/equivalents/test_equivalent_equipment.py +++ b/test/cim/iec61970/base/equivalents/test_equivalent_equipment.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import EquivalentEquipment -equivalent_equipment_args = conducting_equipment_args - def verify_equivalent_equipment_constructor_default(ee: EquivalentEquipment): verify_conducting_equipment_constructor_default(ee) @@ -16,7 +14,3 @@ def verify_equivalent_equipment_constructor_default(ee: EquivalentEquipment): def verify_equivalent_equipment_constructor_kwargs(ee: EquivalentEquipment, **kwargs): verify_conducting_equipment_constructor_kwargs(ee, **kwargs) - - -def verify_equivalent_equipment_constructor_args(ee: EquivalentEquipment): - verify_conducting_equipment_constructor_args(ee) diff --git a/test/cim/iec61970/base/meas/test_accumulator.py b/test/cim/iec61970/base/meas/test_accumulator.py index 9939bcda5..70f942ca3 100644 --- a/test/cim/iec61970/base/meas/test_accumulator.py +++ b/test/cim/iec61970/base/meas/test_accumulator.py @@ -6,12 +6,10 @@ from cim.fill_fields import accumulator_kwargs from cim.iec61970.base.meas.test_measurement import verify_measurement_constructor_default, \ - verify_measurement_constructor_kwargs, verify_measurement_constructor_args, measurement_args + verify_measurement_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.meas.accumulator import Accumulator -accumulator_args = measurement_args - def test_accumulator_constructor_default(): verify_measurement_constructor_default(Accumulator(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_accumulator_constructor_default(): @given(**accumulator_kwargs()) def test_accumulator_constructor_kwargs(**kwargs): verify_measurement_constructor_kwargs(Accumulator(**kwargs), **kwargs) - - -def test_accumulator_constructor_args(): - verify_measurement_constructor_args(Accumulator(*accumulator_args)) diff --git a/test/cim/iec61970/base/meas/test_accumulator_value.py b/test/cim/iec61970/base/meas/test_accumulator_value.py index c7b31a0a2..31d503ba9 100644 --- a/test/cim/iec61970/base/meas/test_accumulator_value.py +++ b/test/cim/iec61970/base/meas/test_accumulator_value.py @@ -6,11 +6,9 @@ from cim.fill_fields import accumulator_value_kwargs from cim.iec61970.base.meas.test_measurement_value import verify_measurement_value_constructor_default, \ - verify_measurement_value_constructor_kwargs, verify_measurement_value_constructor_args, measurement_value_args + verify_measurement_value_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.meas.accumulator_value import AccumulatorValue -accumulator_value_args = [*measurement_value_args, 1, "a"] - def test_accumulator_value_constructor_default(): av = AccumulatorValue() @@ -26,20 +24,9 @@ def test_accumulator_value_constructor_kwargs(value, accumulator_mrid, **kwargs) av = AccumulatorValue( value=value, accumulator_mrid=accumulator_mrid, - **kwargs + **kwargs, ) verify_measurement_value_constructor_kwargs(av, **kwargs) assert av.value == value assert av.accumulator_mrid == accumulator_mrid - - -def test_accumulator_value_constructor_args(): - # noinspection PyArgumentList - av = AccumulatorValue(*accumulator_value_args) - - verify_measurement_value_constructor_args(av) - assert accumulator_value_args[-2:] == [ - av.value, - av.accumulator_mrid - ] diff --git a/test/cim/iec61970/base/meas/test_analog.py b/test/cim/iec61970/base/meas/test_analog.py index 40f4ed116..db359b953 100644 --- a/test/cim/iec61970/base/meas/test_analog.py +++ b/test/cim/iec61970/base/meas/test_analog.py @@ -6,12 +6,10 @@ from cim.fill_fields import analog_kwargs from cim.iec61970.base.meas.test_measurement import verify_measurement_constructor_default, \ - verify_measurement_constructor_kwargs, verify_measurement_constructor_args, measurement_args + verify_measurement_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.meas.analog import Analog -analog_args = measurement_args - def test_analog_constructor_default(): analog = Analog(mrid=generate_id()) @@ -24,12 +22,8 @@ def test_analog_constructor_default(): def test_analog_constructor_kwargs(positive_flow_in, **kwargs): ana = Analog( positive_flow_in=positive_flow_in, - **kwargs + **kwargs, ) verify_measurement_constructor_kwargs(ana, **kwargs) assert ana.positive_flow_in == positive_flow_in - - -def test_analog_constructor_args(): - verify_measurement_constructor_args(Analog(*analog_args)) diff --git a/test/cim/iec61970/base/meas/test_analog_value.py b/test/cim/iec61970/base/meas/test_analog_value.py index 1425af77c..7082b3d3b 100644 --- a/test/cim/iec61970/base/meas/test_analog_value.py +++ b/test/cim/iec61970/base/meas/test_analog_value.py @@ -6,11 +6,9 @@ from cim.fill_fields import analog_value_kwargs from cim.iec61970.base.meas.test_measurement_value import verify_measurement_value_constructor_default, \ - verify_measurement_value_constructor_kwargs, verify_measurement_value_constructor_args, measurement_value_args + verify_measurement_value_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.meas.analog_value import AnalogValue -analog_value_args = [*measurement_value_args, 1.1, "a"] - def test_analog_value_constructor_default(): av = AnalogValue() @@ -26,20 +24,9 @@ def test_analog_value_constructor_kwargs(value, analog_mrid, **kwargs): av = AnalogValue( value=value, analog_mrid=analog_mrid, - **kwargs + **kwargs, ) verify_measurement_value_constructor_kwargs(av, **kwargs) assert av.value == value assert av.analog_mrid == analog_mrid - - -def test_analog_value_constructor_args(): - # noinspection PyArgumentList - av = AnalogValue(*analog_value_args) - - verify_measurement_value_constructor_args(av) - assert analog_value_args[-2:] == [ - av.value, - av.analog_mrid - ] diff --git a/test/cim/iec61970/base/meas/test_control.py b/test/cim/iec61970/base/meas/test_control.py index 7f163e0df..20491a67e 100644 --- a/test/cim/iec61970/base/meas/test_control.py +++ b/test/cim/iec61970/base/meas/test_control.py @@ -6,10 +6,8 @@ from cim.fill_fields import control_kwargs from cim.iec61970.base.meas.test_io_point import verify_io_point_constructor_default, \ - verify_io_point_constructor_kwargs, verify_io_point_constructor_args, io_point_args -from zepben.ewb import Control, RemoteControl, generate_id - -control_args = [*io_point_args, "a", RemoteControl(mrid=generate_id())] + verify_io_point_constructor_kwargs +from zepben.ewb import Control, generate_id def test_control_constructor_default(): @@ -27,13 +25,3 @@ def test_control_constructor_kwargs(power_system_resource_mrid, remote_control, verify_io_point_constructor_kwargs(c, **kwargs) assert c.power_system_resource_mrid == power_system_resource_mrid assert c.remote_control == remote_control - - -def test_control_constructor_args(): - c = Control(*control_args) - - verify_io_point_constructor_args(c) - assert control_args[-2:] == [ - c.power_system_resource_mrid, - c.remote_control - ] diff --git a/test/cim/iec61970/base/meas/test_discrete.py b/test/cim/iec61970/base/meas/test_discrete.py index 8f9150087..729ed2344 100644 --- a/test/cim/iec61970/base/meas/test_discrete.py +++ b/test/cim/iec61970/base/meas/test_discrete.py @@ -6,12 +6,10 @@ from cim.fill_fields import discrete_kwargs from cim.iec61970.base.meas.test_measurement import verify_measurement_constructor_default, \ - verify_measurement_constructor_kwargs, verify_measurement_constructor_args, measurement_args + verify_measurement_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.meas.discrete import Discrete -discrete_args = measurement_args - def test_discrete_constructor_default(): verify_measurement_constructor_default(Discrete(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_discrete_constructor_default(): @given(**discrete_kwargs()) def test_discrete_constructor_kwargs(**kwargs): verify_measurement_constructor_kwargs(Discrete(**kwargs), **kwargs) - - -def test_discrete_constructor_args(): - verify_measurement_constructor_args(Discrete(*discrete_args)) diff --git a/test/cim/iec61970/base/meas/test_discrete_value.py b/test/cim/iec61970/base/meas/test_discrete_value.py index 94491ed39..b9f8ee903 100644 --- a/test/cim/iec61970/base/meas/test_discrete_value.py +++ b/test/cim/iec61970/base/meas/test_discrete_value.py @@ -6,11 +6,9 @@ from cim.fill_fields import discrete_value_kwargs from cim.iec61970.base.meas.test_measurement_value import verify_measurement_value_constructor_default, \ - verify_measurement_value_constructor_kwargs, verify_measurement_value_constructor_args, measurement_value_args + verify_measurement_value_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.meas.discrete_value import DiscreteValue -discrete_value_args = [*measurement_value_args, 1, "a"] - def test_discrete_value_constructor_default(): dv = DiscreteValue() @@ -26,20 +24,9 @@ def test_discrete_value_constructor_kwargs(value, discrete_mrid, **kwargs): dv = DiscreteValue( value=value, discrete_mrid=discrete_mrid, - **kwargs + **kwargs, ) verify_measurement_value_constructor_kwargs(dv, **kwargs) assert dv.value == value assert dv.discrete_mrid == discrete_mrid - - -def test_discrete_value_constructor_args(): - # noinspection PyArgumentList - dv = DiscreteValue(*discrete_value_args) - - verify_measurement_value_constructor_args(dv) - assert discrete_value_args[-2:] == [ - dv.value, - dv.discrete_mrid - ] diff --git a/test/cim/iec61970/base/meas/test_io_point.py b/test/cim/iec61970/base/meas/test_io_point.py index 4f5145c6d..087fac5c4 100644 --- a/test/cim/iec61970/base/meas/test_io_point.py +++ b/test/cim/iec61970/base/meas/test_io_point.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import IoPoint -io_point_args = identified_object_args - def verify_io_point_constructor_default(ip: IoPoint): verify_identified_object_constructor_default(ip) @@ -16,7 +14,3 @@ def verify_io_point_constructor_default(ip: IoPoint): def verify_io_point_constructor_kwargs(ip: IoPoint, **kwargs): verify_identified_object_constructor_kwargs(ip, **kwargs) - - -def verify_io_point_constructor_args(ip: IoPoint): - verify_identified_object_constructor_args(ip) diff --git a/test/cim/iec61970/base/meas/test_measurement.py b/test/cim/iec61970/base/meas/test_measurement.py index c68cb9090..abfc9c359 100644 --- a/test/cim/iec61970/base/meas/test_measurement.py +++ b/test/cim/iec61970/base/meas/test_measurement.py @@ -4,10 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args -from zepben.ewb import Measurement, RemoteSource, PhaseCode, UnitSymbol, generate_id - -measurement_args = [*identified_object_args, "a", RemoteSource(mrid=generate_id()), "b", PhaseCode.XYN, UnitSymbol.A] + verify_identified_object_constructor_kwargs +from zepben.ewb import Measurement, PhaseCode, UnitSymbol def verify_measurement_constructor_default(m: Measurement): @@ -26,14 +24,3 @@ def verify_measurement_constructor_kwargs(m: Measurement, power_system_resource_ assert m.terminal_mrid == terminal_mrid assert m.phases == phases assert m.unit_symbol == unit_symbol - - -def verify_measurement_constructor_args(m: Measurement): - verify_identified_object_constructor_args(m) - assert measurement_args[-5:] == [ - m.power_system_resource_mrid, - m.remote_source, - m.terminal_mrid, - m.phases, - m.unit_symbol - ] diff --git a/test/cim/iec61970/base/meas/test_measurement_value.py b/test/cim/iec61970/base/meas/test_measurement_value.py index 97249127f..1d03968bd 100644 --- a/test/cim/iec61970/base/meas/test_measurement_value.py +++ b/test/cim/iec61970/base/meas/test_measurement_value.py @@ -2,12 +2,9 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from datetime import datetime from zepben.ewb.model.cim.iec61970.base.meas.measurement_value import MeasurementValue -measurement_value_args = [datetime(2021, 1, 1)] - def verify_measurement_value_constructor_default(mv: MeasurementValue): assert not mv.time_stamp @@ -16,9 +13,3 @@ def verify_measurement_value_constructor_default(mv: MeasurementValue): def verify_measurement_value_constructor_kwargs(mv: MeasurementValue, time_stamp, **kwargs): assert not kwargs assert mv.time_stamp == time_stamp - - -def verify_measurement_value_constructor_args(mv: MeasurementValue): - assert measurement_value_args[-1:] == [ - mv.time_stamp - ] diff --git a/test/cim/iec61970/base/protection/test_current_relay.py b/test/cim/iec61970/base/protection/test_current_relay.py index 71877323b..65bbd2221 100644 --- a/test/cim/iec61970/base/protection/test_current_relay.py +++ b/test/cim/iec61970/base/protection/test_current_relay.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import current_relay_kwargs -from cim.iec61970.base.protection.test_protection_relay_function import protection_relay_function_args, \ - verify_protection_relay_function_constructor_default, verify_protection_relay_function_constructor_kwargs, verify_protection_relay_function_constructor_args +from cim.iec61970.base.protection.test_protection_relay_function import verify_protection_relay_function_constructor_default, \ + verify_protection_relay_function_constructor_kwargs from zepben.ewb import CurrentRelay, ProtectionKind, generate_id -current_relay_args = [*protection_relay_function_args, 1.1, True, 2.2] - def test_current_relay_constructor_default(): cr = CurrentRelay(mrid=generate_id()) @@ -27,21 +25,10 @@ def test_current_relay_constructor_kwargs(current_limit_1, inverse_time_flag, ti current_limit_1=current_limit_1, inverse_time_flag=inverse_time_flag, time_delay_1=time_delay_1, - **kwargs + **kwargs, ) verify_protection_relay_function_constructor_kwargs(cr, **kwargs) assert cr.current_limit_1 == current_limit_1 assert cr.inverse_time_flag == inverse_time_flag assert cr.time_delay_1 == time_delay_1 - - -def test_current_relay_constructor_args(): - cr = CurrentRelay(*current_relay_args) - - verify_protection_relay_function_constructor_args(cr) - assert current_relay_args[-3:] == [ - cr.current_limit_1, - cr.inverse_time_flag, - cr.time_delay_1 - ] diff --git a/test/cim/iec61970/base/protection/test_distance_relay.py b/test/cim/iec61970/base/protection/test_distance_relay.py index f215d90f5..51c80f2bd 100644 --- a/test/cim/iec61970/base/protection/test_distance_relay.py +++ b/test/cim/iec61970/base/protection/test_distance_relay.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import distance_relay_kwargs -from cim.iec61970.base.protection.test_protection_relay_function import protection_relay_function_args, \ - verify_protection_relay_function_constructor_default, verify_protection_relay_function_constructor_kwargs, verify_protection_relay_function_constructor_args +from cim.iec61970.base.protection.test_protection_relay_function import verify_protection_relay_function_constructor_default, \ + verify_protection_relay_function_constructor_kwargs from zepben.ewb import DistanceRelay, generate_id -distance_relay_args = [*protection_relay_function_args, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9] - def test_distance_relay_constructor_default(): dr = DistanceRelay(mrid=generate_id()) @@ -38,7 +36,7 @@ def test_distance_relay_constructor_kwargs( operation_phase_angle1, operation_phase_angle2, operation_phase_angle3, - **kwargs + **kwargs, ): dr = DistanceRelay( backward_blind=backward_blind, @@ -50,7 +48,7 @@ def test_distance_relay_constructor_kwargs( operation_phase_angle1=operation_phase_angle1, operation_phase_angle2=operation_phase_angle2, operation_phase_angle3=operation_phase_angle3, - **kwargs + **kwargs, ) verify_protection_relay_function_constructor_kwargs(dr, **kwargs) @@ -63,20 +61,3 @@ def test_distance_relay_constructor_kwargs( assert dr.operation_phase_angle1 == operation_phase_angle1 assert dr.operation_phase_angle2 == operation_phase_angle2 assert dr.operation_phase_angle3 == operation_phase_angle3 - - -def test_distance_relay_constructor_args(): - dr = DistanceRelay(*distance_relay_args) - - verify_protection_relay_function_constructor_args(dr) - assert distance_relay_args[-9:] == [ - dr.backward_blind, - dr.backward_reach, - dr.backward_reactance, - dr.forward_blind, - dr.forward_reach, - dr.forward_reactance, - dr.operation_phase_angle1, - dr.operation_phase_angle2, - dr.operation_phase_angle3 - ] diff --git a/test/cim/iec61970/base/protection/test_protection_relay_function.py b/test/cim/iec61970/base/protection/test_protection_relay_function.py index 6d3069344..3bbbcf06c 100644 --- a/test/cim/iec61970/base/protection/test_protection_relay_function.py +++ b/test/cim/iec61970/base/protection/test_protection_relay_function.py @@ -4,25 +4,10 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, \ - verify_power_system_resource_constructor_kwargs, verify_power_system_resource_constructor_args, power_system_resource_args + verify_power_system_resource_constructor_kwargs from cim.private_collection_validator import validate_unordered, validate_ordered_other from zepben.ewb import ProtectionKind, PowerDirectionKind, ProtectedSwitch, ProtectionRelayFunction, ProtectionRelayScheme, RelaySetting, Sensor, \ - UnitSymbol, unit_symbol_from_id, generate_id - -protection_relay_function_args = [ - *power_system_resource_args, - "model_string", - False, - 1.1, - ProtectionKind.JG, - True, - PowerDirectionKind.FORWARD, - [Sensor(mrid=generate_id())], - [ProtectedSwitch(mrid=generate_id())], - [ProtectionRelayScheme(mrid=generate_id())], - [2.2, 3.3], - [RelaySetting(unit_symbol=UnitSymbol.METRES, value=1.1, name="rs1"), RelaySetting(unit_symbol=UnitSymbol.GYPERS, value=2.2, name="rs2")] -] + unit_symbol_from_id def verify_protection_relay_function_constructor_default(prf: ProtectionRelayFunction): @@ -52,7 +37,7 @@ def verify_protection_relay_function_constructor_kwargs( schemes, time_limits, thresholds, - **kwargs + **kwargs, ): verify_power_system_resource_constructor_kwargs(prf, **kwargs) assert prf.model == model @@ -68,23 +53,6 @@ def verify_protection_relay_function_constructor_kwargs( assert list(prf.thresholds) == thresholds -def verify_protection_relay_function_constructor_args(prf: ProtectionRelayFunction): - verify_power_system_resource_constructor_args(prf) - assert protection_relay_function_args[-11:] == [ - prf.model, - prf.reclosing, - prf.relay_delay_time, - prf.protection_kind, - prf.directable, - prf.power_direction, - list(prf.sensors), - list(prf.protected_switches), - list(prf.schemes), - list(prf.time_limits), - list(prf.thresholds) - ] - - def test_sensors_collection(): validate_unordered( ProtectionRelayFunction, @@ -94,7 +62,7 @@ def test_sensors_collection(): ProtectionRelayFunction.get_sensor, ProtectionRelayFunction.add_sensor, ProtectionRelayFunction.remove_sensor, - ProtectionRelayFunction.clear_sensors + ProtectionRelayFunction.clear_sensors, ) @@ -107,7 +75,7 @@ def test_protected_switches_collection(): ProtectionRelayFunction.get_protected_switch, ProtectionRelayFunction.add_protected_switch, ProtectionRelayFunction.remove_protected_switch, - ProtectionRelayFunction.clear_protected_switches + ProtectionRelayFunction.clear_protected_switches, ) @@ -120,7 +88,7 @@ def test_scheme_collection(): ProtectionRelayFunction.get_scheme, ProtectionRelayFunction.add_scheme, ProtectionRelayFunction.remove_scheme, - ProtectionRelayFunction.clear_schemes + ProtectionRelayFunction.clear_schemes, ) @@ -136,7 +104,7 @@ def test_time_limits_collection(): ProtectionRelayFunction.add_time_limit, ProtectionRelayFunction.remove_time_limit, ProtectionRelayFunction.remove_time_limit_at, - ProtectionRelayFunction.clear_time_limits + ProtectionRelayFunction.clear_time_limits, ) @@ -152,5 +120,5 @@ def test_thresholds_collection(): ProtectionRelayFunction.add_threshold, ProtectionRelayFunction.remove_threshold, ProtectionRelayFunction.remove_threshold_at, - ProtectionRelayFunction.clear_thresholds + ProtectionRelayFunction.clear_thresholds, ) diff --git a/test/cim/iec61970/base/protection/test_protection_relay_scheme.py b/test/cim/iec61970/base/protection/test_protection_relay_scheme.py index 8f1a964f2..d8b2e99fb 100644 --- a/test/cim/iec61970/base/protection/test_protection_relay_scheme.py +++ b/test/cim/iec61970/base/protection/test_protection_relay_scheme.py @@ -5,16 +5,10 @@ from hypothesis import given from cim.fill_fields import protection_relay_scheme_kwargs -from cim.iec61970.base.core.test_identified_object import identified_object_args, verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args +from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ + verify_identified_object_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import ProtectionRelaySystem, ProtectionRelayFunction, ProtectionRelayScheme, generate_id - -protection_relay_scheme_args = [ - *identified_object_args, - ProtectionRelaySystem(mrid=generate_id()), - [ProtectionRelayFunction(mrid=generate_id()), ProtectionRelayFunction(mrid=generate_id())] -] +from zepben.ewb import ProtectionRelayFunction, ProtectionRelayScheme, generate_id def test_protection_relay_scheme_constructor_default(): @@ -30,7 +24,7 @@ def test_protection_relay_scheme_constructor_kwargs(system, functions, **kwargs) prs = ProtectionRelayScheme( system=system, functions=functions, - **kwargs + **kwargs, ) verify_identified_object_constructor_kwargs(prs, **kwargs) @@ -38,16 +32,6 @@ def test_protection_relay_scheme_constructor_kwargs(system, functions, **kwargs) assert list(prs.functions) == functions -def test_protection_relay_scheme_constructor_args(): - prs = ProtectionRelayScheme(*protection_relay_scheme_args) - - verify_identified_object_constructor_args(prs) - assert protection_relay_scheme_args[-2:] == [ - prs.system, - list(prs.functions) - ] - - def test_functions_collection(): validate_unordered( ProtectionRelayScheme, @@ -57,5 +41,5 @@ def test_functions_collection(): ProtectionRelayScheme.get_function, ProtectionRelayScheme.add_function, ProtectionRelayScheme.remove_function, - ProtectionRelayScheme.clear_function + ProtectionRelayScheme.clear_function, ) diff --git a/test/cim/iec61970/base/protection/test_protection_relay_system.py b/test/cim/iec61970/base/protection/test_protection_relay_system.py index f7e2071ef..01192a1be 100644 --- a/test/cim/iec61970/base/protection/test_protection_relay_system.py +++ b/test/cim/iec61970/base/protection/test_protection_relay_system.py @@ -6,17 +6,11 @@ from hypothesis import given from cim.fill_fields import protection_relay_system_kwargs -from cim.iec61970.base.core.test_equipment import equipment_args, verify_equipment_constructor_default, \ - verify_equipment_constructor_kwargs, verify_equipment_constructor_args +from cim.iec61970.base.core.test_equipment import verify_equipment_constructor_default, \ + verify_equipment_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import ProtectionRelaySystem, ProtectionKind, ProtectionRelayScheme, generate_id -protection_relay_system_args = [ - *equipment_args, - ProtectionKind.JDIFF, - [ProtectionRelayScheme(mrid=generate_id()), ProtectionRelayScheme(mrid=generate_id()), ProtectionRelayScheme(mrid=generate_id())] -] - def test_protection_relay_system_constructor_default(): prs = ProtectionRelaySystem(mrid=generate_id()) @@ -31,7 +25,7 @@ def test_protection_relay_system_constructor_kwargs(protection_kind, schemes, ** prs = ProtectionRelaySystem( protection_kind=protection_kind, schemes=schemes, - **kwargs + **kwargs, ) verify_equipment_constructor_kwargs(prs, **kwargs) @@ -39,16 +33,6 @@ def test_protection_relay_system_constructor_kwargs(protection_kind, schemes, ** assert list(prs.schemes) == schemes -def test_protection_relay_system_constructor_args(): - prs = ProtectionRelaySystem(*protection_relay_system_args) - - verify_equipment_constructor_args(prs) - assert protection_relay_system_args[-2:] == [ - prs.protection_kind, - list(prs.schemes) - ] - - def test_schemes_collection(): validate_unordered( ProtectionRelaySystem, @@ -58,5 +42,5 @@ def test_schemes_collection(): ProtectionRelaySystem.get_scheme, ProtectionRelaySystem.add_scheme, ProtectionRelaySystem.remove_scheme, - ProtectionRelaySystem.clear_scheme + ProtectionRelaySystem.clear_scheme, ) diff --git a/test/cim/iec61970/base/protection/test_voltage_relay.py b/test/cim/iec61970/base/protection/test_voltage_relay.py index 65a7040f9..533a10bc2 100644 --- a/test/cim/iec61970/base/protection/test_voltage_relay.py +++ b/test/cim/iec61970/base/protection/test_voltage_relay.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import voltage_relay_kwargs -from cim.iec61970.base.protection.test_protection_relay_function import protection_relay_function_args, \ - verify_protection_relay_function_constructor_default, verify_protection_relay_function_constructor_kwargs, verify_protection_relay_function_constructor_args +from cim.iec61970.base.protection.test_protection_relay_function import verify_protection_relay_function_constructor_default, \ + verify_protection_relay_function_constructor_kwargs from zepben.ewb import VoltageRelay, generate_id -voltage_relay_args = [*protection_relay_function_args] - def test_voltage_relay_constructor_default(): vr = VoltageRelay(mrid=generate_id()) @@ -22,9 +20,3 @@ def test_voltage_relay_constructor_default(): def test_voltage_relay_constructor_kwargs(**kwargs): vr = VoltageRelay(**kwargs) verify_protection_relay_function_constructor_kwargs(vr, **kwargs) - - -def test_voltage_relay_constructor_args(): - vr = VoltageRelay(*voltage_relay_args) - - verify_protection_relay_function_constructor_args(vr) diff --git a/test/cim/iec61970/base/scada/test_remote_control.py b/test/cim/iec61970/base/scada/test_remote_control.py index 471063df2..29c75d07e 100644 --- a/test/cim/iec61970/base/scada/test_remote_control.py +++ b/test/cim/iec61970/base/scada/test_remote_control.py @@ -6,10 +6,8 @@ from cim.fill_fields import remote_control_kwargs from cim.iec61970.base.scada.test_remote_point import verify_remote_point_constructor_default, \ - verify_remote_point_constructor_kwargs, verify_remote_point_constructor_args, remote_point_args -from zepben.ewb import RemoteControl, Control, generate_id - -remote_control_args = [*remote_point_args, Control(mrid=generate_id())] + verify_remote_point_constructor_kwargs +from zepben.ewb import RemoteControl, generate_id def test_remote_control_constructor_default(): @@ -26,13 +24,3 @@ def test_remote_control_constructor_kwargs(control, **kwargs): verify_remote_point_constructor_kwargs(rc, **kwargs) assert rc.control == control - - -def test_remote_control_constructor_args(): - # noinspection PyArgumentList - c = RemoteControl(*remote_control_args) - - verify_remote_point_constructor_args(c) - assert remote_control_args[-1:] == [ - c.control - ] diff --git a/test/cim/iec61970/base/scada/test_remote_point.py b/test/cim/iec61970/base/scada/test_remote_point.py index 5d91c2ee3..1613cc5a1 100644 --- a/test/cim/iec61970/base/scada/test_remote_point.py +++ b/test/cim/iec61970/base/scada/test_remote_point.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb import RemotePoint -remote_point_args = identified_object_args - def verify_remote_point_constructor_default(rp: RemotePoint): verify_identified_object_constructor_default(rp) @@ -16,7 +14,3 @@ def verify_remote_point_constructor_default(rp: RemotePoint): def verify_remote_point_constructor_kwargs(rp: RemotePoint, **kwargs): verify_identified_object_constructor_kwargs(rp, **kwargs) - - -def verify_remote_point_constructor_args(rp: RemotePoint): - verify_identified_object_constructor_args(rp) diff --git a/test/cim/iec61970/base/scada/test_remote_source.py b/test/cim/iec61970/base/scada/test_remote_source.py index 2acadfda1..df693f0e7 100644 --- a/test/cim/iec61970/base/scada/test_remote_source.py +++ b/test/cim/iec61970/base/scada/test_remote_source.py @@ -6,10 +6,8 @@ from cim.fill_fields import remote_source_kwargs from cim.iec61970.base.scada.test_remote_point import verify_remote_point_constructor_default, \ - verify_remote_point_constructor_kwargs, verify_remote_point_constructor_args, remote_point_args -from zepben.ewb import RemoteSource, Measurement, generate_id - -remote_source_args = [*remote_point_args, Measurement(mrid=generate_id())] + verify_remote_point_constructor_kwargs +from zepben.ewb import RemoteSource, generate_id def test_remote_source_constructor_default(): @@ -25,12 +23,3 @@ def test_remote_source_constructor_kwargs(measurement, **kwargs): verify_remote_point_constructor_kwargs(c, **kwargs) assert c.measurement == measurement - - -def test_remote_source_constructor_args(): - c = RemoteSource(*remote_source_args) - - verify_remote_point_constructor_args(c) - assert remote_source_args[-1:] == [ - c.measurement - ] diff --git a/test/cim/iec61970/base/wires/generation/production/test_battery_unit.py b/test/cim/iec61970/base/wires/generation/production/test_battery_unit.py index 824bc3440..80bca9118 100644 --- a/test/cim/iec61970/base/wires/generation/production/test_battery_unit.py +++ b/test/cim/iec61970/base/wires/generation/production/test_battery_unit.py @@ -6,13 +6,10 @@ from cim.fill_fields import battery_unit_kwargs from cim.iec61970.base.wires.generation.production.test_power_electronics_unit import \ - verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs, verify_power_electronics_unit_constructor_args, \ - power_electronics_unit_args + verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import BatteryUnit, BatteryStateKind, BatteryControl, BatteryControlMode, generate_id -battery_unit_args = [*power_electronics_unit_args, BatteryStateKind.full, 1, 2, [BatteryControl(mrid=generate_id())]] - def test_battery_unit_constructor_default(): b = BatteryUnit(mrid=generate_id()) @@ -31,7 +28,7 @@ def test_battery_unit_constructor_kwargs(battery_state, rated_e, stored_e, contr rated_e=rated_e, stored_e=stored_e, controls=controls, - **kwargs + **kwargs, ) verify_power_electronics_unit_constructor_kwargs(b, **kwargs) @@ -41,18 +38,6 @@ def test_battery_unit_constructor_kwargs(battery_state, rated_e, stored_e, contr assert list(b.controls) == controls -def test_battery_unit_constructor_args(): - b = BatteryUnit(*battery_unit_args) - - verify_power_electronics_unit_constructor_args(b) - assert battery_unit_args[-4:] == [ - b.battery_state, - b.rated_e, - b.stored_e, - list(b.controls) - ] - - def test_battery_control_collection(): validate_unordered( BatteryUnit, @@ -62,7 +47,7 @@ def test_battery_control_collection(): BatteryUnit.get_control, BatteryUnit.add_control, BatteryUnit.remove_control, - BatteryUnit.clear_controls + BatteryUnit.clear_controls, ) diff --git a/test/cim/iec61970/base/wires/generation/production/test_photo_voltaic_unit.py b/test/cim/iec61970/base/wires/generation/production/test_photo_voltaic_unit.py index fbd4cf2ac..eecedc084 100644 --- a/test/cim/iec61970/base/wires/generation/production/test_photo_voltaic_unit.py +++ b/test/cim/iec61970/base/wires/generation/production/test_photo_voltaic_unit.py @@ -6,12 +6,9 @@ from cim.fill_fields import photo_voltaic_unit_kwargs from cim.iec61970.base.wires.generation.production.test_power_electronics_unit import \ - verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs, verify_power_electronics_unit_constructor_args, \ - power_electronics_unit_args + verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs from zepben.ewb import PhotoVoltaicUnit, generate_id -photo_voltaic_unit_args = power_electronics_unit_args - def test_photo_voltaic_unit_constructor_default(): verify_power_electronics_unit_constructor_default(PhotoVoltaicUnit(mrid=generate_id())) @@ -20,7 +17,3 @@ def test_photo_voltaic_unit_constructor_default(): @given(**photo_voltaic_unit_kwargs()) def test_photo_voltaic_unit_constructor_kwargs(**kwargs): verify_power_electronics_unit_constructor_kwargs(PhotoVoltaicUnit(**kwargs), **kwargs) - - -def test_photo_voltaic_unit_constructor_args(): - verify_power_electronics_unit_constructor_args(PhotoVoltaicUnit(*photo_voltaic_unit_args)) diff --git a/test/cim/iec61970/base/wires/generation/production/test_power_electronics_unit.py b/test/cim/iec61970/base/wires/generation/production/test_power_electronics_unit.py index ff2a52b85..0c2d81e4d 100644 --- a/test/cim/iec61970/base/wires/generation/production/test_power_electronics_unit.py +++ b/test/cim/iec61970/base/wires/generation/production/test_power_electronics_unit.py @@ -4,10 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_equipment import verify_equipment_constructor_default, \ - verify_equipment_constructor_kwargs, verify_equipment_constructor_args, equipment_args -from zepben.ewb import PowerElectronicsUnit, PowerElectronicsConnection, generate_id - -power_electronics_unit_args = [*equipment_args, PowerElectronicsConnection(mrid=generate_id()), 1, 2] + verify_equipment_constructor_kwargs +from zepben.ewb import PowerElectronicsUnit def verify_power_electronics_unit_constructor_default(peu: PowerElectronicsUnit): @@ -22,12 +20,3 @@ def verify_power_electronics_unit_constructor_kwargs(peu: PowerElectronicsUnit, assert peu.power_electronics_connection == power_electronics_connection assert peu.max_p == max_p assert peu.min_p == min_p - - -def verify_power_electronics_unit_constructor_args(peu: PowerElectronicsUnit): - verify_equipment_constructor_args(peu) - assert power_electronics_unit_args[-3:] == [ - peu.power_electronics_connection, - peu.max_p, - peu.min_p - ] diff --git a/test/cim/iec61970/base/wires/generation/production/test_power_electronics_wind_unit.py b/test/cim/iec61970/base/wires/generation/production/test_power_electronics_wind_unit.py index 4d100648b..41954d3fb 100644 --- a/test/cim/iec61970/base/wires/generation/production/test_power_electronics_wind_unit.py +++ b/test/cim/iec61970/base/wires/generation/production/test_power_electronics_wind_unit.py @@ -6,12 +6,9 @@ from cim.fill_fields import power_electronics_wind_unit_kwargs from cim.iec61970.base.wires.generation.production.test_power_electronics_unit import \ - verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs, verify_power_electronics_unit_constructor_args, \ - power_electronics_unit_args + verify_power_electronics_unit_constructor_default, verify_power_electronics_unit_constructor_kwargs from zepben.ewb import PowerElectronicsWindUnit, generate_id -power_electronics_wind_unit_args = power_electronics_unit_args - def test_power_electronics_wind_unit_constructor_default(): verify_power_electronics_unit_constructor_default(PowerElectronicsWindUnit(mrid=generate_id())) @@ -20,7 +17,3 @@ def test_power_electronics_wind_unit_constructor_default(): @given(**power_electronics_wind_unit_kwargs()) def test_power_electronics_wind_unit_constructor_kwargs(**kwargs): verify_power_electronics_unit_constructor_kwargs(PowerElectronicsWindUnit(**kwargs), **kwargs) - - -def test_power_electronics_wind_unit_constructor_args(): - verify_power_electronics_unit_constructor_args(PowerElectronicsWindUnit(*power_electronics_wind_unit_args)) diff --git a/test/cim/iec61970/base/wires/test_ac_line_segment.py b/test/cim/iec61970/base/wires/test_ac_line_segment.py index 0213e6bc8..c322d2c23 100644 --- a/test/cim/iec61970/base/wires/test_ac_line_segment.py +++ b/test/cim/iec61970/base/wires/test_ac_line_segment.py @@ -7,15 +7,13 @@ from cim.fill_fields import ac_line_segment_kwargs from cim.iec61970.base.wires.test_conductor import verify_conductor_constructor_default, \ - verify_conductor_constructor_kwargs, verify_conductor_constructor_args, conductor_args + verify_conductor_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import AcLineSegment, generate_id, SinglePhaseKind, OverheadWireInfo from zepben.ewb.model.cim.iec61970.base.wires.ac_line_segment_phase import AcLineSegmentPhase from zepben.ewb.model.cim.iec61970.base.wires.per_length_phase_impedance import PerLengthPhaseImpedance from zepben.ewb.model.cim.iec61970.base.wires.per_length_sequence_impedance import PerLengthSequenceImpedance -ac_line_segment_args = [*conductor_args, PerLengthSequenceImpedance(mrid=generate_id())] - def test_ac_line_segment_constructor_default(): als = AcLineSegment(mrid=generate_id()) @@ -36,15 +34,6 @@ def test_ac_line_segment_constructor_kwargs(per_length_impedance, **kwargs): assert als.per_length_phase_impedance != per_length_impedance -def test_ac_line_segment_constructor_args(): - als = AcLineSegment(*ac_line_segment_args) - - verify_conductor_constructor_args(als) - assert ac_line_segment_args[-1:] == [ - als.per_length_impedance - ] - - def test_properties(): acls = AcLineSegment(mrid=generate_id()) plpi = PerLengthPhaseImpedance(mrid=generate_id()) @@ -112,7 +101,7 @@ def test_ac_line_segment_phases(): AcLineSegment.get_phase, AcLineSegment.add_phase, AcLineSegment.remove_phase, - AcLineSegment.clear_phases + AcLineSegment.clear_phases, ) diff --git a/test/cim/iec61970/base/wires/test_ac_line_segment_phase.py b/test/cim/iec61970/base/wires/test_ac_line_segment_phase.py index 5b538c407..9ff5149d2 100644 --- a/test/cim/iec61970/base/wires/test_ac_line_segment_phase.py +++ b/test/cim/iec61970/base/wires/test_ac_line_segment_phase.py @@ -5,13 +5,10 @@ from hypothesis import given from cim.fill_fields import ac_line_segment_phase_kwargs -from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, verify_power_system_resource_constructor_kwargs, \ - verify_power_system_resource_constructor_args, power_system_resource_args -from zepben.ewb import generate_id, AcLineSegment, SinglePhaseKind +from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, verify_power_system_resource_constructor_kwargs +from zepben.ewb import generate_id, SinglePhaseKind from zepben.ewb.model.cim.iec61970.base.wires.ac_line_segment_phase import AcLineSegmentPhase -ac_line_segment_phase_args = [*power_system_resource_args, SinglePhaseKind.A, 0, AcLineSegment(mrid=generate_id())] - def test_ac_line_segment_phase_constructor_default(): als = AcLineSegmentPhase(mrid=generate_id()) @@ -28,21 +25,10 @@ def test_ac_line_segment_phase_constructor_kwargs(phase, sequence_number, ac_lin phase=phase, sequence_number=sequence_number, ac_line_segment=ac_line_segment, - **kwargs + **kwargs, ) verify_power_system_resource_constructor_kwargs(als, **kwargs) assert als.phase == phase assert als.sequence_number == sequence_number assert als.ac_line_segment == ac_line_segment - - -def test_ac_line_segment_phase_constructor_args(): - als = AcLineSegmentPhase(*ac_line_segment_phase_args) - - verify_power_system_resource_constructor_args(als) - assert ac_line_segment_phase_args[-3:] == [ - als.phase, - als.sequence_number, - als.ac_line_segment, - ] diff --git a/test/cim/iec61970/base/wires/test_breaker.py b/test/cim/iec61970/base/wires/test_breaker.py index 983aa2ea4..cd220aac5 100644 --- a/test/cim/iec61970/base/wires/test_breaker.py +++ b/test/cim/iec61970/base/wires/test_breaker.py @@ -6,12 +6,10 @@ from cim.fill_fields import breaker_kwargs from cim.iec61970.base.wires.test_protected_switch import verify_protected_switch_constructor_default, \ - verify_protected_switch_constructor_kwargs, verify_protected_switch_constructor_args, protected_switch_args + verify_protected_switch_constructor_kwargs from zepben.ewb import Breaker, Substation, Terminal, generate_id from zepben.ewb.model.cim.iec61970.base.core.feeder import Feeder -breaker_args = [*protected_switch_args, 1.1] - def test_breaker_constructor_default(): br = Breaker(mrid=generate_id()) @@ -28,15 +26,6 @@ def test_breaker_constructor_kwargs(in_transit_time, **kwargs): assert br.in_transit_time == in_transit_time -def test_breaker_constructor_args(): - br = Breaker(*breaker_args) - verify_protected_switch_constructor_args(br) - - assert breaker_args[-1:] == [ - br.in_transit_time - ] - - def test_is_substation_breaker_when_associated_with_a_substation_equipment(): br = Breaker(mrid=generate_id()) diff --git a/test/cim/iec61970/base/wires/test_busbar_section.py b/test/cim/iec61970/base/wires/test_busbar_section.py index 53d988b89..a126117d8 100644 --- a/test/cim/iec61970/base/wires/test_busbar_section.py +++ b/test/cim/iec61970/base/wires/test_busbar_section.py @@ -6,12 +6,10 @@ from cim.fill_fields import busbar_section_kwargs from cim.iec61970.base.wires.test_connector import verify_connector_constructor_default, \ - verify_connector_constructor_kwargs, verify_connector_constructor_args, connector_args + verify_connector_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.wires.busbar_section import BusbarSection -busbar_section_args = connector_args - def test_busbar_section_constructor_default(): verify_connector_constructor_default(BusbarSection(mrid=generate_id())) @@ -22,9 +20,5 @@ def test_busbar_section_constructor_kwargs(**kwargs): verify_connector_constructor_kwargs(BusbarSection(**kwargs), **kwargs) -def test_busbar_section_constructor_args(): - verify_connector_constructor_args(BusbarSection(*busbar_section_args)) - - def test_busbar_max_terminals_is_one(): assert BusbarSection.max_terminals == 1 diff --git a/test/cim/iec61970/base/wires/test_conductor.py b/test/cim/iec61970/base/wires/test_conductor.py index fb69dde0c..5ddb7646d 100644 --- a/test/cim/iec61970/base/wires/test_conductor.py +++ b/test/cim/iec61970/base/wires/test_conductor.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.wires.conductor import Conductor -conductor_args = [*conducting_equipment_args, 1, 2, 3.3] - def verify_conductor_constructor_default(c: Conductor): verify_conducting_equipment_constructor_default(c) @@ -22,12 +20,3 @@ def verify_conductor_constructor_kwargs(c: Conductor, length, design_temperature assert c.length == length assert c.design_temperature == design_temperature assert c.design_rating == design_rating - - -def verify_conductor_constructor_args(c: Conductor): - verify_conducting_equipment_constructor_args(c) - assert conductor_args[-3:] == [ - c.length, - c.design_temperature, - c.design_rating - ] diff --git a/test/cim/iec61970/base/wires/test_connector.py b/test/cim/iec61970/base/wires/test_connector.py index 1b73072d7..5664f447d 100644 --- a/test/cim/iec61970/base/wires/test_connector.py +++ b/test/cim/iec61970/base/wires/test_connector.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import Connector, Conductor, CableInfo, generate_id -connector_args = conducting_equipment_args - def verify_connector_constructor_default(c: Connector): verify_conducting_equipment_constructor_default(c) @@ -18,10 +16,6 @@ def verify_connector_constructor_kwargs(c: Connector, **kwargs): verify_conducting_equipment_constructor_kwargs(c, **kwargs) -def verify_connector_constructor_args(c: Connector): - verify_conducting_equipment_constructor_args(c) - - def test_is_underground(): c = Conductor(mrid=generate_id()) assert not c.is_underground() diff --git a/test/cim/iec61970/base/wires/test_disconnector.py b/test/cim/iec61970/base/wires/test_disconnector.py index 92f74dd8c..df54645df 100644 --- a/test/cim/iec61970/base/wires/test_disconnector.py +++ b/test/cim/iec61970/base/wires/test_disconnector.py @@ -5,12 +5,9 @@ from hypothesis import given from cim.fill_fields import disconnector_kwargs -from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs, verify_switch_constructor_args, \ - switch_args +from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs from zepben.ewb import Disconnector, generate_id -disconnector_args = switch_args - def test_disconnector_constructor_default(): verify_switch_constructor_default(Disconnector(mrid=generate_id())) @@ -19,7 +16,3 @@ def test_disconnector_constructor_default(): @given(**disconnector_kwargs()) def test_disconnector_constructor_kwargs(**kwargs): verify_switch_constructor_kwargs(Disconnector(**kwargs), **kwargs) - - -def test_disconnector_constructor_args(): - verify_switch_constructor_args(Disconnector(*disconnector_args)) diff --git a/test/cim/iec61970/base/wires/test_earth_fault_compensator.py b/test/cim/iec61970/base/wires/test_earth_fault_compensator.py index 6309360e1..2b44cb24f 100644 --- a/test/cim/iec61970/base/wires/test_earth_fault_compensator.py +++ b/test/cim/iec61970/base/wires/test_earth_fault_compensator.py @@ -2,12 +2,9 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from cim.iec61970.base.core.test_conducting_equipment import conducting_equipment_args, \ - verify_conducting_equipment_constructor_default, verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args +from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, verify_conducting_equipment_constructor_kwargs from zepben.ewb import EarthFaultCompensator -earth_fault_compensator_args = [*conducting_equipment_args, 1.0] - def verify_earth_fault_compensator_constructor_default(efc: EarthFaultCompensator): verify_conducting_equipment_constructor_default(efc) @@ -17,10 +14,3 @@ def verify_earth_fault_compensator_constructor_default(efc: EarthFaultCompensato def verify_earth_fault_compensator_constructor_kwargs(efc: EarthFaultCompensator, r, **kwargs): verify_conducting_equipment_constructor_kwargs(efc, **kwargs) assert efc.r == r - - -def verify_earth_fault_compensator_constructor_args(efc: EarthFaultCompensator): - verify_conducting_equipment_constructor_args(efc) - assert earth_fault_compensator_args[-1:] == [ - efc.r - ] diff --git a/test/cim/iec61970/base/wires/test_energy_connection.py b/test/cim/iec61970/base/wires/test_energy_connection.py index 1d77c45fe..79e5e2dad 100644 --- a/test/cim/iec61970/base/wires/test_energy_connection.py +++ b/test/cim/iec61970/base/wires/test_energy_connection.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import EnergyConnection -energy_connection_args = conducting_equipment_args - def verify_energy_connection_constructor_default(ec: EnergyConnection): verify_conducting_equipment_constructor_default(ec) @@ -16,7 +14,3 @@ def verify_energy_connection_constructor_default(ec: EnergyConnection): def verify_energy_connection_constructor_kwargs(ec: EnergyConnection, **kwargs): verify_conducting_equipment_constructor_kwargs(ec, **kwargs) - - -def verify_energy_connection_constructor_args(ec: EnergyConnection): - verify_conducting_equipment_constructor_args(ec) diff --git a/test/cim/iec61970/base/wires/test_energy_consumer.py b/test/cim/iec61970/base/wires/test_energy_consumer.py index f68fe734b..c71348ae2 100644 --- a/test/cim/iec61970/base/wires/test_energy_consumer.py +++ b/test/cim/iec61970/base/wires/test_energy_consumer.py @@ -6,13 +6,11 @@ from cim.fill_fields import energy_consumer_kwargs from cim.iec61970.base.wires.test_energy_connection import verify_energy_connection_constructor_default, \ - verify_energy_connection_constructor_kwargs, verify_energy_connection_constructor_args, energy_connection_args + verify_energy_connection_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import EnergyConsumer, PhaseShuntConnectionKind, generate_id from zepben.ewb.model.cim.iec61970.base.wires.energy_consumer_phase import EnergyConsumerPhase -energy_consumer_args = [*energy_connection_args, [EnergyConsumerPhase(mrid=generate_id())], 1, True, PhaseShuntConnectionKind.Y, 2.2, 3.3, 4.4, 5.5] - def test_energy_consumer_constructor_default(): ec = EnergyConsumer(mrid=generate_id()) @@ -39,7 +37,7 @@ def test_energy_consumer_constructor_kwargs(energy_consumer_phases, customer_cou p_fixed=p_fixed, q=q, q_fixed=q_fixed, - **kwargs + **kwargs, ) verify_energy_connection_constructor_kwargs(ec, **kwargs) @@ -53,22 +51,6 @@ def test_energy_consumer_constructor_kwargs(energy_consumer_phases, customer_cou assert ec.q_fixed == q_fixed -def test_energy_consumer_constructor_args(): - ec = EnergyConsumer(*energy_consumer_args) - - verify_energy_connection_constructor_args(ec) - assert energy_consumer_args[-8:] == [ - list(ec.phases), - ec.customer_count, - ec.grounded, - ec.phase_connection, - ec.p, - ec.p_fixed, - ec.q, - ec.q_fixed - ] - - def test_phases_collection(): validate_unordered( EnergyConsumer, @@ -78,5 +60,5 @@ def test_phases_collection(): EnergyConsumer.get_phase, EnergyConsumer.add_phase, EnergyConsumer.remove_phase, - EnergyConsumer.clear_phases + EnergyConsumer.clear_phases, ) diff --git a/test/cim/iec61970/base/wires/test_energy_source.py b/test/cim/iec61970/base/wires/test_energy_source.py index acf35ee6e..c85556baa 100644 --- a/test/cim/iec61970/base/wires/test_energy_source.py +++ b/test/cim/iec61970/base/wires/test_energy_source.py @@ -6,40 +6,10 @@ from cim.fill_fields import energy_source_kwargs from cim.iec61970.base.wires.test_energy_connection import verify_energy_connection_constructor_default, \ - verify_energy_connection_constructor_kwargs, verify_energy_connection_constructor_args, energy_connection_args + verify_energy_connection_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import EnergySource, EnergySourcePhase, generate_id -energy_source_args = [ - *energy_connection_args, - [EnergySourcePhase(mrid=generate_id())], - 1.1, - 2.2, - 3.3, - 4.4, - 5.5, - 6.6, - 7.7, - 8.8, - 9.9, - 10.01, - 11.11, - 12.21, - True, - 13.31, - 14.41, - 15.51, - 16.61, - 17.71, - 18.81, - 19.91, - 20.02, - 21.12, - 22.22, - 23.32, - 24.42 -] - def test_energy_source_constructor_default(): es = EnergySource(mrid=generate_id()) @@ -74,9 +44,11 @@ def test_energy_source_constructor_default(): @given(**energy_source_kwargs()) -def test_energy_source_constructor_kwargs(energy_source_phases, active_power, reactive_power, voltage_angle, voltage_magnitude, p_max, p_min, - r, r0, rn, x, x0, xn, is_external_grid, r_min, rn_min, r0_min, x_min, xn_min, x0_min, - r_max, rn_max, r0_max, x_max, xn_max, x0_max, **kwargs): +def test_energy_source_constructor_kwargs( + energy_source_phases, active_power, reactive_power, voltage_angle, voltage_magnitude, p_max, p_min, + r, r0, rn, x, x0, xn, is_external_grid, r_min, rn_min, r0_min, x_min, xn_min, x0_min, + r_max, rn_max, r0_max, x_max, xn_max, x0_max, **kwargs, +): es = EnergySource( energy_source_phases=energy_source_phases, active_power=active_power, @@ -104,7 +76,7 @@ def test_energy_source_constructor_kwargs(energy_source_phases, active_power, re x_max=x_max, xn_max=xn_max, x0_max=x0_max, - **kwargs + **kwargs, ) verify_energy_connection_constructor_kwargs(es, **kwargs) @@ -136,40 +108,6 @@ def test_energy_source_constructor_kwargs(energy_source_phases, active_power, re assert es.x0_max == x0_max -def test_energy_source_constructor_args(): - es = EnergySource(*energy_source_args) - - verify_energy_connection_constructor_args(es) - assert energy_source_args[-26:] == [ - list(es.phases), - es.active_power, - es.reactive_power, - es.voltage_angle, - es.voltage_magnitude, - es.p_max, - es.p_min, - es.r, - es.r0, - es.rn, - es.x, - es.x0, - es.xn, - es.is_external_grid, - es.r_min, - es.rn_min, - es.r0_min, - es.x_min, - es.xn_min, - es.x0_min, - es.r_max, - es.rn_max, - es.r0_max, - es.x_max, - es.xn_max, - es.x0_max - ] - - def test_phases_collection(): validate_unordered( EnergySource, @@ -179,5 +117,5 @@ def test_phases_collection(): EnergySource.get_phase, EnergySource.add_phase, EnergySource.remove_phase, - EnergySource.clear_phases + EnergySource.clear_phases, ) diff --git a/test/cim/iec61970/base/wires/test_fuse.py b/test/cim/iec61970/base/wires/test_fuse.py index b712efd93..87da07d39 100644 --- a/test/cim/iec61970/base/wires/test_fuse.py +++ b/test/cim/iec61970/base/wires/test_fuse.py @@ -5,11 +5,8 @@ from hypothesis import given from cim.fill_fields import fuse_kwargs -from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs, verify_switch_constructor_args, \ - switch_args -from zepben.ewb import Fuse, ProtectionRelayFunction, generate_id - -fuse_args = [*switch_args, ProtectionRelayFunction(mrid=generate_id())] +from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs +from zepben.ewb import Fuse, generate_id def test_fuse_constructor_default(): @@ -23,9 +20,3 @@ def test_fuse_constructor_kwargs(function, **kwargs): f = Fuse(function=function, **kwargs) verify_switch_constructor_kwargs(f, **kwargs) assert f.function == function - - -def test_fuse_constructor_args(): - f = Fuse(*fuse_args) - verify_switch_constructor_args(f) - assert f.function == fuse_args[-1] diff --git a/test/cim/iec61970/base/wires/test_ground.py b/test/cim/iec61970/base/wires/test_ground.py index 6b01f716b..c1e5f2acc 100644 --- a/test/cim/iec61970/base/wires/test_ground.py +++ b/test/cim/iec61970/base/wires/test_ground.py @@ -6,13 +6,9 @@ from hypothesis import given from cim.fill_fields import ground_kwargs -from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, verify_conducting_equipment_constructor_kwargs, \ - verify_conducting_equipment_constructor_args, \ - conducting_equipment_args +from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, verify_conducting_equipment_constructor_kwargs from zepben.ewb import Ground, generate_id -ground_args = conducting_equipment_args - def test_ground_constructor_default(): verify_conducting_equipment_constructor_default(Ground(mrid=generate_id())) @@ -21,7 +17,3 @@ def test_ground_constructor_default(): @given(**ground_kwargs()) def test_ground_constructor_kwargs(**kwargs): verify_conducting_equipment_constructor_kwargs(Ground(**kwargs), **kwargs) - - -def test_ground_constructor_args(): - verify_conducting_equipment_constructor_args(Ground(*ground_args)) diff --git a/test/cim/iec61970/base/wires/test_ground_disconnector.py b/test/cim/iec61970/base/wires/test_ground_disconnector.py index 445c87698..2c24de8ec 100644 --- a/test/cim/iec61970/base/wires/test_ground_disconnector.py +++ b/test/cim/iec61970/base/wires/test_ground_disconnector.py @@ -5,12 +5,9 @@ from hypothesis import given from cim.fill_fields import ground_disconnector_kwargs -from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs, verify_switch_constructor_args, \ - switch_args +from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs from zepben.ewb import GroundDisconnector, generate_id -ground_disconnector_args = switch_args - def test_ground_disconnector_constructor_default(): verify_switch_constructor_default(GroundDisconnector(mrid=generate_id())) @@ -19,7 +16,3 @@ def test_ground_disconnector_constructor_default(): @given(**ground_disconnector_kwargs()) def test_ground_disconnector_constructor_kwargs(**kwargs): verify_switch_constructor_kwargs(GroundDisconnector(**kwargs), **kwargs) - - -def test_ground_disconnector_constructor_args(): - verify_switch_constructor_args(GroundDisconnector(*ground_disconnector_args)) diff --git a/test/cim/iec61970/base/wires/test_grounding_impedance.py b/test/cim/iec61970/base/wires/test_grounding_impedance.py index f17a36c0f..4a99a402a 100644 --- a/test/cim/iec61970/base/wires/test_grounding_impedance.py +++ b/test/cim/iec61970/base/wires/test_grounding_impedance.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import grounding_impedance_kwargs -from cim.iec61970.base.wires.test_earth_fault_compensator import earth_fault_compensator_args, \ - verify_earth_fault_compensator_constructor_default, verify_earth_fault_compensator_constructor_kwargs, verify_earth_fault_compensator_constructor_args +from cim.iec61970.base.wires.test_earth_fault_compensator import verify_earth_fault_compensator_constructor_default, \ + verify_earth_fault_compensator_constructor_kwargs from zepben.ewb import GroundingImpedance -grounding_impedance_args = [*earth_fault_compensator_args, 1.0] - def verify_grounding_impedance_constructor_default(): gi = GroundingImpedance() @@ -25,12 +23,3 @@ def verify_grounding_impedance_constructor_kwargs(x, **kwargs): verify_earth_fault_compensator_constructor_kwargs(gi, **kwargs) assert gi.x == x - - -def verify_grounding_impedance_constructor_args(): - gi = GroundingImpedance(*grounding_impedance_args) - - verify_earth_fault_compensator_constructor_args(gi) - assert grounding_impedance_args[-1:] == [ - gi.x - ] diff --git a/test/cim/iec61970/base/wires/test_jumper.py b/test/cim/iec61970/base/wires/test_jumper.py index 8e43cc59b..92fb10fe7 100644 --- a/test/cim/iec61970/base/wires/test_jumper.py +++ b/test/cim/iec61970/base/wires/test_jumper.py @@ -5,12 +5,9 @@ from hypothesis import given from cim.fill_fields import jumper_kwargs -from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs, verify_switch_constructor_args, \ - switch_args +from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs from zepben.ewb import Jumper, generate_id -jumper_args = switch_args - def test_jumper_constructor_default(): verify_switch_constructor_default(Jumper(mrid=generate_id())) @@ -19,7 +16,3 @@ def test_jumper_constructor_default(): @given(**jumper_kwargs()) def test_jumper_constructor_kwargs(**kwargs): verify_switch_constructor_kwargs(Jumper(**kwargs), **kwargs) - - -def test_jumper_constructor_args(): - verify_switch_constructor_args(Jumper(*jumper_args)) diff --git a/test/cim/iec61970/base/wires/test_junction.py b/test/cim/iec61970/base/wires/test_junction.py index be93bcca6..837343205 100644 --- a/test/cim/iec61970/base/wires/test_junction.py +++ b/test/cim/iec61970/base/wires/test_junction.py @@ -6,12 +6,10 @@ from cim.fill_fields import junction_kwargs from cim.iec61970.base.wires.test_connector import verify_connector_constructor_default, \ - verify_connector_constructor_kwargs, verify_connector_constructor_args, connector_args + verify_connector_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.wires.junction import Junction -junction_args = connector_args - def test_junction_constructor_default(): verify_connector_constructor_default(Junction(mrid=generate_id())) @@ -20,7 +18,3 @@ def test_junction_constructor_default(): @given(**junction_kwargs()) def test_junction_constructor_kwargs(**kwargs): verify_connector_constructor_kwargs(Junction(**kwargs), **kwargs) - - -def test_junction_constructor_args(): - verify_connector_constructor_args(Junction(*junction_args)) diff --git a/test/cim/iec61970/base/wires/test_line.py b/test/cim/iec61970/base/wires/test_line.py index 4f91f0279..458f51f4d 100644 --- a/test/cim/iec61970/base/wires/test_line.py +++ b/test/cim/iec61970/base/wires/test_line.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_equipment_container import verify_equipment_container_constructor_default, \ - verify_equipment_container_constructor_kwargs, verify_equipment_container_constructor_args, equipment_container_args + verify_equipment_container_constructor_kwargs from zepben.ewb import Line -line_args = equipment_container_args - def verify_line_constructor_default(line: Line): verify_equipment_container_constructor_default(line) @@ -16,7 +14,3 @@ def verify_line_constructor_default(line: Line): def verify_line_constructor_kwargs(line: Line, **kwargs): verify_equipment_container_constructor_kwargs(line, **kwargs) - - -def verify_line_constructor_args(line: Line): - verify_equipment_container_constructor_args(line) diff --git a/test/cim/iec61970/base/wires/test_linear_shunt_compensator.py b/test/cim/iec61970/base/wires/test_linear_shunt_compensator.py index 3404c4c66..ace3e5c8d 100644 --- a/test/cim/iec61970/base/wires/test_linear_shunt_compensator.py +++ b/test/cim/iec61970/base/wires/test_linear_shunt_compensator.py @@ -5,14 +5,11 @@ from hypothesis import given -from zepben.ewb import generate_id, PhaseCode -from zepben.ewb.model.cim.iec61970.base.wires.linear_shunt_compensator import LinearShuntCompensator - from cim.fill_fields import linear_shunt_compensator_kwargs from cim.iec61970.base.wires.test_shunt_compensator import verify_shunt_compensator_constructor_default, \ - verify_shunt_compensator_constructor_kwargs, verify_shunt_compensator_constructor_args, shunt_compensator_args - -linear_shunt_compensator_args = [*shunt_compensator_args, 1.1, 2.2, 3.3, 4.4] + verify_shunt_compensator_constructor_kwargs +from zepben.ewb import generate_id, PhaseCode +from zepben.ewb.model.cim.iec61970.base.wires.linear_shunt_compensator import LinearShuntCompensator def test_linear_shunt_compensator_constructor_default(): @@ -42,7 +39,7 @@ def test_linear_shunt_compensator_constructor_kwargs(b0_per_section, b_per_secti b_per_section=b_per_section, g0_per_section=g0_per_section, g_per_section=g_per_section, - **kwargs + **kwargs, ) verify_shunt_compensator_constructor_kwargs(lsc, **kwargs) @@ -50,15 +47,3 @@ def test_linear_shunt_compensator_constructor_kwargs(b0_per_section, b_per_secti assert lsc.b_per_section == b_per_section assert lsc.g0_per_section == g0_per_section assert lsc.g_per_section == g_per_section - - -def test_linear_shunt_compensator_constructor_args(): - lsc = LinearShuntCompensator(*linear_shunt_compensator_args) - - verify_shunt_compensator_constructor_args(lsc) - assert linear_shunt_compensator_args[-4:] == [ - lsc.b0_per_section, - lsc.b_per_section, - lsc.g0_per_section, - lsc.g_per_section - ] diff --git a/test/cim/iec61970/base/wires/test_load_break_switch.py b/test/cim/iec61970/base/wires/test_load_break_switch.py index 442debfff..f08e2ab1f 100644 --- a/test/cim/iec61970/base/wires/test_load_break_switch.py +++ b/test/cim/iec61970/base/wires/test_load_break_switch.py @@ -6,11 +6,9 @@ from cim.fill_fields import load_break_switch_kwargs from cim.iec61970.base.wires.test_protected_switch import verify_protected_switch_constructor_default, \ - verify_protected_switch_constructor_kwargs, verify_protected_switch_constructor_args, protected_switch_args + verify_protected_switch_constructor_kwargs from zepben.ewb import LoadBreakSwitch, generate_id -load_break_switch_args = protected_switch_args - def test_load_break_switch_constructor_default(): verify_protected_switch_constructor_default(LoadBreakSwitch(mrid=generate_id())) @@ -19,7 +17,3 @@ def test_load_break_switch_constructor_default(): @given(**load_break_switch_kwargs()) def test_load_break_switch_constructor_kwargs(**kwargs): verify_protected_switch_constructor_kwargs(LoadBreakSwitch(**kwargs), **kwargs) - - -def test_load_break_switch_constructor_args(): - verify_protected_switch_constructor_args(LoadBreakSwitch(*load_break_switch_args)) diff --git a/test/cim/iec61970/base/wires/test_per_length_impedance.py b/test/cim/iec61970/base/wires/test_per_length_impedance.py index 6c0ea09de..fd55f5616 100644 --- a/test/cim/iec61970/base/wires/test_per_length_impedance.py +++ b/test/cim/iec61970/base/wires/test_per_length_impedance.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.wires.test_per_length_line_parameter import verify_per_length_line_parameter_constructor_default, \ - verify_per_length_line_parameter_constructor_kwargs, verify_per_length_line_parameter_constructor_args, per_length_line_parameter_args + verify_per_length_line_parameter_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.wires.per_length_impedance import PerLengthImpedance -per_length_impedance_args = per_length_line_parameter_args - def verify_per_length_impedance_constructor_default(pli: PerLengthImpedance): verify_per_length_line_parameter_constructor_default(pli) @@ -16,7 +14,3 @@ def verify_per_length_impedance_constructor_default(pli: PerLengthImpedance): def verify_per_length_impedance_constructor_kwargs(pli: PerLengthImpedance, **kwargs): verify_per_length_line_parameter_constructor_kwargs(pli, **kwargs) - - -def verify_per_length_impedance_constructor_args(pli: PerLengthImpedance): - verify_per_length_line_parameter_constructor_args(pli) diff --git a/test/cim/iec61970/base/wires/test_per_length_line_parameter.py b/test/cim/iec61970/base/wires/test_per_length_line_parameter.py index 0de041367..9a7994fb8 100644 --- a/test/cim/iec61970/base/wires/test_per_length_line_parameter.py +++ b/test/cim/iec61970/base/wires/test_per_length_line_parameter.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args + verify_identified_object_constructor_kwargs from zepben.ewb.model.cim.iec61970.base.wires.per_length_line_parameter import PerLengthLineParameter -per_length_line_parameter_args = identified_object_args - def verify_per_length_line_parameter_constructor_default(pllp: PerLengthLineParameter): verify_identified_object_constructor_default(pllp) @@ -16,7 +14,3 @@ def verify_per_length_line_parameter_constructor_default(pllp: PerLengthLinePara def verify_per_length_line_parameter_constructor_kwargs(pllp: PerLengthLineParameter, **kwargs): verify_identified_object_constructor_kwargs(pllp, **kwargs) - - -def verify_per_length_line_parameter_constructor_args(pllp: PerLengthLineParameter): - verify_identified_object_constructor_args(pllp) diff --git a/test/cim/iec61970/base/wires/test_per_length_phase_impedance.py b/test/cim/iec61970/base/wires/test_per_length_phase_impedance.py index 1126183bf..f14436b36 100644 --- a/test/cim/iec61970/base/wires/test_per_length_phase_impedance.py +++ b/test/cim/iec61970/base/wires/test_per_length_phase_impedance.py @@ -7,15 +7,13 @@ from cim.fill_fields import per_length_phase_impedance_kwargs from cim.iec61970.base.wires.test_per_length_impedance import verify_per_length_impedance_constructor_default, \ - verify_per_length_impedance_constructor_kwargs, verify_per_length_impedance_constructor_args, per_length_impedance_args + verify_per_length_impedance_constructor_kwargs from cim.private_collection_validator import validate_unordered_other from util import assert_or_empty from zepben.ewb import SinglePhaseKind, single_phase_kind_by_id, generate_id from zepben.ewb.model.cim.iec61970.base.wires.per_length_phase_impedance import PerLengthPhaseImpedance from zepben.ewb.model.cim.iec61970.base.wires.phase_impedance_data import PhaseImpedanceData -per_length_phase_impedance_args = [*per_length_impedance_args, [PhaseImpedanceData(SinglePhaseKind.A, SinglePhaseKind.A)]] - def test_per_length_phase_impedance_constructor_default(): plpi = PerLengthPhaseImpedance(mrid=generate_id()) @@ -33,16 +31,6 @@ def test_per_length_phase_impedance_constructor_kwargs(data, **kwargs): assert_or_empty(plpi.data, data) -def test_per_length_phase_impedance_constructor_args(): - # noinspection PyArgumentList - plpi = PerLengthPhaseImpedance(*per_length_phase_impedance_args) - - verify_per_length_impedance_constructor_args(plpi) - assert per_length_phase_impedance_args[-1:] == [ - list(plpi.data), - ] - - @pytest.mark.timeout(10000) def test_phase_impedance_data(): validate_unordered_other( @@ -55,7 +43,7 @@ def test_phase_impedance_data(): PerLengthPhaseImpedance.remove_data, PerLengthPhaseImpedance.clear_data, lambda it: (it.from_phase, it.to_phase), - lambda rs: f"from_phase {rs[0]} and to_phase {rs[1]}" + lambda rs: f"from_phase {rs[0]} and to_phase {rs[1]}", ) diff --git a/test/cim/iec61970/base/wires/test_per_length_sequence_impedance.py b/test/cim/iec61970/base/wires/test_per_length_sequence_impedance.py index ef322b09f..8218395da 100644 --- a/test/cim/iec61970/base/wires/test_per_length_sequence_impedance.py +++ b/test/cim/iec61970/base/wires/test_per_length_sequence_impedance.py @@ -6,12 +6,10 @@ from cim.fill_fields import per_length_sequence_impedance_kwargs from cim.iec61970.base.wires.test_per_length_impedance import verify_per_length_impedance_constructor_default, \ - verify_per_length_impedance_constructor_kwargs, verify_per_length_impedance_constructor_args, per_length_impedance_args + verify_per_length_impedance_constructor_kwargs from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.wires.per_length_sequence_impedance import PerLengthSequenceImpedance -per_length_sequence_impedance_args = [*per_length_impedance_args, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8] - def test_per_length_sequence_impedance_constructor_default(): plsi = PerLengthSequenceImpedance(mrid=generate_id()) @@ -41,20 +39,3 @@ def test_per_length_sequence_impedance_constructor_kwargs(r, x, bch, gch, r0, x0 assert plsi.x0 == x0 assert plsi.b0ch == b0ch assert plsi.g0ch == g0ch - - -def test_per_length_sequence_impedance_constructor_args(): - # noinspection PyArgumentList - plsi = PerLengthSequenceImpedance(*per_length_sequence_impedance_args) - - verify_per_length_impedance_constructor_args(plsi) - assert per_length_sequence_impedance_args[-8:] == [ - plsi.r, - plsi.x, - plsi.bch, - plsi.gch, - plsi.r0, - plsi.x0, - plsi.b0ch, - plsi.g0ch - ] diff --git a/test/cim/iec61970/base/wires/test_petersen_coil.py b/test/cim/iec61970/base/wires/test_petersen_coil.py index 44ff9d845..2e6374349 100644 --- a/test/cim/iec61970/base/wires/test_petersen_coil.py +++ b/test/cim/iec61970/base/wires/test_petersen_coil.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import petersen_coil_kwargs -from cim.iec61970.base.wires.test_earth_fault_compensator import earth_fault_compensator_args, \ - verify_earth_fault_compensator_constructor_default, verify_earth_fault_compensator_constructor_kwargs, verify_earth_fault_compensator_constructor_args +from cim.iec61970.base.wires.test_earth_fault_compensator import verify_earth_fault_compensator_constructor_default, \ + verify_earth_fault_compensator_constructor_kwargs from zepben.ewb import PetersenCoil -petersen_coil_args = [*earth_fault_compensator_args, 1.0] - def verify_petersen_coil_constructor_default(): pc = PetersenCoil() @@ -25,12 +23,3 @@ def verify_petersen_coil_constructor_kwargs(x_ground_nominal, **kwargs): verify_earth_fault_compensator_constructor_kwargs(pc, **kwargs) assert pc.x_ground_nominal == x_ground_nominal - - -def verify_petersen_coil_constructor_args(): - pc = PetersenCoil(*petersen_coil_args) - - verify_earth_fault_compensator_constructor_args(pc) - assert petersen_coil_args[-1:] == [ - pc.x_ground_nominal - ] diff --git a/test/cim/iec61970/base/wires/test_phase_impedance_data.py b/test/cim/iec61970/base/wires/test_phase_impedance_data.py index 10bb14b47..926147768 100644 --- a/test/cim/iec61970/base/wires/test_phase_impedance_data.py +++ b/test/cim/iec61970/base/wires/test_phase_impedance_data.py @@ -9,8 +9,6 @@ from zepben.ewb import SinglePhaseKind from zepben.ewb.model.cim.iec61970.base.wires.phase_impedance_data import PhaseImpedanceData -phase_impedance_data_args = [SinglePhaseKind.B, SinglePhaseKind.C, 1.1, 2.2, 3.3, 4.4] - # noinspection PyArgumentList def test_data_constructor_default(): @@ -46,16 +44,3 @@ def test_phase_impedance_data_constructor_kwargs(from_phase, to_phase, b, g, r, assert phase_impedance_data.g == g assert phase_impedance_data.r == r assert phase_impedance_data.x == x - - -def test_phase_impedance_data_constructor_args(): - phase_impedance_data = PhaseImpedanceData(*phase_impedance_data_args) - - assert phase_impedance_data_args[-6:] == [ - phase_impedance_data.from_phase, - phase_impedance_data.to_phase, - phase_impedance_data.b, - phase_impedance_data.g, - phase_impedance_data.r, - phase_impedance_data.x - ] diff --git a/test/cim/iec61970/base/wires/test_power_electronics_connection.py b/test/cim/iec61970/base/wires/test_power_electronics_connection.py index e29fb1058..d333af75a 100644 --- a/test/cim/iec61970/base/wires/test_power_electronics_connection.py +++ b/test/cim/iec61970/base/wires/test_power_electronics_connection.py @@ -9,48 +9,11 @@ from cim.fill_fields import power_electronics_connection_kwargs from cim.iec61970.base.wires.test_regulating_cond_eq import verify_regulating_cond_eq_constructor_default, \ - verify_regulating_cond_eq_constructor_kwargs, verify_regulating_cond_eq_constructor_args, regulating_cond_eq_args + verify_regulating_cond_eq_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import PowerElectronicsUnit, BatteryUnit, PowerElectronicsConnection, generate_id +from zepben.ewb import PowerElectronicsUnit, PowerElectronicsConnection, generate_id from zepben.ewb.model.cim.iec61970.base.wires.power_electronics_connection_phase import PowerElectronicsConnectionPhase -power_electronics_connection_args = [ - *regulating_cond_eq_args, - 1, - 2.2, - 3.3, - 4.4, - 5.5, - 6, - 7, - "1", - 208, - 51.9, - 47.10, - False, - 211, - 228, - 248, - 258, - 0.15, - 0.16, - 0.17, - 0.18, - True, - 219, - 220, - 221, - 222, - 0.23, - 0.24, - 0.25, - 0.26, - False, - 0.27, - [BatteryUnit(mrid=generate_id()), BatteryUnit(mrid=generate_id())], - [PowerElectronicsConnectionPhase(mrid=generate_id()), PowerElectronicsConnectionPhase(mrid=generate_id())] -] - def test_power_electronics_connection_constructor_default(): pec = PowerElectronicsConnection(mrid=generate_id()) @@ -126,7 +89,7 @@ def test_power_electronics_connection_constructor_kwargs( inv_fix_reactive_power, power_electronics_units, power_electronics_connection_phases, - **kwargs + **kwargs, ): pec = PowerElectronicsConnection( max_i_fault=max_i_fault, @@ -162,7 +125,7 @@ def test_power_electronics_connection_constructor_kwargs( inv_fix_reactive_power=inv_fix_reactive_power, power_electronics_units=power_electronics_units, power_electronics_connection_phases=power_electronics_connection_phases, - **kwargs + **kwargs, ) verify_regulating_cond_eq_constructor_kwargs(pec, **kwargs) @@ -201,47 +164,6 @@ def test_power_electronics_connection_constructor_kwargs( assert list(pec.phases) == power_electronics_connection_phases -def test_power_electronics_connection_constructor_args(): - pec = PowerElectronicsConnection(*power_electronics_connection_args) - - verify_regulating_cond_eq_constructor_args(pec) - assert power_electronics_connection_args[-33:] == [ - pec.max_i_fault, - pec.p, - pec.q, - pec.max_q, - pec.min_q, - pec.rated_s, - pec.rated_u, - pec.inverter_standard, - pec.sustain_op_overvolt_limit, - pec.stop_at_over_freq, - pec.stop_at_under_freq, - pec.inv_volt_watt_resp_mode, - pec.inv_watt_resp_v1, - pec.inv_watt_resp_v2, - pec.inv_watt_resp_v3, - pec.inv_watt_resp_v4, - pec.inv_watt_resp_p_at_v1, - pec.inv_watt_resp_p_at_v2, - pec.inv_watt_resp_p_at_v3, - pec.inv_watt_resp_p_at_v4, - pec.inv_volt_var_resp_mode, - pec.inv_var_resp_v1, - pec.inv_var_resp_v2, - pec.inv_var_resp_v3, - pec.inv_var_resp_v4, - pec.inv_var_resp_q_at_v1, - pec.inv_var_resp_q_at_v2, - pec.inv_var_resp_q_at_v3, - pec.inv_var_resp_q_at_v4, - pec.inv_reactive_power_mode, - pec.inv_fix_reactive_power, - list(pec.units), - list(pec.phases) - ] - - def test_power_electronics_units_collection(): validate_unordered( PowerElectronicsConnection, @@ -251,7 +173,7 @@ def test_power_electronics_units_collection(): PowerElectronicsConnection.get_unit, PowerElectronicsConnection.add_unit, PowerElectronicsConnection.remove_unit, - PowerElectronicsConnection.clear_units + PowerElectronicsConnection.clear_units, ) @@ -264,75 +186,75 @@ def test_power_electronics_connection_phases_collection(): PowerElectronicsConnection.get_phase, PowerElectronicsConnection.add_phase, PowerElectronicsConnection.remove_phase, - PowerElectronicsConnection.clear_phases + PowerElectronicsConnection.clear_phases, ) def test_power_electronics_connection_property_bounds(): with raises(ValueError, match=re.escape("inv_watt_resp_v1 [199] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v1=199) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v1=199) with raises(ValueError, match=re.escape("inv_watt_resp_v1 [301] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v1=301) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v1=301) with raises(ValueError, match=re.escape("inv_watt_resp_v2 [215] must be between 216 and 230.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v2=215) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v2=215) with raises(ValueError, match=re.escape("inv_watt_resp_v2 [231] must be between 216 and 230.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v2=231) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v2=231) with raises(ValueError, match=re.escape("inv_watt_resp_v3 [234] must be between 235 and 255.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v3=234) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v3=234) with raises(ValueError, match=re.escape("inv_watt_resp_v3 [256] must be between 235 and 255.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v3=256) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v3=256) with raises(ValueError, match=re.escape("inv_watt_resp_v4 [243] must be between 244 and 265.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v4=243) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v4=243) with raises(ValueError, match=re.escape("inv_watt_resp_v4 [266] must be between 244 and 265.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_v4=266) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_v4=266) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v1 [-0.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v1=-0.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v1=-0.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v1 [1.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v1=1.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v1=1.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v2 [-0.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v2=-0.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v2=-0.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v2 [1.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v2=1.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v2=1.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v3 [-0.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v3=-0.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v3=-0.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v3 [1.01] must be between 0.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v3=1.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v3=1.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v4 [-0.01] must be between 0.0 and 0.2.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v4=-0.01) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v4=-0.01) with raises(ValueError, match=re.escape("inv_watt_resp_p_at_v4 [0.21] must be between 0.0 and 0.2.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_watt_resp_p_at_v4=0.21) + PowerElectronicsConnection(mrid="mrid", inv_watt_resp_p_at_v4=0.21) with raises(ValueError, match=re.escape("inv_var_resp_v1 [199] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v1=199) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v1=199) with raises(ValueError, match=re.escape("inv_var_resp_v1 [301] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v1=301) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v1=301) with raises(ValueError, match=re.escape("inv_var_resp_v2 [199] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v2=199) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v2=199) with raises(ValueError, match=re.escape("inv_var_resp_v2 [301] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v2=301) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v2=301) with raises(ValueError, match=re.escape("inv_var_resp_v3 [199] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v3=199) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v3=199) with raises(ValueError, match=re.escape("inv_var_resp_v3 [301] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v3=301) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v3=301) with raises(ValueError, match=re.escape("inv_var_resp_v4 [199] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v4=199) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v4=199) with raises(ValueError, match=re.escape("inv_var_resp_v4 [301] must be between 200 and 300.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_v4=301) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_v4=301) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v1 [-0.01] must be between 0.0 and 0.6.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v1=-0.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v1=-0.01) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v1 [0.61] must be between 0.0 and 0.6.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v1=0.61) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v1=0.61) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v2 [-1.01] must be between -1.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v2=-1.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v2=-1.01) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v2 [1.01] must be between -1.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v2=1.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v2=1.01) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v3 [-1.01] must be between -1.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v3=-1.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v3=-1.01) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v3 [1.01] must be between -1.0 and 1.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v3=1.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v3=1.01) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v4 [-0.61] must be between -0.6 and 0.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v4=-0.61) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v4=-0.61) with raises(ValueError, match=re.escape("inv_var_resp_q_at_v4 [0.01] must be between -0.6 and 0.0.")): - PowerElectronicsConnection(*power_electronics_connection_args, inv_var_resp_q_at_v4=0.01) + PowerElectronicsConnection(mrid="mrid", inv_var_resp_q_at_v4=0.01) diff --git a/test/cim/iec61970/base/wires/test_power_transformer.py b/test/cim/iec61970/base/wires/test_power_transformer.py index 34eeaf715..4787f8466 100644 --- a/test/cim/iec61970/base/wires/test_power_transformer.py +++ b/test/cim/iec61970/base/wires/test_power_transformer.py @@ -7,19 +7,10 @@ from cim.fill_fields import power_transformer_kwargs from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import PowerTransformer, VectorGroup, PowerTransformerEnd, TransformerConstructionKind, TransformerFunctionKind, \ Terminal, generate_id -power_transformer_args = [ - *conducting_equipment_args, - VectorGroup.DD6, - [PowerTransformerEnd(mrid=generate_id())], - 1.1, - TransformerConstructionKind.padmountFeedThrough, - TransformerFunctionKind.secondaryTransformer -] - def test_power_transformer_constructor_default(): pt = PowerTransformer(mrid=generate_id()) @@ -47,7 +38,7 @@ def test_power_transformer_constructor_kwargs( transformer_utilisation=transformer_utilisation, construction_kind=construction_kind, function=function, - **kwargs + **kwargs, ) verify_conducting_equipment_constructor_kwargs(pt, **kwargs) @@ -58,19 +49,6 @@ def test_power_transformer_constructor_kwargs( assert pt.function == function -def test_power_transformer_constructor_args(): - pt = PowerTransformer(*power_transformer_args) - - verify_conducting_equipment_constructor_args(pt) - assert power_transformer_args[-5:] == [ - pt.vector_group, - list(pt.ends), - pt.transformer_utilisation, - pt.construction_kind, - pt.function - ] - - def test_get_end_by_terminal(): t1 = Terminal(mrid="t1") t2 = Terminal(mrid="t2") diff --git a/test/cim/iec61970/base/wires/test_power_transformer_end.py b/test/cim/iec61970/base/wires/test_power_transformer_end.py index 1c183fa7b..154f738b1 100644 --- a/test/cim/iec61970/base/wires/test_power_transformer_end.py +++ b/test/cim/iec61970/base/wires/test_power_transformer_end.py @@ -10,16 +10,12 @@ from cim.fill_fields import power_transformer_end_kwargs from cim.iec61970.base.wires.test_transformer_end import verify_transformer_end_constructor_default, \ - verify_transformer_end_constructor_kwargs, verify_transformer_end_constructor_args, transformer_end_args + verify_transformer_end_constructor_kwargs from cim.private_collection_validator import validate_unordered_other from util import assert_or_empty -from zepben.ewb import PowerTransformerEnd, PowerTransformer, WindingConnection, TransformerCoolingType, generate_id +from zepben.ewb import PowerTransformerEnd, WindingConnection, TransformerCoolingType, generate_id from zepben.ewb.model.cim.extensions.iec61970.base.wires.transformer_end_rated_s import TransformerEndRatedS -power_transformer_end_args = [ - *transformer_end_args, PowerTransformer(mrid=generate_id()), 1, 2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.01, WindingConnection.A, 11 -] - def test_power_transformer_end_constructor_default(): pte = PowerTransformerEnd(mrid=generate_id()) @@ -56,7 +52,7 @@ def test_power_transformer_end_constructor_kwargs( b0, connection_kind, phase_angle_clock, - **kwargs + **kwargs, ): pte = PowerTransformerEnd( power_transformer=power_transformer, @@ -72,7 +68,7 @@ def test_power_transformer_end_constructor_kwargs( b0=b0, connection_kind=connection_kind, phase_angle_clock=phase_angle_clock, - **kwargs + **kwargs, ) verify_transformer_end_constructor_kwargs(pte, **kwargs) @@ -95,31 +91,6 @@ def test_power_transformer_end_constructor_kwargs( assert pte.phase_angle_clock == phase_angle_clock -def test_power_transformer_end_constructor_args(): - pte = PowerTransformerEnd(*power_transformer_end_args) - - verify_transformer_end_constructor_args(pte) - assert power_transformer_end_args[-13:-11] == [ - pte.power_transformer, - pte.rated_s - ] - # We use a different style of matching here as the passed in arg for rated_s is translated to a TransformerEndRatedS. - assert list(pte.s_ratings) == [TransformerEndRatedS(TransformerCoolingType.UNKNOWN, power_transformer_end_args[-12])] - assert power_transformer_end_args[-11:] == [ - pte.rated_u, - pte.r, - pte.x, - pte.r0, - pte.x0, - pte.g, - pte.g0, - pte.b, - pte.b0, - pte.connection_kind, - pte.phase_angle_clock - ] - - def test_power_transformer_end_s_ratings(): validate_unordered_other( PowerTransformerEnd, @@ -131,7 +102,7 @@ def test_power_transformer_end_s_ratings(): PowerTransformerEnd.remove_rating, PowerTransformerEnd.clear_ratings, lambda rs: rs.cooling_type, - lambda ct: ct.name + lambda ct: ct.name, ) diff --git a/test/cim/iec61970/base/wires/test_protected_switch.py b/test/cim/iec61970/base/wires/test_protected_switch.py index 5179db2cc..bf526a3d5 100644 --- a/test/cim/iec61970/base/wires/test_protected_switch.py +++ b/test/cim/iec61970/base/wires/test_protected_switch.py @@ -3,12 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs, \ - verify_switch_constructor_args, switch_args +from cim.iec61970.base.wires.test_switch import verify_switch_constructor_default, verify_switch_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import ProtectionRelayFunction, ProtectedSwitch, generate_id - -protected_switch_args = [*switch_args, 1, [ProtectionRelayFunction(mrid=generate_id())]] +from zepben.ewb import ProtectionRelayFunction, ProtectedSwitch def verify_protected_switch_constructor_default(ps: ProtectedSwitch): @@ -25,15 +22,6 @@ def verify_protected_switch_constructor_kwargs(ps: ProtectedSwitch, breaking_cap assert list(ps.relay_functions) == relay_functions -def verify_protected_switch_constructor_args(ps: ProtectedSwitch): - verify_switch_constructor_args(ps) - - assert protected_switch_args[-2:] == [ - ps.breaking_capacity, - list(ps.relay_functions) - ] - - def test_relay_function_collection(): validate_unordered( ProtectedSwitch, @@ -43,5 +31,5 @@ def test_relay_function_collection(): ProtectedSwitch.get_relay_function, ProtectedSwitch.add_relay_function, ProtectedSwitch.remove_relay_function, - ProtectedSwitch.clear_relay_functions + ProtectedSwitch.clear_relay_functions, ) diff --git a/test/cim/iec61970/base/wires/test_ratio_tap_changer.py b/test/cim/iec61970/base/wires/test_ratio_tap_changer.py index e7cd437b6..9f1daaccc 100644 --- a/test/cim/iec61970/base/wires/test_ratio_tap_changer.py +++ b/test/cim/iec61970/base/wires/test_ratio_tap_changer.py @@ -6,12 +6,9 @@ from cim.fill_fields import ratio_tap_changer_kwargs from cim.iec61970.base.wires.test_tap_changer import verify_tap_changer_constructor_default, \ - verify_tap_changer_constructor_kwargs, verify_tap_changer_constructor_args, tap_changer_args, assume_step_values + verify_tap_changer_constructor_kwargs, assume_step_values from zepben.ewb import generate_id from zepben.ewb.model.cim.iec61970.base.wires.ratio_tap_changer import RatioTapChanger -from zepben.ewb.model.cim.iec61970.base.wires.transformer_end import TransformerEnd - -ratio_tap_changer_args = [*tap_changer_args, TransformerEnd(mrid=generate_id()), 1.1] def test_ratio_tap_changer_constructor_default(): @@ -31,13 +28,3 @@ def test_ratio_tap_changer_constructor_kwargs(transformer_end, step_voltage_incr verify_tap_changer_constructor_kwargs(rtc, **kwargs) assert rtc.transformer_end == transformer_end assert rtc.step_voltage_increment == step_voltage_increment - - -def test_ratio_tap_changer_constructor_args(): - rtc = RatioTapChanger(*ratio_tap_changer_args) - - verify_tap_changer_constructor_args(rtc) - assert ratio_tap_changer_args[-2:] == [ - rtc.transformer_end, - rtc.step_voltage_increment - ] diff --git a/test/cim/iec61970/base/wires/test_reactive_capability_curve.py b/test/cim/iec61970/base/wires/test_reactive_capability_curve.py index 7aeb188f4..c5540ca42 100644 --- a/test/cim/iec61970/base/wires/test_reactive_capability_curve.py +++ b/test/cim/iec61970/base/wires/test_reactive_capability_curve.py @@ -5,12 +5,9 @@ from hypothesis import given from cim.fill_fields import reactive_capability_curve_kwargs -from cim.iec61970.base.core.test_curve import curve_args, verify_curve_constructor_default, verify_curve_constructor_kwargs, \ - verify_curve_constructor_args +from cim.iec61970.base.core.test_curve import verify_curve_constructor_default, verify_curve_constructor_kwargs from zepben.ewb import ReactiveCapabilityCurve -reactive_capability_curve_args = curve_args - def verify_reactive_capability_curve_constructor_default(): verify_curve_constructor_default(ReactiveCapabilityCurve()) @@ -19,7 +16,3 @@ def verify_reactive_capability_curve_constructor_default(): @given(**reactive_capability_curve_kwargs()) def verify_reactive_capability_curve_constructor_kwargs(**kwargs): verify_curve_constructor_kwargs(ReactiveCapabilityCurve(**kwargs), **kwargs) - - -def verify_reactive_capability_curve_constructor_args(): - verify_curve_constructor_args(ReactiveCapabilityCurve(*reactive_capability_curve_args)) diff --git a/test/cim/iec61970/base/wires/test_recloser.py b/test/cim/iec61970/base/wires/test_recloser.py index cc44b170f..f70f2aaff 100644 --- a/test/cim/iec61970/base/wires/test_recloser.py +++ b/test/cim/iec61970/base/wires/test_recloser.py @@ -6,11 +6,9 @@ from cim.fill_fields import recloser_kwargs from cim.iec61970.base.wires.test_protected_switch import verify_protected_switch_constructor_default, \ - verify_protected_switch_constructor_kwargs, verify_protected_switch_constructor_args, protected_switch_args + verify_protected_switch_constructor_kwargs from zepben.ewb import Recloser, generate_id -recloser_args = protected_switch_args - def test_recloser_constructor_default(): verify_protected_switch_constructor_default(Recloser(mrid=generate_id())) @@ -19,7 +17,3 @@ def test_recloser_constructor_default(): @given(**recloser_kwargs()) def test_recloser_constructor_kwargs(**kwargs): verify_protected_switch_constructor_kwargs(Recloser(**kwargs), **kwargs) - - -def test_recloser_constructor_args(): - verify_protected_switch_constructor_args(Recloser(*recloser_args)) diff --git a/test/cim/iec61970/base/wires/test_regulating_cond_eq.py b/test/cim/iec61970/base/wires/test_regulating_cond_eq.py index 2bdea61b4..801a50a22 100644 --- a/test/cim/iec61970/base/wires/test_regulating_cond_eq.py +++ b/test/cim/iec61970/base/wires/test_regulating_cond_eq.py @@ -4,10 +4,8 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.wires.test_energy_connection import verify_energy_connection_constructor_default, \ - verify_energy_connection_constructor_kwargs, verify_energy_connection_constructor_args, energy_connection_args -from zepben.ewb import RegulatingCondEq, RegulatingControl, generate_id - -regulating_cond_eq_args = [*energy_connection_args, False, RegulatingControl(mrid=generate_id())] + verify_energy_connection_constructor_kwargs +from zepben.ewb import RegulatingCondEq def verify_regulating_cond_eq_constructor_default(rce: RegulatingCondEq): @@ -20,11 +18,3 @@ def verify_regulating_cond_eq_constructor_kwargs(rce: RegulatingCondEq, control_ verify_energy_connection_constructor_kwargs(rce, **kwargs) assert rce.control_enabled == control_enabled assert rce.regulating_control == regulating_control - - -def verify_regulating_cond_eq_constructor_args(rce: RegulatingCondEq): - verify_energy_connection_constructor_args(rce) - assert regulating_cond_eq_args[-2:] == [ - rce.control_enabled, - rce.regulating_control - ] diff --git a/test/cim/iec61970/base/wires/test_regulating_control.py b/test/cim/iec61970/base/wires/test_regulating_control.py index f9895da3b..1d82f5327 100644 --- a/test/cim/iec61970/base/wires/test_regulating_control.py +++ b/test/cim/iec61970/base/wires/test_regulating_control.py @@ -3,27 +3,10 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from cim.iec61970.base.core.test_power_system_resource import power_system_resource_args, verify_power_system_resource_constructor_default, \ - verify_power_system_resource_constructor_kwargs, verify_power_system_resource_constructor_args +from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, \ + verify_power_system_resource_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import RegulatingControlModeKind, Terminal, PowerElectronicsConnection, PhaseCode, RegulatingControl, RegulatingCondEq, generate_id - -regulating_control_args = [ - *power_system_resource_args, - False, - RegulatingControlModeKind.voltage, - PhaseCode.ABC, - 1.1, - 2.2, - True, - 3.3, - 4.4, - 5.5, - Terminal(mrid=generate_id()), - 6.6, - 7.7, - [PowerElectronicsConnection(mrid=generate_id())] -] +from zepben.ewb import RegulatingControlModeKind, PhaseCode, RegulatingControl, RegulatingCondEq def verify_regulating_control_constructor_default(rc: RegulatingControl): @@ -58,7 +41,7 @@ def verify_regulating_control_constructor_kwargs( ct_primary, min_target_deadband, regulating_conducting_equipment, - **kwargs + **kwargs, ): verify_power_system_resource_constructor_kwargs(rc, **kwargs) assert rc.discrete == discrete @@ -76,25 +59,6 @@ def verify_regulating_control_constructor_kwargs( assert list(rc.regulating_conducting_equipment) == regulating_conducting_equipment -def verify_regulating_control_constructor_args(rc): - verify_power_system_resource_constructor_args(rc) - assert regulating_control_args[-13:] == [ - rc.discrete, - rc.mode, - rc.monitored_phase, - rc.target_deadband, - rc.target_value, - rc.enabled, - rc.max_allowed_target_value, - rc.min_allowed_target_value, - rc.rated_current, - rc.terminal, - rc.ct_primary, - rc.min_target_deadband, - list(rc.regulating_conducting_equipment) - ] - - def test_regulating_control_regulating_conducting_equipment(): # noinspection PyArgumentList validate_unordered( @@ -105,5 +69,5 @@ def test_regulating_control_regulating_conducting_equipment(): RegulatingControl.get_regulating_cond_eq, RegulatingControl.add_regulating_cond_eq, RegulatingControl.remove_regulating_cond_eq, - RegulatingControl.clear_regulating_cond_eq + RegulatingControl.clear_regulating_cond_eq, ) diff --git a/test/cim/iec61970/base/wires/test_rotating_machine.py b/test/cim/iec61970/base/wires/test_rotating_machine.py index 09dd75e61..2c631b609 100644 --- a/test/cim/iec61970/base/wires/test_rotating_machine.py +++ b/test/cim/iec61970/base/wires/test_rotating_machine.py @@ -2,12 +2,9 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. -from cim.iec61970.base.wires.test_regulating_cond_eq import regulating_cond_eq_args, \ - verify_regulating_cond_eq_constructor_default, verify_regulating_cond_eq_constructor_kwargs, verify_regulating_cond_eq_constructor_args +from cim.iec61970.base.wires.test_regulating_cond_eq import verify_regulating_cond_eq_constructor_default, verify_regulating_cond_eq_constructor_kwargs from zepben.ewb import RotatingMachine -rotating_machine_args = [*regulating_cond_eq_args, 1.1, 2.2, 3, 4.4, 5.5] - def verify_rotating_machine_constructor_default(rm: RotatingMachine): verify_regulating_cond_eq_constructor_default(rm) @@ -25,14 +22,3 @@ def verify_rotating_machine_constructor_kwargs(rm: RotatingMachine, rated_power_ assert rm.rated_u == rated_u assert rm.p == p assert rm.q == q - - -def verify_rotating_machine_constructor_args(rm: RotatingMachine): - verify_regulating_cond_eq_constructor_args(rm) - assert rotating_machine_args[-5:] == [ - rm.rated_power_factor, - rm.rated_s, - rm.rated_u, - rm.p, - rm.q - ] diff --git a/test/cim/iec61970/base/wires/test_series_compensator.py b/test/cim/iec61970/base/wires/test_series_compensator.py index 0378486de..862efa118 100644 --- a/test/cim/iec61970/base/wires/test_series_compensator.py +++ b/test/cim/iec61970/base/wires/test_series_compensator.py @@ -7,11 +7,9 @@ from cim.fill_fields import series_compensator_kwargs from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import SeriesCompensator, generate_id -series_compensator_args = [*conducting_equipment_args, 1.1, 2.2, 3.3, 4.4, 5, 6] - def test_series_compensator_constructor_default(): sc = SeriesCompensator(mrid=generate_id()) @@ -34,7 +32,7 @@ def test_series_compensator_constructor_kwargs(r, r0, x, x0, varistor_rated_curr x0=x0, varistor_rated_current=varistor_rated_current, varistor_voltage_threshold=varistor_voltage_threshold, - **kwargs + **kwargs, ) verify_conducting_equipment_constructor_kwargs(sc, **kwargs) @@ -46,20 +44,6 @@ def test_series_compensator_constructor_kwargs(r, r0, x, x0, varistor_rated_curr assert sc.varistor_voltage_threshold == varistor_voltage_threshold -def test_series_compensator_constructor_args(): - sc = SeriesCompensator(*series_compensator_args) - - verify_conducting_equipment_constructor_args(sc) - assert series_compensator_args[-6:] == [ - sc.r, - sc.r0, - sc.x, - sc.x0, - sc.varistor_rated_current, - sc.varistor_voltage_threshold - ] - - def test_varistor_present_flag(): sc = SeriesCompensator(mrid=generate_id(), varistor_rated_current=None, varistor_voltage_threshold=None) diff --git a/test/cim/iec61970/base/wires/test_shunt_compensator.py b/test/cim/iec61970/base/wires/test_shunt_compensator.py index c50c59054..4aa66ca05 100644 --- a/test/cim/iec61970/base/wires/test_shunt_compensator.py +++ b/test/cim/iec61970/base/wires/test_shunt_compensator.py @@ -4,11 +4,9 @@ # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.wires.test_regulating_cond_eq import verify_regulating_cond_eq_constructor_default, \ - verify_regulating_cond_eq_constructor_kwargs, verify_regulating_cond_eq_constructor_args, regulating_cond_eq_args + verify_regulating_cond_eq_constructor_kwargs from zepben.ewb import ShuntCompensator, PhaseShuntConnectionKind, Terminal, generate_id -shunt_compensator_args = [*regulating_cond_eq_args, True, 1, PhaseShuntConnectionKind.G, Terminal(mrid=generate_id()), 2.2] - def verify_shunt_compensator_constructor_default(sc: ShuntCompensator): verify_regulating_cond_eq_constructor_default(sc) @@ -26,14 +24,3 @@ def verify_shunt_compensator_constructor_kwargs(sc: ShuntCompensator, grounded, assert sc.phase_connection == phase_connection assert sc.sections == sections assert sc.grounding_terminal == grounding_terminal - - -def verify_shunt_compensator_constructor_args(sc: ShuntCompensator): - verify_regulating_cond_eq_constructor_args(sc) - assert shunt_compensator_args[-5:] == [ - sc.grounded, - sc.nom_u, - sc.phase_connection, - sc.grounding_terminal, - sc.sections, - ] diff --git a/test/cim/iec61970/base/wires/test_static_var_compensator.py b/test/cim/iec61970/base/wires/test_static_var_compensator.py index bdea775d1..f16ada616 100644 --- a/test/cim/iec61970/base/wires/test_static_var_compensator.py +++ b/test/cim/iec61970/base/wires/test_static_var_compensator.py @@ -6,11 +6,9 @@ from cim.fill_fields import static_var_compensator_kwargs from cim.iec61970.base.wires.test_regulating_cond_eq import verify_regulating_cond_eq_constructor_default, \ - verify_regulating_cond_eq_constructor_kwargs, verify_regulating_cond_eq_constructor_args, regulating_cond_eq_args + verify_regulating_cond_eq_constructor_kwargs from zepben.ewb import SVCControlMode, StaticVarCompensator, generate_id -static_var_compensator_args = [*regulating_cond_eq_args, 1.0, -1.0, 2.0, SVCControlMode.voltage, 3] - def test_static_var_compensator_constructor_default(): svc = StaticVarCompensator(mrid=generate_id()) @@ -30,7 +28,7 @@ def test_static_var_compensator_constructor_kwargs(capacitive_rating, inductive_ q=q, svc_control_mode=svc_control_mode, voltage_set_point=voltage_set_point, - **kwargs + **kwargs, ) verify_regulating_cond_eq_constructor_kwargs(svc, **kwargs) assert svc.capacitive_rating == capacitive_rating @@ -38,16 +36,3 @@ def test_static_var_compensator_constructor_kwargs(capacitive_rating, inductive_ assert svc.q == q assert svc.svc_control_mode == svc_control_mode assert svc.voltage_set_point == voltage_set_point - - -def test_shunt_compensator_constructor_args(): - svc = StaticVarCompensator(*static_var_compensator_args) - - verify_regulating_cond_eq_constructor_args(svc) - assert static_var_compensator_args[-5:] == [ - svc.capacitive_rating, - svc.inductive_rating, - svc.q, - svc.svc_control_mode, - svc.voltage_set_point, - ] diff --git a/test/cim/iec61970/base/wires/test_switch.py b/test/cim/iec61970/base/wires/test_switch.py index 3dae36a38..5907b45c1 100644 --- a/test/cim/iec61970/base/wires/test_switch.py +++ b/test/cim/iec61970/base/wires/test_switch.py @@ -3,11 +3,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at https://mozilla.org/MPL/2.0/. from cim.iec61970.base.core.test_conducting_equipment import verify_conducting_equipment_constructor_default, \ - verify_conducting_equipment_constructor_kwargs, verify_conducting_equipment_constructor_args, conducting_equipment_args + verify_conducting_equipment_constructor_kwargs from zepben.ewb import Switch, SinglePhaseKind, generate_id -switch_args = [*conducting_equipment_args, 1.1, 2, 3] - # noinspection PyProtectedMember def verify_switch_constructor_default(s: Switch): @@ -25,16 +23,6 @@ def verify_switch_constructor_kwargs(s: Switch, rated_current, _open, _normally_ assert s._normally_open == _normally_open -# noinspection PyProtectedMember -def verify_switch_constructor_args(s: Switch): - verify_conducting_equipment_constructor_args(s) - assert switch_args[-3:] == [ - s.rated_current, - s._open, - s._normally_open - ] - - def test_open_states(): _validate_open_phase(Switch.is_open, Switch.set_open) _validate_open_phase(Switch.is_normally_open, Switch.set_normally_open) diff --git a/test/cim/iec61970/base/wires/test_synchronous_machine.py b/test/cim/iec61970/base/wires/test_synchronous_machine.py index 93f313aab..275eb363e 100644 --- a/test/cim/iec61970/base/wires/test_synchronous_machine.py +++ b/test/cim/iec61970/base/wires/test_synchronous_machine.py @@ -5,15 +5,10 @@ from hypothesis import given from cim.fill_fields import synchronous_machine_kwargs -from cim.iec61970.base.wires.test_rotating_machine import rotating_machine_args, \ - verify_rotating_machine_constructor_default, verify_rotating_machine_constructor_kwargs, verify_rotating_machine_constructor_args +from cim.iec61970.base.wires.test_rotating_machine import verify_rotating_machine_constructor_default, verify_rotating_machine_constructor_kwargs from cim.private_collection_validator import validate_unordered from zepben.ewb import SynchronousMachine, SynchronousMachineKind, ReactiveCapabilityCurve -synchronous_machine_args = [*rotating_machine_args, [ReactiveCapabilityCurve(mrid="rcc1"), ReactiveCapabilityCurve(mrid="rcc2")], 1.1, 2, True, 3.3, 4.4, 5.5, - 6.6, 7, 8.8, 9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, 18.18, SynchronousMachineKind.generatorOrMotor, - SynchronousMachineKind.generator] - def verify_synchronous_machine_constructor_default(): sm = SynchronousMachine() @@ -68,7 +63,7 @@ def verify_synchronous_machine_constructor_kwargs( x2, type, operating_mode, - **kwargs + **kwargs, ): sm = SynchronousMachine( curves=curves, @@ -93,7 +88,7 @@ def verify_synchronous_machine_constructor_kwargs( x2=x2, type=type, operating_mode=operating_mode, - **kwargs + **kwargs, ) verify_rotating_machine_constructor_kwargs(sm, **kwargs) @@ -121,36 +116,6 @@ def verify_synchronous_machine_constructor_kwargs( assert sm.operating_mode == operating_mode -def verify_synchronous_machine_constructor_args(): - sm = SynchronousMachine(*synchronous_machine_args) - - verify_rotating_machine_constructor_args(sm) - assert synchronous_machine_args[-22:] == [ - list(sm.curves), - sm.base_q, - sm.condenser_p, - sm.earthing, - sm.earthing_star_point_r, - sm.earthing_star_point_x, - sm.ikk, - sm.max_q, - sm.max_u, - sm.min_q, - sm.min_u, - sm.mu, - sm.r, - sm.r0, - sm.r2, - sm.sat_direct_subtrans_x, - sm.sat_direct_sync_x, - sm.sat_direct_trans_x, - sm.x0, - sm.x2, - sm.type, - sm.operating_mode - ] - - def test_curves_collection(): validate_unordered( SynchronousMachine, @@ -160,5 +125,5 @@ def test_curves_collection(): SynchronousMachine.get_curve, SynchronousMachine.add_curve, SynchronousMachine.remove_curve, - SynchronousMachine.clear_curves + SynchronousMachine.clear_curves, ) diff --git a/test/cim/iec61970/base/wires/test_tap_changer.py b/test/cim/iec61970/base/wires/test_tap_changer.py index 95cd4a25a..3f87b3b12 100644 --- a/test/cim/iec61970/base/wires/test_tap_changer.py +++ b/test/cim/iec61970/base/wires/test_tap_changer.py @@ -8,12 +8,10 @@ from pytest import raises from cim.iec61970.base.core.test_power_system_resource import verify_power_system_resource_constructor_default, \ - verify_power_system_resource_constructor_kwargs, verify_power_system_resource_constructor_args, power_system_resource_args + verify_power_system_resource_constructor_kwargs from zepben.ewb import TapChangerControl, generate_id from zepben.ewb.model.cim.iec61970.base.wires.tap_changer import TapChanger -tap_changer_args = [*power_system_resource_args, False, 1, TapChangerControl(mrid=generate_id()), 10, 2, 3, 4, 5.5] - def verify_tap_changer_constructor_default(tc: TapChanger): verify_power_system_resource_constructor_default(tc) @@ -34,8 +32,10 @@ def assume_step_values(high_step, low_step, neutral_step, normal_step, step): assume(high_step >= step >= low_step) -def verify_tap_changer_constructor_kwargs(tc: TapChanger, control_enabled, neutral_u, high_step, low_step, neutral_step, normal_step, step, tap_changer_control, - **kwargs): +def verify_tap_changer_constructor_kwargs( + tc: TapChanger, control_enabled, neutral_u, high_step, low_step, neutral_step, normal_step, step, tap_changer_control, + **kwargs, +): assume_step_values(high_step, low_step, neutral_step, normal_step, step) verify_power_system_resource_constructor_kwargs(tc, **kwargs) @@ -49,32 +49,16 @@ def verify_tap_changer_constructor_kwargs(tc: TapChanger, control_enabled, neutr assert tc.tap_changer_control == tap_changer_control -def verify_tap_changer_constructor_args(tc: TapChanger): - verify_power_system_resource_constructor_args(tc) - assert tap_changer_args[-8:] == [ - tc.control_enabled, - tc.neutral_u, - tc.tap_changer_control, - tc.high_step, - tc.low_step, - tc.neutral_step, - tc.normal_step, - tc.step - ] - - # noinspection PyArgumentList def test_detected_invalid_steps_via_constructor_args(): - # args order: control_enabled, neutral_u, _high_step, _low_step, _neutral_step, _normal_step, _step - with raises(ValueError, match=re.escape("High step [0] must be greater than low step [0]")): - TapChanger(*power_system_resource_args, True, 100, TapChangerControl(mrid=generate_id()), 0, 0, 0, 0, 0.0) + TapChanger(mrid="mrid", high_step=0, low_step=0, neutral_step=0, normal_step=0, step=0.0) with raises(ValueError, match=re.escape("Neutral step [2] must be between high step [1] and low step [0]")): - TapChanger(*power_system_resource_args, True, 100, TapChangerControl(mrid=generate_id()), 1, 0, 2, 0, 0.0) + TapChanger(mrid="mrid", high_step=1, low_step=0, neutral_step=2, normal_step=0, step=0.0) with raises(ValueError, match=re.escape("Normal step [2] must be between high step [1] and low step [0]")): - TapChanger(*power_system_resource_args, True, 100, TapChangerControl(mrid=generate_id()), 1, 0, 0, 2, 0.0) + TapChanger(mrid="mrid", high_step=1, low_step=0, neutral_step=0, normal_step=2, step=0.0) with raises(ValueError, match=re.escape("Step [1.1] must be between high step [1] and low step [0]")): - TapChanger(*power_system_resource_args, True, 100, TapChangerControl(mrid=generate_id()), 1, 0, 0, 0, 1.1) + TapChanger(mrid="mrid", high_step=1, low_step=0, neutral_step=0, normal_step=0, step=1.1) def test_validates_step_changes(): diff --git a/test/cim/iec61970/base/wires/test_tap_changer_control.py b/test/cim/iec61970/base/wires/test_tap_changer_control.py index d4eae5be4..0f9af6853 100644 --- a/test/cim/iec61970/base/wires/test_tap_changer_control.py +++ b/test/cim/iec61970/base/wires/test_tap_changer_control.py @@ -5,12 +5,10 @@ from hypothesis import given from cim.fill_fields import tap_changer_control_kwargs -from cim.iec61970.base.wires.test_regulating_control import regulating_control_args, verify_regulating_control_constructor_default, \ - verify_regulating_control_constructor_kwargs, verify_regulating_control_constructor_args +from cim.iec61970.base.wires.test_regulating_control import verify_regulating_control_constructor_default, \ + verify_regulating_control_constructor_kwargs from zepben.ewb import TapChangerControl, generate_id -tap_changer_control_args = [*regulating_control_args, 1, False, 2.2, 3.3, 4.4, 5.5, True, 6.6, False] - def test_tap_changer_control_constructor_default(): tcc = TapChangerControl(mrid=generate_id()) @@ -39,7 +37,8 @@ def test_tap_changer_control_constructor_kwargs( forward_ldc_blocking, time_delay, co_generation_enabled, - **kwargs): + **kwargs, +): tcc = TapChangerControl( limit_voltage=limit_voltage, line_drop_compensation=line_drop_compensation, @@ -50,7 +49,7 @@ def test_tap_changer_control_constructor_kwargs( forward_ldc_blocking=forward_ldc_blocking, time_delay=time_delay, co_generation_enabled=co_generation_enabled, - **kwargs + **kwargs, ) verify_regulating_control_constructor_kwargs(tcc, **kwargs) @@ -63,20 +62,3 @@ def test_tap_changer_control_constructor_kwargs( assert tcc.forward_ldc_blocking == forward_ldc_blocking assert tcc.time_delay == time_delay assert tcc.co_generation_enabled == co_generation_enabled - - -def test_tap_changer_control_constructor_args(): - tcc = TapChangerControl(*tap_changer_control_args) - - verify_regulating_control_constructor_args(tcc) - assert tap_changer_control_args[-9:] == [ - tcc.limit_voltage, - tcc.line_drop_compensation, - tcc.line_drop_r, - tcc.line_drop_x, - tcc.reverse_line_drop_r, - tcc.reverse_line_drop_x, - tcc.forward_ldc_blocking, - tcc.time_delay, - tcc.co_generation_enabled - ] diff --git a/test/cim/iec61970/base/wires/test_transformer_end.py b/test/cim/iec61970/base/wires/test_transformer_end.py index 94adcb1ac..8f8c8247a 100644 --- a/test/cim/iec61970/base/wires/test_transformer_end.py +++ b/test/cim/iec61970/base/wires/test_transformer_end.py @@ -5,23 +5,10 @@ from pytest import raises from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args -from zepben.ewb import Terminal, BaseVoltage, TransformerStarImpedance, PowerTransformer, Fuse, generate_id -from zepben.ewb.model.cim.iec61970.base.wires.ratio_tap_changer import RatioTapChanger + verify_identified_object_constructor_kwargs +from zepben.ewb import Terminal, PowerTransformer, Fuse, generate_id from zepben.ewb.model.cim.iec61970.base.wires.transformer_end import TransformerEnd -transformer_end_args = [ - *identified_object_args, - True, - 1.1, - 2.2, - RatioTapChanger(mrid=generate_id()), - Terminal(mrid=generate_id()), - BaseVoltage(mrid=generate_id()), - 3, - TransformerStarImpedance(mrid=generate_id()) -] - def verify_transformer_end_constructor_default(te: TransformerEnd): verify_identified_object_constructor_default(te) @@ -35,8 +22,10 @@ def verify_transformer_end_constructor_default(te: TransformerEnd): assert not te.star_impedance -def verify_transformer_end_constructor_kwargs(te: TransformerEnd, grounded, r_ground, x_ground, ratio_tap_changer, terminal, base_voltage, end_number, - star_impedance, **kwargs): +def verify_transformer_end_constructor_kwargs( + te: TransformerEnd, grounded, r_ground, x_ground, ratio_tap_changer, terminal, base_voltage, end_number, + star_impedance, **kwargs, +): verify_identified_object_constructor_kwargs(te, **kwargs) assert te.grounded == grounded assert te.r_ground == r_ground @@ -48,20 +37,6 @@ def verify_transformer_end_constructor_kwargs(te: TransformerEnd, grounded, r_gr assert te.star_impedance == star_impedance -def verify_transformer_end_constructor_args(te: TransformerEnd): - verify_identified_object_constructor_args(te) - assert transformer_end_args[-8:] == [ - te.grounded, - te.r_ground, - te.x_ground, - te.ratio_tap_changer, - te.terminal, - te.base_voltage, - te.end_number, - te.star_impedance - ] - - def test_allow_terminal_with_no_conducting_equipment(): te = TransformerEnd(mrid=generate_id()) @@ -76,8 +51,10 @@ def test_terminal_must_belong_to_power_transformer(): t1 = Terminal(mrid="terminal_mrid") t1.conducting_equipment = Fuse(mrid="fuse_mrid") - with raises(ValueError, match=r"Cannot assign TransformerEnd\[transformer_end_mrid\] to Terminal\[terminal_mrid\], which is connected to a " - r"Fuse\[fuse_mrid\] rather than a PowerTransformer."): + with raises( + ValueError, match=r"Cannot assign TransformerEnd\[transformer_end_mrid\] to Terminal\[terminal_mrid\], which is connected to a " + r"Fuse\[fuse_mrid\] rather than a PowerTransformer.", + ): te.terminal = t1 t2 = Terminal(mrid=generate_id()) diff --git a/test/cim/iec61970/base/wires/test_transformer_star_impedance.py b/test/cim/iec61970/base/wires/test_transformer_star_impedance.py index 3b3983dd9..fd85ad76a 100644 --- a/test/cim/iec61970/base/wires/test_transformer_star_impedance.py +++ b/test/cim/iec61970/base/wires/test_transformer_star_impedance.py @@ -6,10 +6,8 @@ from cim.fill_fields import transformer_star_impedance_kwargs from cim.iec61970.base.core.test_identified_object import verify_identified_object_constructor_default, \ - verify_identified_object_constructor_kwargs, verify_identified_object_constructor_args, identified_object_args -from zepben.ewb import TransformerStarImpedance, TransformerEndInfo, generate_id - -transformer_star_impedance_args = [*identified_object_args, 1.1, 2.2, 3.3, 4.4, TransformerEndInfo(mrid=generate_id())] + verify_identified_object_constructor_kwargs +from zepben.ewb import TransformerStarImpedance, generate_id def test_transformer_star_impedance_constructor_default(): @@ -31,7 +29,7 @@ def test_transformer_star_impedance_constructor_kwargs(r, r0, x, x0, transformer x=x, x0=x0, transformer_end_info=transformer_end_info, - **kwargs + **kwargs, ) verify_identified_object_constructor_kwargs(tsi, **kwargs) @@ -40,16 +38,3 @@ def test_transformer_star_impedance_constructor_kwargs(r, r0, x, x0, transformer assert tsi.x == x assert tsi.x0 == x0 assert tsi.transformer_end_info == transformer_end_info - - -def test_transformer_star_impedance_constructor_args(): - tsi = TransformerStarImpedance(*transformer_star_impedance_args) - - verify_identified_object_constructor_args(tsi) - assert transformer_star_impedance_args[-5:] == [ - tsi.r, - tsi.r0, - tsi.x, - tsi.x0, - tsi.transformer_end_info - ] diff --git a/test/cim/iec61970/infiec61970/feeder/test_circuit.py b/test/cim/iec61970/infiec61970/feeder/test_circuit.py index 5b2761b01..94c24cb6a 100644 --- a/test/cim/iec61970/infiec61970/feeder/test_circuit.py +++ b/test/cim/iec61970/infiec61970/feeder/test_circuit.py @@ -6,12 +6,9 @@ from hypothesis import given from cim.fill_fields import circuit_kwargs -from cim.iec61970.base.wires.test_line import verify_line_constructor_default, verify_line_constructor_kwargs, verify_line_constructor_args, \ - line_args +from cim.iec61970.base.wires.test_line import verify_line_constructor_default, verify_line_constructor_kwargs from cim.private_collection_validator import validate_unordered -from zepben.ewb import Circuit, Loop, Terminal, Substation, generate_id - -circuit_args = [*line_args, Loop(mrid=generate_id()), [Terminal(mrid=generate_id())], [Substation(mrid=generate_id())]] +from zepben.ewb import Circuit, Terminal, Substation, generate_id def test_circuit_constructor_default(): @@ -33,17 +30,6 @@ def test_circuit_constructor_kwargs(loop, end_terminals, end_substations, **kwar assert list(c.end_substations) == end_substations -def test_circuit_constructor_args(): - c = Circuit(*circuit_args) - - verify_line_constructor_args(c) - assert circuit_args[-3:] == [ - c.loop, - list(c.end_terminals), - list(c.end_substations) - ] - - def test_end_terminals_collection(): validate_unordered( Circuit, @@ -53,7 +39,7 @@ def test_end_terminals_collection(): Circuit.get_end_terminal, Circuit.add_end_terminal, Circuit.remove_end_terminal, - Circuit.clear_end_terminals + Circuit.clear_end_terminals, ) @@ -66,5 +52,5 @@ def test_end_substations_collection(): Circuit.get_end_substation, Circuit.add_end_substation, Circuit.remove_end_substation, - Circuit.clear_end_substations + Circuit.clear_end_substations, ) diff --git a/test/cim/iec61970/infiec61970/wires/generation/production/test_ev_charging_unit.py b/test/cim/iec61970/infiec61970/wires/generation/production/test_ev_charging_unit.py index fbc36baf7..39a1c1eb4 100644 --- a/test/cim/iec61970/infiec61970/wires/generation/production/test_ev_charging_unit.py +++ b/test/cim/iec61970/infiec61970/wires/generation/production/test_ev_charging_unit.py @@ -6,11 +6,9 @@ from cim.fill_fields import ev_charging_unit_kwargs from cim.iec61970.base.wires.generation.production.test_power_electronics_unit import verify_power_electronics_unit_constructor_default, \ - verify_power_electronics_unit_constructor_args, verify_power_electronics_unit_constructor_kwargs, power_electronics_unit_args + verify_power_electronics_unit_constructor_kwargs from zepben.ewb import EvChargingUnit, generate_id -ev_charging_unit_args = power_electronics_unit_args - def test_ev_charging_unit_constructor_default(): verify_power_electronics_unit_constructor_default(EvChargingUnit(mrid=generate_id())) @@ -19,7 +17,3 @@ def test_ev_charging_unit_constructor_default(): @given(**ev_charging_unit_kwargs()) def test_ev_charging_unit_constructor_kwargs(**kwargs): verify_power_electronics_unit_constructor_kwargs(EvChargingUnit(**kwargs), **kwargs) - - -def test_ev_charging_unit_constructor_args(): - verify_power_electronics_unit_constructor_args(EvChargingUnit(*ev_charging_unit_args))