From 60bc9591c8278b380e02497eead11cf7b88f1797 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:41:12 -0700 Subject: [PATCH 01/11] Update elevator shaft mapping --- data/Mapped2Willow.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index 211bffa..749e14b 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -2888,7 +2888,7 @@ }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Elevator_Shaft;1", - "OutputDtmi": "dtmi:com:willowinc:Space;1" + "OutputDtmi": "dtmi:com:willowinc:ElevatorShaft;1" }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Embedded_Temperature_Sensor;1", From 212fb3708d13edc6e3fba841022c4571a1021644 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Mon, 21 Oct 2024 10:48:38 -0700 Subject: [PATCH 02/11] Add Elevator Shaft mapping --- data/Willow2Mapped.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/Willow2Mapped.json b/data/Willow2Mapped.json index d608a7a..46747f0 100644 --- a/data/Willow2Mapped.json +++ b/data/Willow2Mapped.json @@ -1276,6 +1276,10 @@ "InputDtmi": "dtmi:com:willowinc:Elevator;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Elevator;1" }, + { + "InputDtmi": "dtmi:com:willowinc:ElevatorShaft;1", + "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Elevator_Shaft;1" + }, { "InputDtmi": "dtmi:com:willowinc:ElevatorTripEvent;1", "OutputDtmi": "dtmi:mapped:core:Event;1" From 25b705ac98c55cc76421cb3d185c9bfd81e21197 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:20:02 -0800 Subject: [PATCH 03/11] Add elevator space mapping --- data/Mapped2Willow.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index 749e14b..c943572 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -2890,6 +2890,10 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Elevator_Shaft;1", "OutputDtmi": "dtmi:com:willowinc:ElevatorShaft;1" }, + { + "InputDtmi": "dtmi:org:brickschema:schema:Brick:Elevator_Space;1", + "OutputDtmi": "dtmi:com:willowinc:Room;1" + }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Embedded_Temperature_Sensor;1", "OutputDtmi": "dtmi:com:willowinc:TemperatureSensor;1" From 22df62d0337f9372a51d77df8fbaf635ad97ca4c Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 11:23:46 -0800 Subject: [PATCH 04/11] Update Battery Status mapping --- data/Mapped2Willow.json | 2 +- data/Willow2Mapped.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index c943572..09f46c0 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -276,7 +276,7 @@ }, { "InputDtmi": "dtmi:mapped:core:Battery_Status;1", - "OutputDtmi": "dtmi:com:willowinc:State;1" + "OutputDtmi": "dtmi:com:willowinc:BatteryLevelState;1" }, { "InputDtmi": "dtmi:mapped:core:Billed_Electrical_Energy_Cost;1", diff --git a/data/Willow2Mapped.json b/data/Willow2Mapped.json index 46747f0..6b033ad 100644 --- a/data/Willow2Mapped.json +++ b/data/Willow2Mapped.json @@ -336,6 +336,10 @@ "InputDtmi": "dtmi:com:willowinc:BatteryEquipment;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Battery;1" }, + { + "InputDtmi": "dtmi:com:willowinc:BatteryLevelState;1", + "OutputDtmi": "dtmi:mapped:core:Battery_Status;1" + }, { "InputDtmi": "dtmi:com:willowinc:BatterySystem;1", "OutputDtmi": "dtmi:mapped:core:Thing;1" From 4fc2645cbff07d689eaaf613a877ddf2cf33e929 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:32:27 -0800 Subject: [PATCH 05/11] add missing mappings --- data/Mapped2Willow.json | 18 +++++++++++++++++- data/Willow2Mapped.json | 16 ++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index 09f46c0..c6a6d9f 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -1756,7 +1756,7 @@ }, { "InputDtmi": "dtmi:mapped:core:Unoccupied_Zone_Air_Heating_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:StandbyHeatingSetpoint;1" + "OutputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingZoneAirTemperatureSetpoint;1" }, { "InputDtmi": "dtmi:mapped:core:Urinal;1", @@ -4274,6 +4274,10 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Deadband_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:AirTemperatureDeadbandSetpoint;1" }, + { + "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Setpoint;1", + "OutputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint" + }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" @@ -4282,6 +4286,10 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Deadband_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:AirTemperatureDeadbandSetpoint;1" }, + { + "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Setpoint;1", + "OutputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint;1" + }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Humidity_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:HumiditySetpoint;1" @@ -5462,10 +5470,18 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" }, + { + "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Temperature_Setpoint;1", + "OutputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingSetpoint;1" + }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" }, + { + "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Temperature_Setpoint;1", + "OutputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingSetpoint;1" + }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Humidity_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:HumiditySetpoint;1" diff --git a/data/Willow2Mapped.json b/data/Willow2Mapped.json index 6b033ad..38118b8 100644 --- a/data/Willow2Mapped.json +++ b/data/Willow2Mapped.json @@ -2724,6 +2724,10 @@ "InputDtmi": "dtmi:com:willowinc:OccupiedActuator;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupancy_Command;1" }, + { + "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint", + "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Setpoint;1" + }, { "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint;1", "OutputDtmi": "dtmi:mapped:core:Occupied_Cooling_Air_Temperature_Setpoint;1" @@ -2732,6 +2736,10 @@ "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingZoneAirTemperatureSetpoint;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Zone_Air_Cooling_Temperature_Setpoint;1" }, + { + "InputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint", + "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Setpoint;1" + }, { "InputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint;1", "OutputDtmi": "dtmi:mapped:core:Occupied_Heating_Air_Temperature_Setpoint;1" @@ -4390,7 +4398,7 @@ }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingSetpoint;1", - "OutputDtmi": "dtmi:mapped:core:Unoccupied_Cooling_Air_Temperature_Setpoint;1" + "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Temperature_Setpoint;1" }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingZoneAirTemperatureSetpoint;1", @@ -4398,7 +4406,11 @@ }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingSetpoint;1", - "OutputDtmi": "dtmi:mapped:core:Unoccupied_Heating_Air_Temperature_Setpoint;1" + "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Temperature_Setpoint;1" + }, + { + "InputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingZoneAirTemperatureSetpoint;1", + "OutputDtmi": "dtmi:mapped:core:Unoccupied_Zone_Air_Heating_Temperature_Setpoint;1" }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedState;1", From 1714fa8d7020be21219d17568f04a2b018466507 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 12:58:22 -0800 Subject: [PATCH 06/11] Fix invalid dtmis --- data/Mapped2Willow.json | 2 +- data/Willow2Mapped.json | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index c6a6d9f..e9d2b73 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -4276,7 +4276,7 @@ }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint" + "OutputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint;1" }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Supply_Air_Flow_Setpoint;1", diff --git a/data/Willow2Mapped.json b/data/Willow2Mapped.json index 38118b8..310fbff 100644 --- a/data/Willow2Mapped.json +++ b/data/Willow2Mapped.json @@ -2724,10 +2724,6 @@ "InputDtmi": "dtmi:com:willowinc:OccupiedActuator;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupancy_Command;1" }, - { - "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Setpoint;1" - }, { "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint;1", "OutputDtmi": "dtmi:mapped:core:Occupied_Cooling_Air_Temperature_Setpoint;1" From 98cef3024fab9ea8e077e598d63a75aea597532d Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:00:02 -0800 Subject: [PATCH 07/11] Update versions --- Ontologies.Mappings/test/Ontologies.Mappings.Test.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ontologies.Mappings/test/Ontologies.Mappings.Test.csproj b/Ontologies.Mappings/test/Ontologies.Mappings.Test.csproj index b468e17..94d0ba1 100644 --- a/Ontologies.Mappings/test/Ontologies.Mappings.Test.csproj +++ b/Ontologies.Mappings/test/Ontologies.Mappings.Test.csproj @@ -21,14 +21,14 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all From 7ec96c653922a1ebc1a6e839fe10a7d70a2c8849 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:43:27 -0800 Subject: [PATCH 08/11] remove dups --- data/Mapped2Willow.json | 22 +++++----------------- data/Willow2Mapped.json | 12 ++++-------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index e9d2b73..58ba0c2 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -418,6 +418,10 @@ "InputDtmi": "dtmi:mapped:core:Condenser_Water_Flow_Command;1", "OutputDtmi": "dtmi:com:willowinc:CondenserWaterPumpRunActuator;1" }, + { + "InputDtmi": "dtmi:mapped:core:Condensing_Unit;1", + "OutputDtmi": "dtmi:com:willowinc:Condenser;1" + }, { "InputDtmi": "dtmi:mapped:core:Connected_Access_Point_Status;1", "OutputDtmi": "dtmi:com:willowinc:OperationalState;1" @@ -2410,10 +2414,6 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Condensate_Leak_Alarm;1", "OutputDtmi": "dtmi:com:willowinc:LeakAlarmState;1" }, - { - "InputDtmi": "dtmi:org:brickschema:schema:Brick:Condenser;1", - "OutputDtmi": "dtmi:com:willowinc:Condenser;1" - }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Condenser_Heat_Exchanger;1", "OutputDtmi": "dtmi:com:willowinc:HeatExchanger;1" @@ -4286,10 +4286,6 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Deadband_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:AirTemperatureDeadbandSetpoint;1" }, - { - "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint;1" - }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Humidity_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:HumiditySetpoint;1" @@ -4456,7 +4452,7 @@ }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Outside_Damper;1", - "OutputDtmi": "dtmi:com:willowinc:OutsideDamper;1" + "OutputDtmi": "dtmi:com:willowinc:OutsideAirDamper;1" }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Outside_Face_Surface_Temperature_Sensor;1", @@ -5470,18 +5466,10 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" }, - { - "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingSetpoint;1" - }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" }, - { - "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingSetpoint;1" - }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Humidity_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:HumiditySetpoint;1" diff --git a/data/Willow2Mapped.json b/data/Willow2Mapped.json index 310fbff..8401646 100644 --- a/data/Willow2Mapped.json +++ b/data/Willow2Mapped.json @@ -686,7 +686,7 @@ }, { "InputDtmi": "dtmi:com:willowinc:Condenser;1", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Condenser;1" + "OutputDtmi": "dtmi:mapped:core:Condensing_Unit;1" }, { "InputDtmi": "dtmi:com:willowinc:CondenserLeavingRefrigerantStaticPressureSensor;1", @@ -2732,10 +2732,6 @@ "InputDtmi": "dtmi:com:willowinc:OccupiedCoolingZoneAirTemperatureSetpoint;1", "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Zone_Air_Cooling_Temperature_Setpoint;1" }, - { - "InputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Temperature_Setpoint;1" - }, { "InputDtmi": "dtmi:com:willowinc:OccupiedHeatingSetpoint;1", "OutputDtmi": "dtmi:mapped:core:Occupied_Heating_Air_Temperature_Setpoint;1" @@ -4394,7 +4390,7 @@ }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingSetpoint;1", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Cooling_Temperature_Setpoint;1" + "OutputDtmi": "dtmi:mapped:core:Unoccupied_Cooling_Air_Temperature_Setpoint;1" }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedCoolingZoneAirTemperatureSetpoint;1", @@ -4402,7 +4398,7 @@ }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingSetpoint;1", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Unoccupied_Heating_Temperature_Setpoint;1" + "OutputDtmi": "dtmi:mapped:core:Unoccupied_Heating_Air_Temperature_Setpoint;1" }, { "InputDtmi": "dtmi:com:willowinc:UnoccupiedHeatingZoneAirTemperatureSetpoint;1", @@ -4626,7 +4622,7 @@ }, { "InputDtmi": "dtmi:com:willowinc:WaterCooledCondenser;1", - "OutputDtmi": "dtmi:org:brickschema:schema:Brick:Condenser;1" + "OutputDtmi": "dtmi:mapped:core:Condensing_Unit;1" }, { "InputDtmi": "dtmi:com:willowinc:WaterDeltaPressureSensor;1", From 2dac09eba707afd57719eee22ce6495f64075f24 Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:53:15 -0800 Subject: [PATCH 09/11] remove deprecation --- data/Mapped2Willow.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index 58ba0c2..cf95281 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -4274,10 +4274,6 @@ "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Deadband_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:AirTemperatureDeadbandSetpoint;1" }, - { - "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Cooling_Temperature_Setpoint;1", - "OutputDtmi": "dtmi:com:willowinc:OccupiedCoolingSetpoint;1" - }, { "InputDtmi": "dtmi:org:brickschema:schema:Brick:Occupied_Heating_Supply_Air_Flow_Setpoint;1", "OutputDtmi": "dtmi:com:willowinc:DischargeAirFlowSetpoint;1" From a6728deea3593f1e52cd54b2582ff6f9ed52731d Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 13:59:22 -0800 Subject: [PATCH 10/11] remove deprecated class from mappings --- data/Mapped2Willow.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/data/Mapped2Willow.json b/data/Mapped2Willow.json index cf95281..b31b901 100644 --- a/data/Mapped2Willow.json +++ b/data/Mapped2Willow.json @@ -1146,10 +1146,6 @@ "InputDtmi": "dtmi:mapped:core:Microwave_Oven;1", "OutputDtmi": "dtmi:com:willowinc:MicrowaveOven;1" }, - { - "InputDtmi": "dtmi:mapped:core:Min_Air_Temperature_Setpoint_Limit;1", - "OutputDtmi": "dtmi:com:willowinc:MinLimit;1" - }, { "InputDtmi": "dtmi:mapped:core:Min_Cooling_Air_Temperature_Setpoint_Limit;1", "OutputDtmi": "dtmi:com:willowinc:MinLimit;1" From 7d3830123e338d43a4f465c02d690a3d58e1561c Mon Sep 17 00:00:00 2001 From: Connor Cantrell <33592545+connorjcantrell@users.noreply.github.com> Date: Thu, 14 Nov 2024 14:34:59 -0800 Subject: [PATCH 11/11] Remove airport ontology test --- .../test/WillowMappingValidationTests.cs | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Ontologies.Mappings/test/WillowMappingValidationTests.cs b/Ontologies.Mappings/test/WillowMappingValidationTests.cs index b4cbf51..4d0cc82 100644 --- a/Ontologies.Mappings/test/WillowMappingValidationTests.cs +++ b/Ontologies.Mappings/test/WillowMappingValidationTests.cs @@ -219,34 +219,34 @@ public void ValidateTargetDtmisAreValid(string resourcePath, LoaderType loaderTy Assert.Empty(invalidSources); } - [Theory] - [InlineData("https://mapped.com/ontologies/mapping/Mapped2Willow/latest.json", LoaderType.Http)] - [InlineData("..//..//..//..//src//Mappings//v1//Willow//Mapped2Willow.json", LoaderType.File)] - public void ValidateTargetDtmisForAirportAreValid(string resourcePath, LoaderType loaderType) - { - var mockLogger = new Mock(); - - IOntologyMappingLoader resourceLoader = loaderType == LoaderType.Http ? - new MappedHttpOntologyMappingLoader(mockLogger.Object, resourcePath) : - new FileOntologyMappingLoader(mockLogger.Object, resourcePath); - - var ontologyMappingManager = new OntologyMappingManager(resourceLoader); - var modelParser = new ModelParser(); - var inputDtmi = LoadDtdl(new[] { "Willow.Ontology.DTDLv3.jsonld" }); - - List invalidSources = new List(); - try - { - var inputModels = modelParser.Parse(inputDtmi); - ontologyMappingManager.ValidateTargetOntologyMapping(inputModels, out invalidSources); - } - catch (Exception ex) - { - Console.WriteLine(ex); - } - - Assert.Empty(invalidSources); - } + // [Theory] + // [InlineData("https://mapped.com/ontologies/mapping/Mapped2Willow/latest.json", LoaderType.Http)] + // [InlineData("..//..//..//..//src//Mappings//v1//Willow//Mapped2Willow.json", LoaderType.File)] + // public void ValidateTargetDtmisForAirportAreValid(string resourcePath, LoaderType loaderType) + // { + // var mockLogger = new Mock(); + + // IOntologyMappingLoader resourceLoader = loaderType == LoaderType.Http ? + // new MappedHttpOntologyMappingLoader(mockLogger.Object, resourcePath) : + // new FileOntologyMappingLoader(mockLogger.Object, resourcePath); + + // var ontologyMappingManager = new OntologyMappingManager(resourceLoader); + // var modelParser = new ModelParser(); + // var inputDtmi = LoadDtdl(new[] { "Willow.Ontology.DTDLv3.jsonld" }); + + // List invalidSources = new List(); + // try + // { + // var inputModels = modelParser.Parse(inputDtmi); + // ontologyMappingManager.ValidateTargetOntologyMapping(inputModels, out invalidSources); + // } + // catch (Exception ex) + // { + // Console.WriteLine(ex); + // } + + // Assert.Empty(invalidSources); + // } private IEnumerable LoadDtdl(string[] dtdlFiles) {