From 0508fa48d139c7f76e8ee87b093345d4c9adacd6 Mon Sep 17 00:00:00 2001 From: henryjen Date: Wed, 11 Sep 2013 11:25:14 -0700 Subject: [PATCH] 8024500: Missing API coverage for java.util.function.BiFunction andThen Reviewed-by: mduigou, alanb --- .../util/Collections/SingletonIterator.java | 60 +++++++++++ .../function/BiFunction/BiFunctionTest.java | 100 ++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 test/java/util/Collections/SingletonIterator.java create mode 100644 test/java/util/function/BiFunction/BiFunctionTest.java diff --git a/test/java/util/Collections/SingletonIterator.java b/test/java/util/Collections/SingletonIterator.java new file mode 100644 index 000000000..966cce074 --- /dev/null +++ b/test/java/util/Collections/SingletonIterator.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @run testng SingletonIterator + */ + +import java.util.Collections; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.concurrent.atomic.AtomicInteger; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.fail; + +@Test(groups = "unit") +public class SingletonIterator { + public void testForEachRemaining() { + Iterator it = Collections.singleton("TheOne").iterator(); + AtomicInteger cnt = new AtomicInteger(0); + + it.forEachRemaining(s -> { + assertEquals("TheOne", s); + cnt.incrementAndGet(); + }); + + assertEquals(cnt.get(), 1); + assertFalse(it.hasNext()); + + try { + String str = it.next(); + fail("Should throw NoSuchElementException at end"); + } catch (NoSuchElementException ex) { + // ignore; + } + } +} diff --git a/test/java/util/function/BiFunction/BiFunctionTest.java b/test/java/util/function/BiFunction/BiFunctionTest.java new file mode 100644 index 000000000..e837b105b --- /dev/null +++ b/test/java/util/function/BiFunction/BiFunctionTest.java @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2013, 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. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8024500 + * @run testng BiFunctionTest + */ + +import java.util.function.BiFunction; +import java.util.function.Function; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; + +@Test(groups = "unit") +public class BiFunctionTest { + static class Quote { + double unit_price; + + Quote(double price) { + unit_price = price; + } + }; + + static class Order { + int quantity; + + Order(int quantity) { + this.quantity = quantity; + } + }; + + BiFunction estimate = (quote, order) -> { + if (quote.unit_price < 0) { + throw new IllegalArgumentException("quote"); + } + + if (order.quantity < 0) { + throw new IllegalArgumentException("order"); + } + + return quote.unit_price * order.quantity; + }; + + Function creditcheck = total -> { + if (total > 100.00) { + throw new RuntimeException("overlimit"); + } + return total.longValue(); + }; + + public void testAndThen() { + try { + BiFunction checkout = estimate.andThen(null); + fail("Null argument should throw NPE"); + } catch (NullPointerException npe) { + // ignore + } + + BiFunction checkout = estimate.andThen(creditcheck); + try { + checkout.apply(new Quote(20.0), new Order(-1)); + fail("First function delivers exception"); + } catch (IllegalArgumentException e) { + assertEquals(e.getMessage(), "order"); + } + + try { + checkout.apply(new Quote(20.0), new Order(10)); + fail("Second function delivers exception"); + } catch (RuntimeException e) { + assertEquals(e.getMessage(), "overlimit"); + } + + assertEquals(49, checkout.apply(new Quote(24.99), new Order(2)).longValue()); + assertEquals(50, checkout.apply(new Quote(25), new Order(2)).longValue()); + } +} -- GitLab