From bc681fb62cec77942c042a5a789133dd26446408 Mon Sep 17 00:00:00 2001 From: David Wurm Date: Tue, 26 Nov 2019 08:28:07 +0100 Subject: [PATCH] implemented tests and did some fixes --- src/ChainQueue.java | 6 +++++- src/HUE_06_Generics.java | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ChainQueue.java b/src/ChainQueue.java index 838c04c..46bbc24 100644 --- a/src/ChainQueue.java +++ b/src/ChainQueue.java @@ -4,6 +4,7 @@ * Klasse: 3AHIF * Programm: HUE_06_GenericsQueue ************************************************/ +import java.lang.reflect.Type; import java.util.Collection; import java.util.Iterator; import java.util.Queue; @@ -31,7 +32,6 @@ public class ChainQueue implements Queue { public Node(E data) { this.data = data; - } } @@ -173,4 +173,8 @@ public class ChainQueue implements Queue { public E remove() { return null; } + + public Queue merge (Queue q1, Queue q2) { + return null; + } } \ No newline at end of file diff --git a/src/HUE_06_Generics.java b/src/HUE_06_Generics.java index dea3e18..3a5f064 100644 --- a/src/HUE_06_Generics.java +++ b/src/HUE_06_Generics.java @@ -8,6 +8,10 @@ import java.util.Queue; public class HUE_06_Generics { public static void main(String[] args) { Queue strs = new ChainQueue(); + // implement null-tests + System.out.println(strs.poll()); // should be null + System.out.println(strs.size()); // should be 0 + strs.add("hallo1"); strs.add("hallo2"); strs.add("hallo3"); @@ -19,5 +23,10 @@ public class HUE_06_Generics { System.out.println(" - " + strs.poll() + " #" + strs.size()); System.out.println(" - " + strs.poll() + " #" + strs.size()); System.out.println(" - " + strs.poll() + " #" + strs.size()); + + Queue strs2 = new ChainQueue<>(); + strs2.add(1); + strs2.add(2); + strs2.add(3); } }