test/java/util/concurrent/BlockingQueue/LastElement.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File jdk-7161229 Cdiff test/java/util/concurrent/BlockingQueue/LastElement.java

test/java/util/concurrent/BlockingQueue/LastElement.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 2005, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. --- 1,7 ---- /* ! * Copyright (c) 2005, 2012, 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 * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation.
*** 21,31 **** * questions. */ /* * @test ! * @bug 6215625 * @summary Check correct behavior when last element is removed. * @author Martin Buchholz */ import java.util.*; --- 21,31 ---- * questions. */ /* * @test ! * @bug 6215625 7161229 * @summary Check correct behavior when last element is removed. * @author Martin Buchholz */ import java.util.*;
*** 36,48 **** testQueue(new LinkedBlockingQueue<Integer>()); testQueue(new LinkedBlockingDeque<Integer>()); testQueue(new ArrayBlockingQueue<Integer>(10, true)); testQueue(new ArrayBlockingQueue<Integer>(10, false)); testQueue(new LinkedTransferQueue<Integer>()); ! ! System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); ! if (failed > 0) throw new Exception("Some tests failed"); } void testQueue(BlockingQueue<Integer> q) throws Throwable { Integer one = 1; Integer two = 2; --- 36,46 ---- testQueue(new LinkedBlockingQueue<Integer>()); testQueue(new LinkedBlockingDeque<Integer>()); testQueue(new ArrayBlockingQueue<Integer>(10, true)); testQueue(new ArrayBlockingQueue<Integer>(10, false)); testQueue(new LinkedTransferQueue<Integer>()); ! testQueue(new PriorityBlockingQueue<Integer>()); } void testQueue(BlockingQueue<Integer> q) throws Throwable { Integer one = 1; Integer two = 2;
*** 57,66 **** --- 55,65 ---- check(q.isEmpty() && q.size() == 0); q.put(three); try {check(q.take() == three);} catch (Throwable t) {unexpected(t);} check(q.isEmpty() && q.size() == 0); + check(noRetention(q)); // iterator().remove() q.clear(); q.put(one); check(q.offer(two));
*** 75,84 **** --- 74,103 ---- try {check(q.take() == three);} catch (Throwable t) {unexpected(t);} check(q.isEmpty() && q.size() == 0); } + boolean noRetention(BlockingQueue<?> q) { + if (q instanceof PriorityBlockingQueue) { + PriorityBlockingQueue<?> pbq = (PriorityBlockingQueue) q; + try { + java.lang.reflect.Field queue = + PriorityBlockingQueue.class.getDeclaredField("queue"); + queue.setAccessible(true); + Object[] a = (Object[]) queue.get(pbq); + return a[0] == null; + } + catch (NoSuchFieldException e) { + unexpected(e); + } + catch (java.security.AccessControlException | IllegalAccessException e) { + // ignore - security manager must be installed + } + } + return true; + } + //--------------------- Infrastructure --------------------------- volatile int passed = 0, failed = 0; void pass() {passed++;} void fail() {failed++; Thread.dumpStack();} void fail(String msg) {System.err.println(msg); fail();}
test/java/util/concurrent/BlockingQueue/LastElement.java
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File