fix #186, rolling back some of the changes in #184

app/src/main/java/fr/inria/verveine/extractor/java/visitors/GetVisitedEntityAbstractVisitor.java

@@ -239,19 +239,28 @@ public void endVisitInitializer(Initializer node) {
 
 	@SuppressWarnings("unchecked")
 	public boolean visitEnumConstantDeclaration(EnumConstantDeclaration node) {
-		boolean hasInitBlock = false;
+		boolean hasInitBlock = (node.getAnonymousClassDeclaration() != null);
+
 		for (Expression expr : (List<Expression>)node.arguments()) {
 			if (expr != null) {
-				visitClassMemberInitializer(expr);
 				hasInitBlock = true;
 				break;  // we recovered the INIT_BLOCK, no need to look for other declaration
 			}
 		}
-		return hasInitBlock;
 
+		if (hasInitBlock) {
+			ctxtPushInitializerMethod();
+		}
+		return hasInitBlock;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void endVisitEnumConstantDeclaration(EnumConstantDeclaration node) {
+		if (node.getAnonymousClassDeclaration() != null) {
+			context.pop();  // pops the EntityDictionary.INIT_BLOCK_NAME method
+			return;
+		}
+
 		for (Expression expr : (List<Expression>)node.arguments()) {
 			if (expr != null) {
 				context.pop();  // pops the EntityDictionary.INIT_BLOCK_NAME method
@@ -297,7 +306,7 @@ private Method visitClassMemberInitializer(Expression initializingExpr) {
 	 *
 	 * Used in the case of instance/class initializer and initializing expressions of FieldDeclarations and EnumConstantDeclarations
 	 */
-	private Method ctxtPushInitializerMethod() {
+	protected Method ctxtPushInitializerMethod() {
 		TType owner = context.topType();
 		Method fmx = recoverInitializerMethod((TWithMethods)owner);
 		if (fmx == null) {

app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorAccessRef.java

@@ -276,12 +276,8 @@ public void endVisit(FieldDeclaration node) {
 		endVisitFieldDeclaration(node);
 	}
 
-	@SuppressWarnings("unchecked")
 	public boolean visit(EnumConstantDeclaration node) {
-        if (visitEnumConstantDeclaration(node)) {
-            visitNodeList(node.arguments());
-        }
-		return false;
+        return visitEnumConstantDeclaration(node);
 	}
 
 	public void endVisit(EnumConstantDeclaration node) {

app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorInvocRef.java

@@ -229,6 +229,14 @@ public void endVisit(FieldDeclaration node) {
 		endVisitFieldDeclaration(node);
 	}
 
+	public boolean visit(EnumConstantDeclaration node) {
+        return visitEnumConstantDeclaration(node);
+	}
+
+	public void endVisit(EnumConstantDeclaration node) {
+		endVisitEnumConstantDeclaration(node);
+	}
+
 	@SuppressWarnings("unchecked")
 	public boolean visit(MethodInvocation node) {
 		//System.err.println("visit(MethodInvocation): " + node.getName().getFullyQualifiedName());

app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/VisitorTypeRefRef.java

@@ -242,6 +242,14 @@ public void endVisit(FieldDeclaration node) {
 		endVisitFieldDeclaration(node);
 	}
 
+	public boolean visit(EnumConstantDeclaration node) {
+        return visitEnumConstantDeclaration(node);
+	}
+
+	public void endVisit(EnumConstantDeclaration node) {
+		endVisitEnumConstantDeclaration(node);
+	}
+
     @Override
     /* We are not dealing with the variable of the catch here but in VisitorExceptionRef
      * therefore we only visit the body of the catch

app/src/test/java/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java

@@ -152,7 +152,10 @@ public void testUnresolvedDeclaration() {
 
 	@ Test
 	public void testConstructorInvocations() {
-		parse(new String[] {"src/test/resources/ad_hoc/DefaultConstructor.java", "src/test/resources/ad_hoc/InvokWithFullPath.java", "src/test/resources/ad_hoc/annotations/Book.java"});
+		parse(new String[] {
+				"src/test/resources/ad_hoc/DefaultConstructor.java",
+				"src/test/resources/ad_hoc/InvokWithFullPath.java",
+				"src/test/resources/ad_hoc/annotations/Book.java"});
 
 		Method meth = detectFamixElement( Method.class, "methodWithClassScope");
 		assertNotNull(meth);
@@ -564,7 +567,7 @@ public void testEnumAccess() {
 				assertEquals("toString", ((TNamedEntity) access.getAccessor()).getName());
 			}
 		}
-		assertTrue("Did not find CUBS EnumValue in Suit Enum", foundClubs);
+		assertTrue("Did not find 'CLUBS' EnumValue in 'Suit' Enum", foundClubs);
 
 		org.moosetechnology.model.famix.famixjavaentities.Enum pl = detectFamixElement(org.moosetechnology.model.famix.famixjavaentities.Enum.class, "Planet");
 		assertNotNull(pl);
@@ -662,7 +665,11 @@ public void testReadWriteAccess() {
 
 	@Test
 	public void testStaticInitializationBlock() {
-		parse(new String[] {"src/test/resources/ad_hoc/Card.java", "src/test/resources/ad_hoc/Planet.java", "src/test/resources/ad_hoc/InvokWithFullPath.java", "src/test/resources/ad_hoc/DefaultConstructor.java"});
+		parse(new String[] {
+				"src/test/resources/ad_hoc/Card.java",
+				"src/test/resources/ad_hoc/Planet.java",
+				"src/test/resources/ad_hoc/InvokWithFullPath.java",
+				"src/test/resources/ad_hoc/DefaultConstructor.java"});
 
 		Collection<Method> l_meth = entitiesNamed( Method.class, EntityDictionary.INIT_BLOCK_NAME);
 		assertEquals(3, l_meth.size());
@@ -696,6 +703,32 @@ public void testStaticInitializationBlockNewString() {
 		assertEquals("ONE", ((TNamedEntity) firstElt(fmx.getEnumValues())).getName());
 
 		assertEquals(2, fmx.getMethods().size());  // constructor + INIT_BLOCK
+		assertTrue("Enum constructor not found", fmx.getMethods().stream().anyMatch( m -> m.getName().equals("EnumConstWithInitNewString") ) );
+		assertTrue("Enum initializer method not found", fmx.getMethods().stream().anyMatch( m -> m.getName().equals("<Initializer>") ) );
+	}
+
+	@Test
+	public void testCastInEnumInitialization() {
+		parse(new String[]{"src/test/resources/ad_hoc/EnumConstWithInitNewString.java"});
+
+		Method fmx = detectFamixElement(Method.class, "<Initializer>");
+		assertNotNull(fmx);
+
+        assertEquals(1, fmx.numberOfOutgoingReferences());
+        Interface clazz = (Interface) ((Reference)firstElt(fmx.getOutgoingReferences())).getReferredEntity();
+        assertEquals("CharSequence", clazz.getName());
+	}
+
+	@Test
+	public void testInvocationInEnumInitialization() {
+		parse(new String[]{"src/test/resources/ad_hoc/EnumConstWithInitNewString.java"});
+
+		Method fmx = detectFamixElement(Method.class, "<Initializer>");
+		assertNotNull(fmx);
+
+        assertEquals(1, fmx.numberOfOutgoingInvocations());
+        String constructorName = ((Invocation)firstElt(fmx.getOutgoingInvocations())).getSignature();
+        assertEquals("String(\"whatever\")", constructorName);
 	}
 
 	@Test

app/src/test/resources/ad_hoc/EnumConstWithInitNewString.java

@@ -1,19 +1,12 @@
 package ad_hoc;
-/*
- * A test copied from jdt2mse (I believe) that happenned to break verveinej
- */
+
 public enum EnumConstWithInitNewString {
 
-       ONE(new String("whatever")) {
-              @Override
-              void hook() {
-                     string.toString();
-              }
-       };
+       ONE( (CharSequence)new String("whatever") );
 
-       String string;
+	CharSequence string;
 
-       EnumConstWithInitNewString(String s) {
+       EnumConstWithInitNewString(CharSequence s) {
               this.string = s;
        }