Optimize and refactor (#2302)

This commit is contained in:
Grzegorz Piwowarek
2017-07-21 13:37:49 +03:00
committed by GitHub
parent 4e95722017
commit f8bf4038f1
32 changed files with 220 additions and 270 deletions

View File

@@ -1,16 +1,5 @@
package com.baeldung.vavr.collections;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.util.Comparator;
import org.junit.Test;
import io.vavr.Tuple;
import io.vavr.Tuple2;
import io.vavr.collection.Array;
import io.vavr.collection.CharSeq;
@@ -26,6 +15,16 @@ import io.vavr.collection.Stream;
import io.vavr.collection.TreeMap;
import io.vavr.collection.TreeSet;
import io.vavr.collection.Vector;
import org.junit.Test;
import java.util.Comparator;
import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
public class CollectionAPIUnitTest {
@@ -34,7 +33,7 @@ public class CollectionAPIUnitTest {
List<Integer> intList = List.empty();
List<Integer> anotherList = intList.push(4)
.push(0);
.push(0);
Iterator<Integer> iterator = anotherList.iterator();
assertEquals(new Integer(0), iterator.next());
@@ -46,7 +45,7 @@ public class CollectionAPIUnitTest {
List<Integer> intList = List.of(1, 2, 3);
List<Integer> newList = intList.tail()
.prepend(0);
.prepend(0);
assertEquals(new Integer(1), intList.get(0));
assertEquals(new Integer(2), intList.get(1));
@@ -62,45 +61,45 @@ public class CollectionAPIUnitTest {
public void givenQueue_whenEnqueued_thenCorrect() {
Queue<Integer> queue = Queue.of(1, 2, 3);
Queue<Integer> secondQueue = queue.enqueue(4)
.enqueue(5);
.enqueue(5);
assertEquals(3, queue.size());
assertEquals(5, secondQueue.size());
secondQueue.dequeue()
.map((k, v) -> {
assertEquals(new Integer(1), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(2), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(3), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(4), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(5), k);
assertTrue(v.isEmpty());
return null;
});
.map((k, v) -> {
assertEquals(new Integer(1), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(2), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(3), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(4), k);
return v.dequeue();
})
.map((k, v) -> {
assertEquals(new Integer(5), k);
assertTrue(v.isEmpty());
return null;
});
}
@Test
public void givenStream_whenProcessed_thenCorrect() {
Stream<Integer> intStream = Stream.iterate(0, i -> i + 1)
.take(10);
.take(10);
assertEquals(10, intStream.size());
long evenSum = intStream.filter(i -> i % 2 == 0)
.sum()
.longValue();
.sum()
.longValue();
assertEquals(20L, evenSum);
assertEquals(new Integer(5), intStream.get(5));
@@ -170,7 +169,7 @@ public class CollectionAPIUnitTest {
@Test
public void givenSortedSet_whenReversed_thenCorrect() {
Comparator<String> reverseCompare = (a, b) -> b.compareTo(a);
Comparator<String> reverseCompare = Comparator.reverseOrder();
SortedSet<String> set = TreeSet.of(reverseCompare, "Green", "Red", "Blue");
Iterator<String> iterator = set.iterator();
@@ -182,17 +181,17 @@ public class CollectionAPIUnitTest {
@Test
public void givenMap_whenIterated_thenCorrect() {
Map<Integer, List<Integer>> map = List.rangeClosed(0, 10)
.groupBy(i -> i % 2);
.groupBy(i -> i % 2);
assertEquals(2, map.size());
Iterator<Tuple2<Integer, List<Integer>>> iterator = map.iterator();
assertEquals(6, iterator.next()
._2()
.size());
._2()
.size());
assertEquals(5, iterator.next()
._2()
.size());
._2()
.size());
}
@Test
@@ -201,11 +200,11 @@ public class CollectionAPIUnitTest {
Iterator<Tuple2<Integer, String>> iterator = map.iterator();
assertEquals(new Integer(1), iterator.next()
._1());
._1());
assertEquals(new Integer(2), iterator.next()
._1());
._1());
assertEquals(new Integer(3), iterator.next()
._1());
._1());
}
@Test
@@ -223,19 +222,14 @@ public class CollectionAPIUnitTest {
@Test
public void givenVavrList_whenConverted_thenCorrect() {
Integer[] array = List.of(1, 2, 3)
.toJavaArray(Integer.class);
assertEquals(3, array.length);
java.util.Map<String, Integer> map = List.of("1", "2", "3")
.toJavaMap(i -> Tuple.of(i, Integer.valueOf(i)));
assertEquals(new Integer(2), map.get("2"));
java.util.Set<Integer> collect = List.of(1, 2, 3)
.collect(Collectors.toSet());
}
@Test
public void givenVavrList_whenConvertedView_thenCorrect() {
java.util.List<Integer> javaList = List.of(1, 2, 3)
.asJavaMutable();
.asJavaMutable();
javaList.add(4);
assertEquals(new Integer(4), javaList.get(3));
@@ -244,7 +238,7 @@ public class CollectionAPIUnitTest {
@Test(expected = UnsupportedOperationException.class)
public void givenVavrList_whenConvertedView_thenException() {
java.util.List<Integer> javaList = List.of(1, 2, 3)
.asJava();
.asJava();
assertEquals(new Integer(3), javaList.get(2));
javaList.add(4);
@@ -254,8 +248,8 @@ public class CollectionAPIUnitTest {
public void givenList_whenSquared_thenCorrect() {
List<Integer> vavrList = List.of(1, 2, 3);
Number sum = vavrList.map(i -> i * i)
.sum();
.sum();
assertEquals(new Long(14), sum);
assertEquals(14L, sum);
}
}