diff --git a/src/main/java/org/cactoos/iterable/IterableOf.java b/src/main/java/org/cactoos/iterable/IterableOf.java index 99c4ae3c87..c5bab0dbd3 100644 --- a/src/main/java/org/cactoos/iterable/IterableOf.java +++ b/src/main/java/org/cactoos/iterable/IterableOf.java @@ -32,13 +32,11 @@ import org.cactoos.iterator.IteratorOf; import org.cactoos.scalar.And; import org.cactoos.scalar.FallbackFrom; -import org.cactoos.scalar.False; import org.cactoos.scalar.Folded; import org.cactoos.scalar.Or; import org.cactoos.scalar.ScalarWithFallback; import org.cactoos.scalar.Sticky; import org.cactoos.scalar.SumOfInt; -import org.cactoos.scalar.True; import org.cactoos.scalar.Unchecked; import org.cactoos.text.TextOf; import org.cactoos.text.UncheckedText; diff --git a/src/main/java/org/cactoos/list/Shuffled.java b/src/main/java/org/cactoos/list/Shuffled.java index e7cef45eab..aad6b22c94 100644 --- a/src/main/java/org/cactoos/list/Shuffled.java +++ b/src/main/java/org/cactoos/list/Shuffled.java @@ -24,7 +24,6 @@ package org.cactoos.list; import java.util.Collections; -import java.util.List; /** * Shuffled list. diff --git a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java index 2893f601c2..40e7cfa60c 100644 --- a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java +++ b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java @@ -26,9 +26,9 @@ import java.io.IOException; import java.util.IllegalFormatException; import java.util.IllegalFormatWidthException; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.scalar.FallbackFrom; -import org.cactoos.MatcherAssert; import org.junit.Test; import org.llorllale.cactoos.matchers.FuncApplies; diff --git a/src/test/java/org/cactoos/func/IoCheckedProcTest.java b/src/test/java/org/cactoos/func/IoCheckedProcTest.java index 04117982aa..9ffe8e4345 100644 --- a/src/test/java/org/cactoos/func/IoCheckedProcTest.java +++ b/src/test/java/org/cactoos/func/IoCheckedProcTest.java @@ -24,8 +24,8 @@ package org.cactoos.func; import java.io.IOException; -import org.cactoos.Proc; import org.cactoos.MatcherAssert; +import org.cactoos.Proc; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/ProcOfTest.java b/src/test/java/org/cactoos/func/ProcOfTest.java index 58cb83dbef..666fa2f5ca 100644 --- a/src/test/java/org/cactoos/func/ProcOfTest.java +++ b/src/test/java/org/cactoos/func/ProcOfTest.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; -import org.cactoos.text.FormattedText; import org.cactoos.MatcherAssert; +import org.cactoos.text.FormattedText; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/RepeatedTest.java b/src/test/java/org/cactoos/func/RepeatedTest.java index b3d6f53623..ce54389777 100644 --- a/src/test/java/org/cactoos/func/RepeatedTest.java +++ b/src/test/java/org/cactoos/func/RepeatedTest.java @@ -26,8 +26,8 @@ import java.security.SecureRandom; import java.util.Iterator; import org.cactoos.Func; -import org.cactoos.iterator.IteratorOf; import org.cactoos.MatcherAssert; +import org.cactoos.iterator.IteratorOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/SolidFuncTest.java b/src/test/java/org/cactoos/func/SolidFuncTest.java index 3a4418a653..404699d864 100644 --- a/src/test/java/org/cactoos/func/SolidFuncTest.java +++ b/src/test/java/org/cactoos/func/SolidFuncTest.java @@ -25,8 +25,8 @@ import java.security.SecureRandom; import org.cactoos.Func; -import org.cactoos.list.ListOf; import org.cactoos.MatcherAssert; +import org.cactoos.list.ListOf; import org.hamcrest.Matchers; import org.junit.Test; import org.llorllale.cactoos.matchers.RunsInThreads; diff --git a/src/test/java/org/cactoos/func/TimedFuncTest.java b/src/test/java/org/cactoos/func/TimedFuncTest.java index 8e088325cc..c975dbc57b 100644 --- a/src/test/java/org/cactoos/func/TimedFuncTest.java +++ b/src/test/java/org/cactoos/func/TimedFuncTest.java @@ -26,9 +26,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeoutException; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.Endless; import org.cactoos.scalar.And; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/CycledTest.java b/src/test/java/org/cactoos/iterable/CycledTest.java index 1f60257203..47cb2750b6 100644 --- a/src/test/java/org/cactoos/iterable/CycledTest.java +++ b/src/test/java/org/cactoos/iterable/CycledTest.java @@ -24,9 +24,9 @@ package org.cactoos.iterable; import java.util.Collections; +import org.cactoos.MatcherAssert; import org.cactoos.scalar.ItemAt; import org.cactoos.scalar.LengthOf; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; diff --git a/src/test/java/org/cactoos/iterable/FilteredTest.java b/src/test/java/org/cactoos/iterable/FilteredTest.java index 4da8424d4b..e3c6940522 100644 --- a/src/test/java/org/cactoos/iterable/FilteredTest.java +++ b/src/test/java/org/cactoos/iterable/FilteredTest.java @@ -23,9 +23,9 @@ */ package org.cactoos.iterable; +import org.cactoos.MatcherAssert; import org.cactoos.list.ListOf; import org.cactoos.scalar.LengthOf; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.collection.IsEmptyIterable; import org.hamcrest.core.IsNot; diff --git a/src/test/java/org/cactoos/iterable/IterableOfTest.java b/src/test/java/org/cactoos/iterable/IterableOfTest.java index 0433b1c4b5..26b74eb152 100644 --- a/src/test/java/org/cactoos/iterable/IterableOfTest.java +++ b/src/test/java/org/cactoos/iterable/IterableOfTest.java @@ -24,11 +24,11 @@ package org.cactoos.iterable; import java.util.Iterator; +import org.cactoos.MatcherAssert; import org.cactoos.iterator.IteratorOf; import org.cactoos.scalar.LengthOf; import org.cactoos.scalar.Ternary; import org.cactoos.text.TextOf; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.collection.IsIterableWithSize; import org.hamcrest.core.IsEqual; diff --git a/src/test/java/org/cactoos/iterable/MappedTest.java b/src/test/java/org/cactoos/iterable/MappedTest.java index 933aab7f43..0f5768c305 100644 --- a/src/test/java/org/cactoos/iterable/MappedTest.java +++ b/src/test/java/org/cactoos/iterable/MappedTest.java @@ -24,11 +24,11 @@ package org.cactoos.iterable; import java.util.Collections; +import org.cactoos.MatcherAssert; import org.cactoos.Text; import org.cactoos.list.ListOf; import org.cactoos.text.TextOf; import org.cactoos.text.Upper; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.core.IsEqual; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/MatchedTest.java b/src/test/java/org/cactoos/iterable/MatchedTest.java index dc69282e71..87144901bf 100644 --- a/src/test/java/org/cactoos/iterable/MatchedTest.java +++ b/src/test/java/org/cactoos/iterable/MatchedTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.iterable; -import org.cactoos.scalar.LengthOf; import org.cactoos.MatcherAssert; +import org.cactoos.scalar.LengthOf; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/PartitionedTest.java b/src/test/java/org/cactoos/iterable/PartitionedTest.java index 3e17def054..9c1989d89a 100644 --- a/src/test/java/org/cactoos/iterable/PartitionedTest.java +++ b/src/test/java/org/cactoos/iterable/PartitionedTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.iterable; -import org.cactoos.scalar.LengthOf; import org.cactoos.MatcherAssert; +import org.cactoos.scalar.LengthOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/RangeOfTest.java b/src/test/java/org/cactoos/iterable/RangeOfTest.java index 2d71083aab..2e26507a61 100644 --- a/src/test/java/org/cactoos/iterable/RangeOfTest.java +++ b/src/test/java/org/cactoos/iterable/RangeOfTest.java @@ -26,8 +26,8 @@ import java.time.LocalDate; import java.time.temporal.ChronoUnit; import org.cactoos.Func; -import org.cactoos.list.ListOf; import org.cactoos.MatcherAssert; +import org.cactoos.list.ListOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/RepeatedTest.java b/src/test/java/org/cactoos/iterable/RepeatedTest.java index 84d1191b68..0f60ee24ea 100644 --- a/src/test/java/org/cactoos/iterable/RepeatedTest.java +++ b/src/test/java/org/cactoos/iterable/RepeatedTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.iterable; -import org.cactoos.scalar.LengthOf; import org.cactoos.MatcherAssert; +import org.cactoos.scalar.LengthOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/SolidTest.java b/src/test/java/org/cactoos/iterable/SolidTest.java index 39a7684cc0..8c8412832e 100644 --- a/src/test/java/org/cactoos/iterable/SolidTest.java +++ b/src/test/java/org/cactoos/iterable/SolidTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.iterable; -import org.cactoos.Scalar; import org.cactoos.MatcherAssert; +import org.cactoos.Scalar; import org.hamcrest.Matchers; import org.junit.Test; import org.llorllale.cactoos.matchers.RunsInThreads; diff --git a/src/test/java/org/cactoos/iterable/SortedTest.java b/src/test/java/org/cactoos/iterable/SortedTest.java index d89b431d1f..f4b3205e5a 100644 --- a/src/test/java/org/cactoos/iterable/SortedTest.java +++ b/src/test/java/org/cactoos/iterable/SortedTest.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.Comparator; -import org.cactoos.list.ListOf; import org.cactoos.MatcherAssert; +import org.cactoos.list.ListOf; import org.hamcrest.Matchers; import org.hamcrest.core.IsEqual; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterator/ImmutableTest.java b/src/test/java/org/cactoos/iterator/ImmutableTest.java index 0e06ef75ca..71a64b1e09 100644 --- a/src/test/java/org/cactoos/iterator/ImmutableTest.java +++ b/src/test/java/org/cactoos/iterator/ImmutableTest.java @@ -27,9 +27,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; +import org.cactoos.MatcherAssert; import org.cactoos.text.Randomized; import org.cactoos.text.TextOf; -import org.cactoos.MatcherAssert; import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; diff --git a/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java b/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java index b978f07ff1..c84f3aa412 100644 --- a/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java +++ b/src/test/java/org/cactoos/iterator/IteratorOfBytesTest.java @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.NoSuchElementException; +import org.cactoos.MatcherAssert; import org.cactoos.list.ListOf; import org.cactoos.text.TextOf; -import org.cactoos.MatcherAssert; import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; diff --git a/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java index 3f6c69178f..4ea431a440 100644 --- a/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java +++ b/src/test/java/org/cactoos/iterator/IteratorOfCharsTest.java @@ -24,9 +24,9 @@ package org.cactoos.iterator; import java.util.NoSuchElementException; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.text.TextOf; -import org.cactoos.MatcherAssert; import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; diff --git a/src/test/java/org/cactoos/iterator/PartitionedTest.java b/src/test/java/org/cactoos/iterator/PartitionedTest.java index b7626a1e55..c8e31d5499 100644 --- a/src/test/java/org/cactoos/iterator/PartitionedTest.java +++ b/src/test/java/org/cactoos/iterator/PartitionedTest.java @@ -26,10 +26,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.NoSuchElementException; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.list.ListOf; import org.cactoos.scalar.LengthOf; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.core.IsEqual; import org.junit.Test; diff --git a/src/test/java/org/cactoos/list/ListOfTest.java b/src/test/java/org/cactoos/list/ListOfTest.java index 3419a79f7b..b4b7b3a902 100644 --- a/src/test/java/org/cactoos/list/ListOfTest.java +++ b/src/test/java/org/cactoos/list/ListOfTest.java @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.List; -import org.cactoos.iterable.IterableOf; import org.cactoos.MatcherAssert; +import org.cactoos.iterable.IterableOf; import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.HasSize; diff --git a/src/test/java/org/cactoos/list/MappedTest.java b/src/test/java/org/cactoos/list/MappedTest.java index 5c77948f7d..24619d97dd 100644 --- a/src/test/java/org/cactoos/list/MappedTest.java +++ b/src/test/java/org/cactoos/list/MappedTest.java @@ -23,11 +23,11 @@ */ package org.cactoos.list; +import org.cactoos.MatcherAssert; import org.cactoos.Text; import org.cactoos.iterable.IterableOf; import org.cactoos.text.TextOf; import org.cactoos.text.Upper; -import org.cactoos.MatcherAssert; import org.hamcrest.core.IsEqual; import org.junit.Test; import org.llorllale.cactoos.matchers.HasSize; diff --git a/src/test/java/org/cactoos/map/BehavesAsMap.java b/src/test/java/org/cactoos/map/BehavesAsMap.java index a1dee765d6..6e83aed2e1 100644 --- a/src/test/java/org/cactoos/map/BehavesAsMap.java +++ b/src/test/java/org/cactoos/map/BehavesAsMap.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.hamcrest.Description; import org.cactoos.MatcherAssert; +import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.IsCollectionContaining; diff --git a/src/test/java/org/cactoos/map/ClearDeletesAllValues.java b/src/test/java/org/cactoos/map/ClearDeletesAllValues.java index 6588bdee3c..6d3831ff01 100644 --- a/src/test/java/org/cactoos/map/ClearDeletesAllValues.java +++ b/src/test/java/org/cactoos/map/ClearDeletesAllValues.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.hamcrest.Description; import org.cactoos.MatcherAssert; +import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.hamcrest.core.IsEqual; diff --git a/src/test/java/org/cactoos/map/GroupedTest.java b/src/test/java/org/cactoos/map/GroupedTest.java index 97a2166998..e89e15e310 100644 --- a/src/test/java/org/cactoos/map/GroupedTest.java +++ b/src/test/java/org/cactoos/map/GroupedTest.java @@ -24,9 +24,9 @@ package org.cactoos.map; import java.util.HashSet; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.list.ListOf; -import org.cactoos.MatcherAssert; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.IsEqual; import org.junit.Test; diff --git a/src/test/java/org/cactoos/map/MapOfTest.java b/src/test/java/org/cactoos/map/MapOfTest.java index 5f5847bbf9..54e17011fb 100644 --- a/src/test/java/org/cactoos/map/MapOfTest.java +++ b/src/test/java/org/cactoos/map/MapOfTest.java @@ -27,11 +27,11 @@ import java.security.SecureRandom; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.cactoos.MatcherAssert; import org.cactoos.Scalar; import org.cactoos.func.FuncOf; import org.cactoos.iterable.IterableOf; import org.cactoos.iterator.Repeated; -import org.cactoos.MatcherAssert; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.AllOf; import org.hamcrest.core.IsAnything; diff --git a/src/test/java/org/cactoos/map/NoNullsTest.java b/src/test/java/org/cactoos/map/NoNullsTest.java index 68739c88ff..23bcb03ef5 100644 --- a/src/test/java/org/cactoos/map/NoNullsTest.java +++ b/src/test/java/org/cactoos/map/NoNullsTest.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.HashMap; -import org.cactoos.iterable.IterableOf; import org.cactoos.MatcherAssert; +import org.cactoos.iterable.IterableOf; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.AllOf; import org.hamcrest.core.IsEqual; diff --git a/src/test/java/org/cactoos/map/PutAllUpdatesValues.java b/src/test/java/org/cactoos/map/PutAllUpdatesValues.java index f79f98fb54..7fa4778269 100644 --- a/src/test/java/org/cactoos/map/PutAllUpdatesValues.java +++ b/src/test/java/org/cactoos/map/PutAllUpdatesValues.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.hamcrest.Description; import org.cactoos.MatcherAssert; +import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; /** diff --git a/src/test/java/org/cactoos/map/PutUpdatesValues.java b/src/test/java/org/cactoos/map/PutUpdatesValues.java index 369a71c5ca..8183537ba7 100644 --- a/src/test/java/org/cactoos/map/PutUpdatesValues.java +++ b/src/test/java/org/cactoos/map/PutUpdatesValues.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.hamcrest.Description; import org.cactoos.MatcherAssert; +import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; /** diff --git a/src/test/java/org/cactoos/map/RemoveDeletesValues.java b/src/test/java/org/cactoos/map/RemoveDeletesValues.java index d8b8bd19ef..679c909fda 100644 --- a/src/test/java/org/cactoos/map/RemoveDeletesValues.java +++ b/src/test/java/org/cactoos/map/RemoveDeletesValues.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.hamcrest.Description; import org.cactoos.MatcherAssert; +import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.IsCollectionContaining; diff --git a/src/test/java/org/cactoos/map/SolidTest.java b/src/test/java/org/cactoos/map/SolidTest.java index 83641acac8..bd2c5a2739 100644 --- a/src/test/java/org/cactoos/map/SolidTest.java +++ b/src/test/java/org/cactoos/map/SolidTest.java @@ -24,12 +24,12 @@ package org.cactoos.map; import java.util.Map; +import org.cactoos.MatcherAssert; import org.cactoos.Scalar; import org.cactoos.iterable.IterableOf; import org.cactoos.text.Sub; import org.cactoos.text.TextOf; import org.cactoos.text.Upper; -import org.cactoos.MatcherAssert; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.AllOf; import org.hamcrest.core.IsEqual; diff --git a/src/test/java/org/cactoos/map/StickyTest.java b/src/test/java/org/cactoos/map/StickyTest.java index 4488755fa7..5326be1a4d 100644 --- a/src/test/java/org/cactoos/map/StickyTest.java +++ b/src/test/java/org/cactoos/map/StickyTest.java @@ -27,10 +27,10 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.iterator.Repeated; import org.cactoos.text.FormattedText; -import org.cactoos.MatcherAssert; import org.hamcrest.collection.IsMapContaining; import org.hamcrest.core.IsAnything; import org.hamcrest.core.IsEqual; diff --git a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java index cd2482b387..7f0b8ee64f 100644 --- a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java +++ b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import org.cactoos.MatcherAssert; import org.cactoos.Scalar; import org.cactoos.func.FuncOf; import org.cactoos.func.ProcNoNulls; @@ -35,7 +36,6 @@ import org.cactoos.list.ListOf; import org.cactoos.list.Synced; import org.hamcrest.Matcher; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.hamcrest.collection.IsIterableContainingInAnyOrder; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/AndTest.java b/src/test/java/org/cactoos/scalar/AndTest.java index b7c37751ce..3dce7c025c 100644 --- a/src/test/java/org/cactoos/scalar/AndTest.java +++ b/src/test/java/org/cactoos/scalar/AndTest.java @@ -23,9 +23,9 @@ */ package org.cactoos.scalar; +import org.cactoos.MatcherAssert; import org.cactoos.Scalar; import org.cactoos.iterable.IterableOf; -import org.cactoos.MatcherAssert; import org.junit.Test; import org.llorllale.cactoos.matchers.Assertion; import org.llorllale.cactoos.matchers.ScalarHasValue; diff --git a/src/test/java/org/cactoos/scalar/HighestOfTest.java b/src/test/java/org/cactoos/scalar/HighestOfTest.java index 555d868f52..7f9bf77f44 100644 --- a/src/test/java/org/cactoos/scalar/HighestOfTest.java +++ b/src/test/java/org/cactoos/scalar/HighestOfTest.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.Date; import java.util.NoSuchElementException; -import org.cactoos.time.DateOf; import org.cactoos.MatcherAssert; +import org.cactoos.time.DateOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/LowestOfTest.java b/src/test/java/org/cactoos/scalar/LowestOfTest.java index 86dde9c31e..da0ad388ef 100644 --- a/src/test/java/org/cactoos/scalar/LowestOfTest.java +++ b/src/test/java/org/cactoos/scalar/LowestOfTest.java @@ -26,8 +26,8 @@ import java.util.Collections; import java.util.Date; import java.util.NoSuchElementException; -import org.cactoos.time.DateOf; import org.cactoos.MatcherAssert; +import org.cactoos.time.DateOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/MinOfTest.java b/src/test/java/org/cactoos/scalar/MinOfTest.java index e4be7ac5a7..f22b526140 100644 --- a/src/test/java/org/cactoos/scalar/MinOfTest.java +++ b/src/test/java/org/cactoos/scalar/MinOfTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.scalar; -import org.cactoos.list.ListOf; import org.cactoos.MatcherAssert; +import org.cactoos.list.ListOf; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/OrTest.java b/src/test/java/org/cactoos/scalar/OrTest.java index 4fa7df9072..66c217bb91 100644 --- a/src/test/java/org/cactoos/scalar/OrTest.java +++ b/src/test/java/org/cactoos/scalar/OrTest.java @@ -25,10 +25,10 @@ import java.util.LinkedList; import java.util.List; +import org.cactoos.MatcherAssert; import org.cactoos.Proc; import org.cactoos.Scalar; import org.cactoos.iterable.IterableOf; -import org.cactoos.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; import org.llorllale.cactoos.matchers.ScalarHasValue; diff --git a/src/test/java/org/cactoos/scalar/SumOfTest.java b/src/test/java/org/cactoos/scalar/SumOfTest.java index 534c71161f..695acb2f33 100644 --- a/src/test/java/org/cactoos/scalar/SumOfTest.java +++ b/src/test/java/org/cactoos/scalar/SumOfTest.java @@ -24,9 +24,9 @@ package org.cactoos.scalar; import java.util.Collection; +import org.cactoos.MatcherAssert; import org.cactoos.iterable.IterableOf; import org.cactoos.list.ListOf; -import org.cactoos.MatcherAssert; import org.hamcrest.core.IsEqual; import org.junit.Test;