From 15dce99c647a334d644df12122c9b4a54834a7a0 Mon Sep 17 00:00:00 2001
From: "navid.sassan" <navid.sassan@linuxfabrik.ch>
Date: Sun, 25 Oct 2020 22:35:52 +0100
Subject: [PATCH] fixed testInterval

---
 05/src/main/java/ch/zhaw/ads/Traversal.java |  1 +
 05/src/test/java/ch/zhaw/ads/TreeTest.java  | 22 +++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/05/src/main/java/ch/zhaw/ads/Traversal.java b/05/src/main/java/ch/zhaw/ads/Traversal.java
index dbb3f90..ca021ed 100644
--- a/05/src/main/java/ch/zhaw/ads/Traversal.java
+++ b/05/src/main/java/ch/zhaw/ads/Traversal.java
@@ -10,4 +10,5 @@ public interface Traversal<T> {
     public void postorder(Visitor<T> vistor);
     /* traverse elements of tree in levelorder */
     public void levelorder(Visitor<T> vistor);
+    public void interval(Comparable<T> min, Comparable<T> max, Visitor<T> v);
 }
diff --git a/05/src/test/java/ch/zhaw/ads/TreeTest.java b/05/src/test/java/ch/zhaw/ads/TreeTest.java
index 0046b07..e739578 100644
--- a/05/src/test/java/ch/zhaw/ads/TreeTest.java
+++ b/05/src/test/java/ch/zhaw/ads/TreeTest.java
@@ -46,7 +46,8 @@ public class TreeTest {
 
     @Test
     public void testInterval() {
-        Comparable<Integer> myComparator = new MyComparator();
+        Comparable<Integer> minComparable = new MyComparable(1);
+        Comparable<Integer> maxComparable = new MyComparable(9);
         Visitor<Integer> v = new MyVisitor<Integer>();
         Tree<Integer> mytree = new SortedBinaryTree<Integer>();
         mytree.add(10);
@@ -58,16 +59,21 @@ public class TreeTest {
         mytree.add(8);
         mytree.add(4);
 
-        tree.traversal().interval(myComparator, myComparator, v);
-        System.out.println(v.toString());
-        // assertEquals("levelorder", "BACD", v.toString());
+        mytree.traversal().interval(minComparable, maxComparable, v);
+        assertEquals("interval", "7648", v.toString());
     }
-
 }
 
-class MyComparator implements Comparable<Integer> {
-    public int compare(TreeNode o1, TreeNode o2) {
-        return o1.element.compareTo(o1.element);
+class MyComparable implements Comparable<Integer> {
+    Integer value;
+
+    public MyComparable(Integer value) {
+        this.value = value;
+    }
+
+    @Override
+    public int compareTo(Integer other) {
+        return this.value.compareTo(other);
     }
 }