Added test for the verifying of annotated methods: this is the core

funcionality of UnexpectedAccessDetector

src/main/java/jp/co/worksap/oss/findbugs/guava/UnexpectedAccessDetector.java

@@ -52,7 +52,7 @@ public void sawOpcode(int opcode) {
 			MethodDescriptor invokedMethod = getMethodDescriptorOperand();
 
 			try {
-				verifyVisibility(invokedClass, invokedMethod);
+				verifyVisibility(invokedClass, invokedMethod, true);
 			} catch (ClassNotFoundException e) {
 				String message = String.format("Detector could not find %s, you should add this class into CLASSPATH", invokedClass.getDottedClassName());
 				bugReporter.logError(message, e);
@@ -63,12 +63,16 @@ public void sawOpcode(int opcode) {
 	/**
 	 * <p>Report if specified method is package-private and annotated by {@code @VisibleForTesting}.</p>
 	 */
-	private void verifyVisibility(ClassDescriptor invokedClass, MethodDescriptor invokedMethod) throws ClassNotFoundException {
+	@VisibleForTesting
+	void verifyVisibility(ClassDescriptor invokedClass, MethodDescriptor invokedMethod, boolean reportCaller) throws ClassNotFoundException {
 		JavaClass bcelClass = Repository.getRepository().loadClass(invokedClass.getDottedClassName());
 		Method bcelMethod = findMethod(bcelClass, invokedMethod);
 
 		if (checkVisibility(bcelMethod) && checkAnnotated(bcelMethod)) {
-			BugInstance bug = new BugInstance(this, "GUAVA_UNEXPECTED_ACCESS_TO_VISIBLE_FOR_TESTING", HIGH_PRIORITY).addCalledMethod(this).addClassAndMethod(this).addSourceLine(this);
+			BugInstance bug = new BugInstance(this, "GUAVA_UNEXPECTED_ACCESS_TO_VISIBLE_FOR_TESTING", HIGH_PRIORITY);
+			if (reportCaller) {
+				bug.addCalledMethod(this).addClassAndMethod(this).addSourceLine(this);
+			}
 			bugReporter.reportBug(bug);
 		}
 	}

src/test/java/jp/co/worksap/oss/findbugs/guava/TestClass.java

@@ -0,0 +1,20 @@
+/*
+ *  (c) tolina GmbH, 2014
+ */
+package jp.co.worksap.oss.findbugs.guava;
+
+import com.google.common.annotations.VisibleForTesting;
+
+/**
+ * Class used only for {@link UnexpectedAccessDetector}-tests
+ * @author tolina GmbH
+ *
+ */
+class TestClass {
+
+	@VisibleForTesting
+	void test() {
+		return;
+	}
+
+}

src/test/java/jp/co/worksap/oss/findbugs/guava/UnexpectedAccessDetectorTest.java

@@ -3,9 +3,11 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyByte;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.apache.bcel.Constants;
@@ -17,12 +19,18 @@
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.classfile.Method;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.objectweb.asm.Opcodes;
 
+import com.google.common.annotations.VisibleForTesting;
+
+import edu.umd.cs.findbugs.BugInstance;
 import edu.umd.cs.findbugs.BugReporter;
+import edu.umd.cs.findbugs.classfile.ClassDescriptor;
+import edu.umd.cs.findbugs.classfile.DescriptorFactory;
 import edu.umd.cs.findbugs.classfile.MethodDescriptor;
 
 
@@ -46,15 +54,39 @@ public void initMocks() {
 	}
 
 	@Test
+	@Ignore
 	public void testNormalMethod() throws Exception {
 		//assertNoBugsReported(ClassWhichCallsNormalMethod.class, detector, bugReporter);
 	}
 
 	@Test
+	@Ignore
 	public void testCallingAnnotatedMethod() throws Exception {
 		//		assertBugReported(ClassWhichCallsVisibleMethodForTesting.class, detector, bugReporter, ofType("GUAVA_UNEXPECTED_ACCESS_TO_VISIBLE_FOR_TESTING"));
 	}
 
+	/**
+	 * Tests reporting a Bug when:
+	 * - called Method has 'default'-visibility
+	 * - called Method is annotated with {@link VisibleForTesting}
+	 * @throws Exception
+	 */
+	@Test
+	public void testVerifyVisibility() throws Exception {
+		UnexpectedAccessDetector detector = new UnexpectedAccessDetector(bugReporter);
+		ClassDescriptor invokedClassDescriptor;
+		MethodDescriptor invokedMethodDescriptor;
+
+		invokedClassDescriptor = DescriptorFactory.createClassDescriptor(Object.class);
+		invokedMethodDescriptor = DescriptorFactory.instance().getMethodDescriptor("java/lang/Object", "equals", "(Ljava/lang/Object;)Z", false);
+		detector.verifyVisibility(invokedClassDescriptor, invokedMethodDescriptor, false);
+
+		invokedClassDescriptor = DescriptorFactory.createClassDescriptor(TestClass.class);
+		invokedMethodDescriptor = DescriptorFactory.instance().getMethodDescriptor("jp/co/worksap/oss/findbugs/guava/TestClass", "test", "()V", false);
+
+		detector.verifyVisibility(invokedClassDescriptor, invokedMethodDescriptor, false);
+		verify(bugReporter).reportBug(any(BugInstance.class));
+	}
 
 	/**
 	 * Tests searching for {@link Method}s of a {@link JavaClass}
@@ -72,7 +104,7 @@ public void testFindMethod() {
 		testMethod.setSignatureIndex(signature_index);
 		testMethod.setConstantPool(constant_pool);
 		Constant nameConstant = new ConstantUtf8("equals");
-		Constant signatureConstant = new ConstantUtf8("Ljava/lang/Object;");
+		Constant signatureConstant = new ConstantUtf8("(Ljava/lang/Object;)Z");
 
 		when(constant_pool.getConstant(eq(name_index), anyByte())).thenReturn(nameConstant);
 		when(constant_pool.getConstant(eq(signature_index), anyByte())).thenReturn(signatureConstant);
@@ -81,7 +113,7 @@ public void testFindMethod() {
 		when(bcelClass.getMethods()).thenReturn(methods);
 		when(bcelClass.getClassName()).thenReturn("java.lang.Object");
 
-		MethodDescriptor invokedMethod = new MethodDescriptor("java/lang/Object", "equals", "Ljava/lang/Object;", false); //   mock(MethodDescriptor.class);
+		MethodDescriptor invokedMethod = new MethodDescriptor("java/lang/Object", "equals", "(Ljava/lang/Object;)Z", false); //   mock(MethodDescriptor.class);
 
 		Method method = detector.findMethod(bcelClass, invokedMethod);