bugfix on check of unit and perunit if these attributes dont exist

Author: FJanssen-TNO

esdlvalidator/validation/functions/check_child_attribute_not_null.py

@@ -164,10 +164,11 @@ def check_units(self, prop, qau):
         correct = 0
         msg = {"offending_asset": self.value.id}
         for i in range(0, len(self.args["unit_type"])):
-            unittype = getattr(qau, self.args["unit_type"][i])
-            unit = self.args["unit"][i]
-            if str(unittype.name).lower() == str(unit).lower():
-                correct += 1
+            if hasattr(qau, self.args["unit_type"][i]):
+                unittype = getattr(qau, self.args["unit_type"][i])
+                unit = self.args["unit"][i]
+                if str(unittype.name).lower() == str(unit).lower():
+                    correct += 1
         if correct != len(self.args["unit_type"]):
             result = self.__create_message("{0} should contain {1} of type {2}".format(prop, self.args["unit_type"],
                 self.args["unit"]), self.value)

esdlvalidator/validation/tests/test_validator.py

@@ -108,7 +108,7 @@ def test_validate_poc_scheme(self):
             elif validation.name == "costinformation_exists":
                 self.assertEqual(len(validation.warnings), 8)
             elif validation.name == "investmentcost_per_power_undefined":
-                self.assertEqual(len(validation.errors), 1)
+                self.assertEqual(len(validation.errors), 2)
             elif validation.name == "fixed_opex_undefined":
                 self.assertEqual(len(validation.errors), 1)
             elif validation.name == "var_opex_undefined":

testdata/esdls/PoC_validator with return network.esdl

@@ -21,7 +21,7 @@
             <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" id="dbe7fea2-c345-4aab-9df0-3afc27ff1751" description="Cost in EUR/kW" perMultiplier="KILO" physicalQuantity="COST"/>
           </installationCosts>
           <investmentCosts xsi:type="esdl:SingleValue" value="10.0" id="c162cc99-7c02-4866-8813-b68e72cc1d34">
-            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" perUnit="WATT" unit="EURO" id="aeeb19dc-815c-4801-9681-9f6058bbbaf1" description="Cost in EUR/kW" perMultiplier="KILO" physicalQuantity="COST"/>
+            <profileQuantityAndUnit xsi:type="esdl:QuantityAndUnitType" unit="EURO" id="aeeb19dc-815c-4801-9681-9f6058bbbaf1" description="Cost in EUR/kW" perMultiplier="KILO" physicalQuantity="COST"/>
           </investmentCosts>
         </costInformation>
       </asset>