Refactor PredicateXTest

Fixes #69

Author: alexengrig

src/test/java/io/github/alexengrig/lambdax/example/Box.java

@@ -17,16 +17,13 @@
 package io.github.alexengrig.lambdax.example;
 
 public class Box {
-    private Item item;
+    private Pack pack;
 
-    public Box() {
+    public Box(Pack pack) {
+        this.pack = pack;
     }
 
-    public Box(Item item) {
-        this.item = item;
-    }
-
-    public Item getItem() {
-        return item;
+    public Pack getPack() {
+        return pack;
     }
 }

src/test/java/io/github/alexengrig/lambdax/example/Holder.java

@@ -16,18 +16,14 @@
 
 package io.github.alexengrig.lambdax.example;
 
-final class Holder<T> {
+public final class Holder<T> {
     private T t;
 
-    Holder(T t) {
+    public Holder(T t) {
         this.t = t;
     }
 
-    T get() {
+    public T get() {
         return t;
     }
-
-    void set(T t) {
-        this.t = t;
-    }
 }

src/test/java/io/github/alexengrig/lambdax/example/Pack.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2019 LambdaX contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.github.alexengrig.lambdax.example;
+
+public class Pack {
+    private Item item;
+
+    public Pack(Item item) {
+        this.item = item;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+}

src/test/java/io/github/alexengrig/lambdax/function/PredicateXTest.java

@@ -17,7 +17,9 @@
 package io.github.alexengrig.lambdax.function;
 
 import io.github.alexengrig.lambdax.example.Box;
+import io.github.alexengrig.lambdax.example.Holder;
 import io.github.alexengrig.lambdax.example.Item;
+import io.github.alexengrig.lambdax.example.Pack;
 import org.junit.Test;
 
 import java.util.function.Predicate;
@@ -29,48 +31,66 @@ public class PredicateXTest {
     @Test
     public void checkChecker() {
         String value = "Coca-Cola";
-        Box box = new Box(new Item(value));
-        Predicate<Box> isEmptyItemName = PredicateX.of(Box::getItem).map(Item::getName).check(String::isEmpty);
-        assertFalse(isEmptyItemName.test(box));
+        Holder<Box> boxHolder = new Holder<>(new Box(new Pack(new Item(value))));
+        Predicate<Holder<Box>> isEmptyItemName = PredicateX.of(Holder<Box>::get)
+                .map(Box::getPack)
+                .map(Pack::getItem)
+                .map(Item::getName)
+                .check(String::isEmpty);
+        assertFalse(isEmptyItemName.test(boxHolder));
     }
 
     @Test
     public void checkEqual() {
         String value = "Coca-Cola";
-        Box box = new Box(new Item(value));
-        Predicate<Box> equalsCocaCola = PredicateX.of(Box::getItem).map(Item::getName).equal(value);
-        assertTrue(equalsCocaCola.test(box));
+        Pack pack = new Pack(new Item(value));
+        Predicate<Pack> equalsCocaCola = PredicateX.of(Pack::getItem)
+                .map(Item::getName)
+                .equal(value);
+        assertTrue(equalsCocaCola.test(pack));
     }
 
     @Test
     public void checkLess() {
         String value = "Coca-Cola";
-        Box box = new Box(new Item(value));
-        Predicate<Box> lessPepsi = PredicateX.of(Box::getItem).map(Item::getName).less("Pepsi");
+        Box box = new Box(new Pack(new Item(value)));
+        Predicate<Box> lessPepsi = PredicateX.of(Box::getPack)
+                .map(Pack::getItem)
+                .map(Item::getName)
+                .less("Pepsi");
         assertTrue(lessPepsi.test(box));
     }
 
     @Test
     public void checkGreater() {
         String value = "Schweppes";
-        Box box = new Box(new Item(value));
-        Predicate<Box> greaterCocaCola = PredicateX.of(Box::getItem).map(Item::getName).greater("Dr Pepper");
+        Box box = new Box(new Pack(new Item(value)));
+        Predicate<Box> greaterCocaCola = PredicateX.of(Box::getPack)
+                .map(Pack::getItem)
+                .map(Item::getName)
+                .greater("Dr Pepper");
         assertTrue(greaterCocaCola.test(box));
     }
 
     @Test
     public void checkLessOrEqual() {
         String value = "Fanta";
-        Box box = new Box(new Item(value));
-        Predicate<Box> lessPepsi = PredicateX.of(Box::getItem).map(Item::getName).lessOrEqual("Mirinda");
+        Box box = new Box(new Pack(new Item(value)));
+        Predicate<Box> lessPepsi = PredicateX.of(Box::getPack)
+                .map(Pack::getItem)
+                .map(Item::getName)
+                .lessOrEqual("Mirinda");
         assertTrue(lessPepsi.test(box));
     }
 
     @Test
     public void checkGreaterOrEqual() {
         String value = "Sprite";
-        Box box = new Box(new Item(value));
-        Predicate<Box> greaterCocaCola = PredicateX.of(Box::getItem).map(Item::getName).greaterOrEqual("7 Up");
+        Box box = new Box(new Pack(new Item(value)));
+        Predicate<Box> greaterCocaCola = PredicateX.of(Box::getPack)
+                .map(Pack::getItem)
+                .map(Item::getName)
+                .greaterOrEqual("7 Up");
         assertTrue(greaterCocaCola.test(box));
     }
 }