Merge branch 'master' into stringtointmapper_reset

itesla · Jun 9, 2017 · c532376 · c532376
2 parents 3a3f103 + 006eb8c
commit c532376
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 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,15 +14,7 @@ class IdentifiableExtension {
     static Object propertyMissing(Identifiable self, String name) {
         // first check if an extension exist then a property
         Identifiable.Extension extension = self.getExtensionByName(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
-        }
+        extension != null ? extension : self.properties[name]
     }
 
     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,23 +45,15 @@ class IdentifiableExtensionTest {
     @Test
     void testProperty() {
         assertFalse(s.hasProperty())
-        try {
-            s.greeting
-            fail()
-        } catch (Exception ignored) {
-        }
+        assertNull(s.greeting)
         s.greeting = "hello"
         assertEquals("hello", s.getProperties().getProperty("greeting"))
         assertEquals("hello", s.greeting)
     }
 
     @Test
     void testExtension() {
-        try {
-            s.foo
-            fail()
-        } catch (Exception ignored) {
-        }
+        assertNull(s.foo)
         s.addExtension(Substation.class, new Foo())
         assertNotNull(s.foo)
         s.foo.value = 3f