From 0b5f8e6aba8dc4c7a8e3b363915c2edc45bfbbba Mon Sep 17 00:00:00 2001 From: Arity-T Date: Mon, 3 Feb 2025 17:45:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20null=20=D0=B2=20MyTreeSet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab2/src/main/java/ru/spbstu/telematics/java/MyTreeSet.java | 4 ++++ lab2/src/test/java/ru/spbstu/telematics/java/AppTest.java | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/lab2/src/main/java/ru/spbstu/telematics/java/MyTreeSet.java b/lab2/src/main/java/ru/spbstu/telematics/java/MyTreeSet.java index af0c31e..475e179 100644 --- a/lab2/src/main/java/ru/spbstu/telematics/java/MyTreeSet.java +++ b/lab2/src/main/java/ru/spbstu/telematics/java/MyTreeSet.java @@ -20,6 +20,10 @@ public class MyTreeSet> { } public boolean add(E element) { + if (element == null) { + throw new NullPointerException("Нельзя добавить null в TreeSet!"); + } + if (root == null) { root = new Node(element); return true; diff --git a/lab2/src/test/java/ru/spbstu/telematics/java/AppTest.java b/lab2/src/test/java/ru/spbstu/telematics/java/AppTest.java index fd5e571..1d02c41 100644 --- a/lab2/src/test/java/ru/spbstu/telematics/java/AppTest.java +++ b/lab2/src/test/java/ru/spbstu/telematics/java/AppTest.java @@ -18,8 +18,14 @@ class MyTreeSetTests { @Test void testAdd() { + assertThrows(NullPointerException.class, () -> myTreeSet.add(null)); + assertThrows(NullPointerException.class, () -> treeSet.add(null)); + assertEquals(myTreeSet.add(150), treeSet.add(150)); assertEquals(myTreeSet.add(200), treeSet.add(200)); assertEquals(myTreeSet.add(150), treeSet.add(150)); + + assertThrows(NullPointerException.class, () -> myTreeSet.add(null)); + assertThrows(NullPointerException.class, () -> treeSet.add(null)); } }