observing: introduce the ObservableProperty enum

2 files changed, 11 insertions, 10 deletions

diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeTest.java
index 0e4410820..492a283b8 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/NodeTest.java
@@ -3,6 +3,7 @@ package com.github.javaparser.ast;
 import com.github.javaparser.JavaParser;
 import com.github.javaparser.ast.observing.AstObserver;
 import com.github.javaparser.ast.observing.AstObserverAdapter;
+import com.github.javaparser.ast.observing.ObservableProperty;
 import com.github.javaparser.ast.type.PrimitiveType;
 import org.junit.Test;
 
@@ -21,8 +22,8 @@ public class NodeTest {
         List<String> changes = new ArrayList<>();
         AstObserver observer = new AstObserverAdapter() {
             @Override
-            public void propertyChange(Node observedNode, String propertyName, Object oldValue, Object newValue) {
-                changes.add(String.format("%s.%s changed from %s to %s", observedNode.getClass().getSimpleName(), propertyName, oldValue, newValue));
+            public void propertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+                changes.add(String.format("%s.%s changed from %s to %s", observedNode.getClass().getSimpleName(), property.name().toLowerCase(), oldValue, newValue));
             }
         };
         cu.registerForSubtree(observer);
@@ -34,11 +35,11 @@ public class NodeTest {
 
         cu.getClassByName("MyCoolClass").getFieldByName("f").setElementType(new PrimitiveType(PrimitiveType.Primitive.Boolean));
         assertEquals(Arrays.asList("ClassOrInterfaceDeclaration.name changed from A to MyCoolClass",
-                "FieldDeclaration.elementType changed from int to boolean"), changes);
+                "FieldDeclaration.element_type changed from int to boolean"), changes);
 
         cu.getClassByName("MyCoolClass").getMethodsByName("foo").get(0).getParamByName("p").setName("myParam");
         assertEquals(Arrays.asList("ClassOrInterfaceDeclaration.name changed from A to MyCoolClass",
-                "FieldDeclaration.elementType changed from int to boolean",
+                "FieldDeclaration.element_type changed from int to boolean",
                 "VariableDeclaratorId.name changed from p to myParam"), changes);
     }
 }
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/observing/PropagatingAstObserverTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/observing/PropagatingAstObserverTest.java
index b01807208..cb9a41539 100644
--- a/javaparser-testing/src/test/java/com/github/javaparser/ast/observing/PropagatingAstObserverTest.java
+++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/observing/PropagatingAstObserverTest.java
@@ -21,8 +21,8 @@ public class PropagatingAstObserverTest {
         List<String> changes = new ArrayList<>();
         AstObserver observer = new PropagatingAstObserver() {
             @Override
-            public void concretePropertyChange(Node observedNode, String propertyName, Object oldValue, Object newValue) {
-                changes.add(String.format("%s.%s changed from %s to %s", observedNode.getClass().getSimpleName(), propertyName, oldValue, newValue));
+            public void concretePropertyChange(Node observedNode, ObservableProperty property, Object oldValue, Object newValue) {
+                changes.add(String.format("%s.%s changed from %s to %s", observedNode.getClass().getSimpleName(), property.name().toLowerCase(), oldValue, newValue));
             }
         };
         cu.registerForSubtree(observer);
@@ -31,14 +31,14 @@ public class PropagatingAstObserverTest {
 
         FieldDeclaration fieldDeclaration = cu.getClassByName("A").addField("String", "foo");
         assertEquals(Arrays.asList("FieldDeclaration.modifiers changed from [] to []",
-                "FieldDeclaration.elementType changed from empty to String",
-                "VariableDeclaratorId.arrayBracketPairsAfterId changed from com.github.javaparser.ast.NodeList@1 to com.github.javaparser.ast.NodeList@1"), changes);
+                "FieldDeclaration.element_type changed from empty to String",
+                "VariableDeclaratorId.array_bracket_pairs_after_id changed from com.github.javaparser.ast.NodeList@1 to com.github.javaparser.ast.NodeList@1"), changes);
         assertEquals(true, fieldDeclaration.isRegistered(observer));
 
         cu.getClassByName("A").getFieldByName("foo").getVariables().get(0).setId(new VariableDeclaratorId("Bar"));
         assertEquals(Arrays.asList("FieldDeclaration.modifiers changed from [] to []",
-                "FieldDeclaration.elementType changed from empty to String",
-                "VariableDeclaratorId.arrayBracketPairsAfterId changed from com.github.javaparser.ast.NodeList@1 to com.github.javaparser.ast.NodeList@1",
+                "FieldDeclaration.element_type changed from empty to String",
+                "VariableDeclaratorId.array_bracket_pairs_after_id changed from com.github.javaparser.ast.NodeList@1 to com.github.javaparser.ast.NodeList@1",
                 "VariableDeclarator.id changed from foo to Bar"), changes);
     }
 }