Merge branch 'findbugs' into spotbugs

 Conflicts:
	src/main/java/com/mebigfatguy/fbcontrib/detect/UnitTestAssertionOddities.java

Author: mebigfatguy

src/main/java/com/mebigfatguy/fbcontrib/detect/UnitTestAssertionOddities.java

@@ -87,6 +87,8 @@ private enum TestFrameworkType {
     private static final String MBEAN_CLASS = "org/meanbean/test/BeanTester";
     private static final String MBEAN_METHOD = "testBean";
 
+    private static final String RESULTSACTION_CLASS = "org/springframework/test/web/servlet/ResultActions";
+
     private BugReporter bugReporter;
     private JavaClass testCaseClass;
     private JavaClass testAnnotationClass;
@@ -338,6 +340,11 @@ public void sawOpcode(int seen) {
                     if (MBEAN_METHOD.equals(methodName)) {
                         sawAssert = true;
                     }
+                } else if (RESULTSACTION_CLASS.equals(className)) {
+                    String methodName = getMethodName();
+                    if ("andExpect".equals(methodName) || "andExpectAll".equals(methodName)) {
+                        sawAssert = true;
+                    }
                 }
             } else if ((seen == Const.ATHROW) && (stack.getStackDepth() > 0)) {
                 OpcodeStack.Item item = stack.getStackItem(0);

src/main/java/com/mebigfatguy/fbcontrib/detect/WriteOnlyCollection.java

@@ -130,6 +130,7 @@ public class WriteOnlyCollection extends MissingMethodsDetector {
         nim.add("addLast");
         nim.add("clear");
         nim.add("ensureCapacity");
+        nim.add("forEach");
         nim.add("insertElementAt");
         nim.add("push");
         nim.add("put");