--- a/jdk/test/java/util/PriorityQueue/ForgetMeNot.java Mon Jun 02 09:19:59 2014 +0100
+++ b/jdk/test/java/util/PriorityQueue/ForgetMeNot.java Mon Jun 02 19:49:57 2014 +0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,16 +37,14 @@
private static void noMoreElements(final Iterator<Integer> it) {
for (int j = 0; j < 2; j++) {
- THROWS(NoSuchElementException.class,
- new Fun() { void f() { it.next(); }});
+ THROWS(NoSuchElementException.class, () -> it.next());
check(! it.hasNext());
}
}
private static void removeIsCurrentlyIllegal(final Iterator<Integer> it) {
for (int j = 0; j < 2; j++) {
- THROWS(IllegalStateException.class,
- new Fun() { void f() { it.remove(); }});
+ THROWS(IllegalStateException.class, () -> it.remove());
}
}
@@ -146,7 +144,7 @@
try {realMain(args);} catch (Throwable t) {unexpected(t);}
System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
if (failed > 0) throw new AssertionError("Some tests failed");}
- private static abstract class Fun {abstract void f() throws Throwable;}
+ interface Fun {void f() throws Throwable;}
static void THROWS(Class<? extends Throwable> k, Fun... fs) {
for (Fun f : fs)
try { f.f(); fail("Expected " + k.getName() + " not thrown"); }