Java: Accept qltest changes.

Author: aschackmull

java/ql/test/library-tests/guards/guardslogic.expected

@@ -49,8 +49,10 @@
 | Logic.java:44:10:44:10 | b | true | Logic.java:43:23:43:31 | Normal Exit |
 | Logic.java:48:5:48:22 | checkTrue(...) | exception | Logic.java:47:23:47:32 | Exceptional Exit |
 | Logic.java:48:5:48:22 | checkTrue(...) | no exception | Logic.java:47:23:47:32 | Normal Exit |
+| Logic.java:48:15:48:16 | !... | false | Logic.java:47:23:47:32 | Exceptional Exit |
 | Logic.java:48:15:48:16 | !... | true | Logic.java:47:23:47:32 | Normal Exit |
 | Logic.java:48:16:48:16 | b | false | Logic.java:47:23:47:32 | Normal Exit |
+| Logic.java:48:16:48:16 | b | true | Logic.java:47:23:47:32 | Exceptional Exit |
 | Logic.java:52:5:52:29 | checkTrue(...) | no exception | Logic.java:53:5:53:28 | <Expr>; |
 | Logic.java:52:5:52:29 | checkTrue(...) | no exception | Logic.java:54:5:54:15 | if (...) |
 | Logic.java:52:5:52:29 | checkTrue(...) | no exception | Logic.java:54:17:56:5 | { ... } |
@@ -70,5 +72,7 @@
 | Logic.java:61:10:61:10 | b | true | Logic.java:60:23:60:31 | Normal Exit |
 | Logic.java:65:5:65:22 | checkTrue(...) | exception | Logic.java:64:23:64:32 | Exceptional Exit |
 | Logic.java:65:5:65:22 | checkTrue(...) | no exception | Logic.java:64:23:64:32 | Normal Exit |
+| Logic.java:65:15:65:16 | !... | false | Logic.java:64:23:64:32 | Exceptional Exit |
 | Logic.java:65:15:65:16 | !... | true | Logic.java:64:23:64:32 | Normal Exit |
 | Logic.java:65:16:65:16 | b | false | Logic.java:64:23:64:32 | Normal Exit |
+| Logic.java:65:16:65:16 | b | true | Logic.java:64:23:64:32 | Exceptional Exit |

java/ql/test/query-tests/Nullness/C.java

@@ -204,7 +204,7 @@ public void ex14(int[] a) {
         obj = new Object();
       } else if (a[i] == 2) {
         verifyNotNull(obj);
-        obj.hashCode(); // NPE - false positive
+        obj.hashCode(); // OK
       }
     }
   }

java/ql/test/query-tests/Nullness/NullMaybe.expected

@@ -29,7 +29,6 @@
 | C.java:137:7:137:10 | obj2 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:131:5:131:23 | Object obj2 | obj2 | C.java:132:9:132:20 | ... != ... | this |
 | C.java:144:15:144:15 | a | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:141:20:141:26 | a | a | C.java:142:13:142:21 | ... == ... | this |
 | C.java:188:9:188:11 | obj | Variable $@ may be null at this access because of $@ assignment. | C.java:181:5:181:22 | Object obj | obj | C.java:181:12:181:21 | obj | this |
-| C.java:207:9:207:11 | obj | Variable $@ may be null at this access because of $@ assignment. | C.java:201:5:201:22 | Object obj | obj | C.java:201:12:201:21 | obj | this |
 | C.java:219:9:219:10 | o1 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:212:20:212:28 | o1 | o1 | C.java:213:9:213:18 | ... == ... | this |
 | C.java:233:7:233:8 | xs | Variable $@ may be null at this access because of $@ assignment. | C.java:231:5:231:56 | int[] xs | xs | C.java:231:11:231:55 | xs | this |
 | F.java:11:5:11:7 | obj | Variable $@ may be null at this access as suggested by $@ null guard. | F.java:8:18:8:27 | obj | obj | F.java:9:9:9:19 | ... == ... | this |