Clarify tests

Author: benchaplin

server/src/test/java/org/elasticsearch/search/SearchServiceTests.java

@@ -168,7 +168,7 @@ public void testMaybeWrapListenerForStackTraceDebugLog() {
                 new MockLog.ExceptionSeenEventExpectation(
                     format("\"[%s]%s: failed to execute search request\" and an exception logged", nodeId, shardId),
                     SearchService.class.getCanonicalName(),
-                    Level.DEBUG,
+                    Level.DEBUG, // We will throw a 400-level exception, so it should only be logged at the debug level
                     format("[%s]%s: failed to execute search request", nodeId, shardId),
                     IllegalArgumentException.class,
                     exceptionMessage
@@ -187,8 +187,7 @@ public void onFailure(Exception e) {
                     mockLog.assertAllExpectationsMatched();
                 }
             };
-            // This is a 400-level exception, so it should only be debug logged
-            IllegalArgumentException e = new IllegalArgumentException(exceptionMessage);
+            IllegalArgumentException e = new IllegalArgumentException(exceptionMessage); // 400-level exception
             listener = maybeWrapListenerForStackTrace(listener, TransportVersion.current(), nodeId, shardId, threadPool);
             listener.onFailure(e);
         }
@@ -205,7 +204,7 @@ public void testMaybeWrapListenerForStackTraceWarnLog() {
                 new MockLog.ExceptionSeenEventExpectation(
                     format("\"[%s]%s: failed to execute search request\" and an exception logged", nodeId, shardId),
                     SearchService.class.getCanonicalName(),
-                    Level.WARN,
+                    Level.WARN, // We will throw a 500-level exception, so it should be logged at the warn level
                     format("[%s]%s: failed to execute search request", nodeId, shardId),
                     IllegalStateException.class,
                     exceptionMessage
@@ -224,8 +223,7 @@ public void onFailure(Exception e) {
                     mockLog.assertAllExpectationsMatched();
                 }
             };
-            // This is a 400-level exception, so it should only be debug logged
-            IllegalStateException e = new IllegalStateException(exceptionMessage);
+            IllegalStateException e = new IllegalStateException(exceptionMessage); // 500-level exception
             listener = maybeWrapListenerForStackTrace(listener, TransportVersion.current(), nodeId, shardId, threadPool);
             listener.onFailure(e);
         }

test/framework/src/main/java/org/elasticsearch/test/MockLog.java

@@ -344,10 +344,8 @@ public void match(LogEvent event) {
                     && event.getThrown().getClass() == clazz
                     && event.getThrown().getMessage().equals(exceptionMessage);
 
-                if (exceptionMatches) {
-                    if (patternMatches) {
-                        seenLatch.countDown();
-                    }
+                if (patternMatches && exceptionMatches) {
+                    seenLatch.countDown();
                 }
             }
         }