Throw an exception in case of missing property

itesla · May 22, 2017 · be97761 · be97761
1 parent db783c2
commit be97761
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...ovy-extension/src/main/groovy/eu/itesla_project/iidm/network/IdentifiableExtension.groovy b/...ovy-extension/src/main/groovy/eu/itesla_project/iidm/network/IdentifiableExtension.groovy
@@ -14,7 +14,15 @@ class IdentifiableExtension {
     static Object propertyMissing(Identifiable self, String name) {
         // first check if an extension exist then a property
         Identifiable.Extension extension = self.getExtensionByName(name)
-        extension != null ? extension : self.properties[name]
+        if (extension != null) {
+            extension
+        } else {
+            Object value = self.properties[name]
+            if (value == null) {
+                throw new RuntimeException("Property '" + name + "' of '" + self.id + "' not found")
+            }
+            value
+        }
     }
 
     static void propertyMissing(Identifiable self, String name, Object value) {

diff --git a/...extension/src/test/groovy/eu/itesla_project/iidm/network/IdentifiableExtensionTest.groovy b/...extension/src/test/groovy/eu/itesla_project/iidm/network/IdentifiableExtensionTest.groovy
@@ -45,14 +45,23 @@ class IdentifiableExtensionTest {
     @Test
     void testProperty() {
         assertFalse(s.hasProperty())
-        assertNull(s.greeting)
+        try {
+            s.greeting
+            fail()
+        } catch (Exception ignored) {
+        }
         s.greeting = "hello"
         assertEquals("hello", s.getProperties().getProperty("greeting"))
         assertEquals("hello", s.greeting)
     }
 
     @Test
     void testExtension() {
+        try {
+            s.foo
+            fail()
+        } catch (Exception ignored) {
+        }
         s.addExtension(Substation.class, new Foo())
         assertNotNull(s.foo)
         s.foo.value = 3f