diff --git a/src/test/java/org/cactoos/FuncApplies.java b/src/main/java/org/cactoos/matchers/FuncApplies.java similarity index 97% rename from src/test/java/org/cactoos/FuncApplies.java rename to src/main/java/org/cactoos/matchers/FuncApplies.java index 37fe9f35d4..9a891647e5 100644 --- a/src/test/java/org/cactoos/FuncApplies.java +++ b/src/main/java/org/cactoos/matchers/FuncApplies.java @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos; +package org.cactoos.matchers; +import org.cactoos.Func; import org.cactoos.func.UncheckedFunc; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/src/test/java/org/cactoos/InputHasContent.java b/src/main/java/org/cactoos/matchers/InputHasContent.java similarity index 97% rename from src/test/java/org/cactoos/InputHasContent.java rename to src/main/java/org/cactoos/matchers/InputHasContent.java index cb7b984127..546cab1343 100644 --- a/src/test/java/org/cactoos/InputHasContent.java +++ b/src/main/java/org/cactoos/matchers/InputHasContent.java @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos; +package org.cactoos.matchers; +import org.cactoos.Input; import org.cactoos.text.TextOf; import org.cactoos.text.UncheckedText; import org.hamcrest.Description; diff --git a/src/test/java/org/cactoos/func/MatcherOf.java b/src/main/java/org/cactoos/matchers/MatcherOf.java similarity index 95% rename from src/test/java/org/cactoos/func/MatcherOf.java rename to src/main/java/org/cactoos/matchers/MatcherOf.java index 0077e9330c..fa256d1f2e 100644 --- a/src/test/java/org/cactoos/func/MatcherOf.java +++ b/src/main/java/org/cactoos/matchers/MatcherOf.java @@ -21,10 +21,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos.func; +package org.cactoos.matchers; import org.cactoos.Func; import org.cactoos.Proc; +import org.cactoos.func.FuncOf; +import org.cactoos.func.UncheckedFunc; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/src/test/java/org/cactoos/RunsInThreads.java b/src/main/java/org/cactoos/matchers/RunsInThreads.java similarity index 98% rename from src/test/java/org/cactoos/RunsInThreads.java rename to src/main/java/org/cactoos/matchers/RunsInThreads.java index e8b61965db..b5bb4ce218 100644 --- a/src/test/java/org/cactoos/RunsInThreads.java +++ b/src/main/java/org/cactoos/matchers/RunsInThreads.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos; +package org.cactoos.matchers; import java.util.ArrayList; import java.util.Collection; @@ -30,6 +30,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.cactoos.Func; import org.cactoos.scalar.And; import org.cactoos.scalar.UncheckedScalar; import org.hamcrest.Description; diff --git a/src/test/java/org/cactoos/ScalarHasValue.java b/src/main/java/org/cactoos/matchers/ScalarHasValue.java similarity index 97% rename from src/test/java/org/cactoos/ScalarHasValue.java rename to src/main/java/org/cactoos/matchers/ScalarHasValue.java index 3a780ecfc0..cea13a6d2f 100644 --- a/src/test/java/org/cactoos/ScalarHasValue.java +++ b/src/main/java/org/cactoos/matchers/ScalarHasValue.java @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos; +package org.cactoos.matchers; +import org.cactoos.Scalar; import org.cactoos.scalar.UncheckedScalar; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/src/test/java/org/cactoos/TextHasString.java b/src/main/java/org/cactoos/matchers/TextHasString.java similarity index 97% rename from src/test/java/org/cactoos/TextHasString.java rename to src/main/java/org/cactoos/matchers/TextHasString.java index dee0e9d670..21fdd5e7b7 100644 --- a/src/test/java/org/cactoos/TextHasString.java +++ b/src/main/java/org/cactoos/matchers/TextHasString.java @@ -21,8 +21,9 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -package org.cactoos; +package org.cactoos.matchers; +import org.cactoos.Text; import org.cactoos.text.UncheckedText; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/src/main/java/org/cactoos/matchers/package-info.java b/src/main/java/org/cactoos/matchers/package-info.java new file mode 100644 index 0000000000..09ecdd5ffd --- /dev/null +++ b/src/main/java/org/cactoos/matchers/package-info.java @@ -0,0 +1,32 @@ +/** + * The MIT License (MIT) + * + * Copyright (c) 2017-2018 Yegor Bugayenko + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/** + * Matchers. + * + * @author Yegor Bugayenko (yegor256@gmail.com) + * @version $Id$ + * @since 0.14 + */ +package org.cactoos.matchers; diff --git a/src/test/java/org/cactoos/TextTest.java b/src/test/java/org/cactoos/TextTest.java index 206d2efa2d..38a7e7fccb 100644 --- a/src/test/java/org/cactoos/TextTest.java +++ b/src/test/java/org/cactoos/TextTest.java @@ -24,6 +24,7 @@ package org.cactoos; import java.io.IOException; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/collection/SolidCollectionTest.java b/src/test/java/org/cactoos/collection/SolidCollectionTest.java index 1abec6c581..1d949a1ec5 100644 --- a/src/test/java/org/cactoos/collection/SolidCollectionTest.java +++ b/src/test/java/org/cactoos/collection/SolidCollectionTest.java @@ -24,9 +24,9 @@ package org.cactoos.collection; import java.util.Collection; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; import org.cactoos.iterable.IterableOf; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/collection/SyncCollectionTest.java b/src/test/java/org/cactoos/collection/SyncCollectionTest.java index 6ac0e3916a..61032113b5 100644 --- a/src/test/java/org/cactoos/collection/SyncCollectionTest.java +++ b/src/test/java/org/cactoos/collection/SyncCollectionTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.collection; -import org.cactoos.RunsInThreads; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/AsyncFuncTest.java b/src/test/java/org/cactoos/func/AsyncFuncTest.java index b11944db3e..f4292d1cb8 100644 --- a/src/test/java/org/cactoos/func/AsyncFuncTest.java +++ b/src/test/java/org/cactoos/func/AsyncFuncTest.java @@ -26,8 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.cactoos.FuncApplies; import org.cactoos.Proc; +import org.cactoos.matchers.FuncApplies; +import org.cactoos.matchers.MatcherOf; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java index 49dbb21dde..7e0aafabf2 100644 --- a/src/test/java/org/cactoos/func/FuncWithFallbackTest.java +++ b/src/test/java/org/cactoos/func/FuncWithFallbackTest.java @@ -24,7 +24,7 @@ package org.cactoos.func; import java.io.IOException; -import org.cactoos.FuncApplies; +import org.cactoos.matchers.FuncApplies; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/RunnableOfTest.java b/src/test/java/org/cactoos/func/RunnableOfTest.java index 2301c479eb..5f739cf6b1 100644 --- a/src/test/java/org/cactoos/func/RunnableOfTest.java +++ b/src/test/java/org/cactoos/func/RunnableOfTest.java @@ -24,6 +24,7 @@ package org.cactoos.func; import java.util.concurrent.atomic.AtomicBoolean; +import org.cactoos.matchers.MatcherOf; import org.hamcrest.MatcherAssert; 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 df02b08c00..73bc73afca 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.RunsInThreads; import org.cactoos.list.ListOf; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/func/SyncFuncTest.java b/src/test/java/org/cactoos/func/SyncFuncTest.java index d8fc8a2a36..9b3327de2e 100644 --- a/src/test/java/org/cactoos/func/SyncFuncTest.java +++ b/src/test/java/org/cactoos/func/SyncFuncTest.java @@ -25,7 +25,7 @@ import java.util.LinkedList; import java.util.List; -import org.cactoos.RunsInThreads; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/BytesOfTest.java b/src/test/java/org/cactoos/io/BytesOfTest.java index 779da62f2b..456787d41f 100644 --- a/src/test/java/org/cactoos/io/BytesOfTest.java +++ b/src/test/java/org/cactoos/io/BytesOfTest.java @@ -30,10 +30,10 @@ import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicBoolean; import org.cactoos.Text; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; import org.cactoos.iterable.Endless; import org.cactoos.iterable.Limited; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.JoinedText; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; diff --git a/src/test/java/org/cactoos/io/DeadInputTest.java b/src/test/java/org/cactoos/io/DeadInputTest.java index a36fd74e83..9aafa6cac8 100644 --- a/src/test/java/org/cactoos/io/DeadInputTest.java +++ b/src/test/java/org/cactoos/io/DeadInputTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.io; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/DeadOutputTest.java b/src/test/java/org/cactoos/io/DeadOutputTest.java index 749f5ca298..f2a3133c21 100644 --- a/src/test/java/org/cactoos/io/DeadOutputTest.java +++ b/src/test/java/org/cactoos/io/DeadOutputTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.io; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/InputOfTest.java b/src/test/java/org/cactoos/io/InputOfTest.java index 0fc6b2aeb3..ae68a5790b 100644 --- a/src/test/java/org/cactoos/io/InputOfTest.java +++ b/src/test/java/org/cactoos/io/InputOfTest.java @@ -33,9 +33,9 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.atomic.AtomicBoolean; -import org.cactoos.InputHasContent; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.InputHasContent; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/src/test/java/org/cactoos/io/InputStreamOfTest.java b/src/test/java/org/cactoos/io/InputStreamOfTest.java index 9522c3bf58..61fdea6eca 100644 --- a/src/test/java/org/cactoos/io/InputStreamOfTest.java +++ b/src/test/java/org/cactoos/io/InputStreamOfTest.java @@ -28,7 +28,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/InputWithFallbackTest.java b/src/test/java/org/cactoos/io/InputWithFallbackTest.java index 5205073058..edc88d81e8 100644 --- a/src/test/java/org/cactoos/io/InputWithFallbackTest.java +++ b/src/test/java/org/cactoos/io/InputWithFallbackTest.java @@ -25,7 +25,7 @@ import java.io.File; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/src/test/java/org/cactoos/io/Md5DigestOfTest.java b/src/test/java/org/cactoos/io/Md5DigestOfTest.java index 4bfc66af8d..53a0d6ea22 100644 --- a/src/test/java/org/cactoos/io/Md5DigestOfTest.java +++ b/src/test/java/org/cactoos/io/Md5DigestOfTest.java @@ -24,7 +24,7 @@ package org.cactoos.io; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.HexOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/OutputStreamToTest.java b/src/test/java/org/cactoos/io/OutputStreamToTest.java index f55a27badb..8b382ae292 100644 --- a/src/test/java/org/cactoos/io/OutputStreamToTest.java +++ b/src/test/java/org/cactoos/io/OutputStreamToTest.java @@ -26,8 +26,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/OutputToTest.java b/src/test/java/org/cactoos/io/OutputToTest.java index e47bd4387f..6bfda3134a 100644 --- a/src/test/java/org/cactoos/io/OutputToTest.java +++ b/src/test/java/org/cactoos/io/OutputToTest.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/ReaderOfTest.java b/src/test/java/org/cactoos/io/ReaderOfTest.java index 90503c599d..314bc1e73d 100644 --- a/src/test/java/org/cactoos/io/ReaderOfTest.java +++ b/src/test/java/org/cactoos/io/ReaderOfTest.java @@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java b/src/test/java/org/cactoos/io/Sha1DigestOfTest.java index 32587da396..e06a5a9b29 100644 --- a/src/test/java/org/cactoos/io/Sha1DigestOfTest.java +++ b/src/test/java/org/cactoos/io/Sha1DigestOfTest.java @@ -24,7 +24,7 @@ package org.cactoos.io; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.HexOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java b/src/test/java/org/cactoos/io/Sha256DigestOfTest.java index 6b513fa30a..535e223375 100644 --- a/src/test/java/org/cactoos/io/Sha256DigestOfTest.java +++ b/src/test/java/org/cactoos/io/Sha256DigestOfTest.java @@ -24,7 +24,7 @@ package org.cactoos.io; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.HexOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/StickyInputTest.java b/src/test/java/org/cactoos/io/StickyInputTest.java index 6a21fc9369..7f885f7d54 100644 --- a/src/test/java/org/cactoos/io/StickyInputTest.java +++ b/src/test/java/org/cactoos/io/StickyInputTest.java @@ -27,9 +27,9 @@ import java.net.MalformedURLException; import java.net.URL; import org.cactoos.Input; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; import org.cactoos.func.RepeatedFunc; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/src/test/java/org/cactoos/io/TeeInputTest.java b/src/test/java/org/cactoos/io/TeeInputTest.java index 63619d40fb..5e93a6dea7 100644 --- a/src/test/java/org/cactoos/io/TeeInputTest.java +++ b/src/test/java/org/cactoos/io/TeeInputTest.java @@ -28,8 +28,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/TeeOutputTest.java b/src/test/java/org/cactoos/io/TeeOutputTest.java index e9454c3d98..74f34ad8f2 100644 --- a/src/test/java/org/cactoos/io/TeeOutputTest.java +++ b/src/test/java/org/cactoos/io/TeeOutputTest.java @@ -25,8 +25,8 @@ import java.io.ByteArrayOutputStream; import java.nio.charset.StandardCharsets; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/TeeReaderTest.java b/src/test/java/org/cactoos/io/TeeReaderTest.java index 85fc8dad50..dafeefc272 100644 --- a/src/test/java/org/cactoos/io/TeeReaderTest.java +++ b/src/test/java/org/cactoos/io/TeeReaderTest.java @@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; -import org.cactoos.InputHasContent; +import org.cactoos.matchers.InputHasContent; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/TempFileTest.java b/src/test/java/org/cactoos/io/TempFileTest.java index 5715fb10b0..26dc277388 100644 --- a/src/test/java/org/cactoos/io/TempFileTest.java +++ b/src/test/java/org/cactoos/io/TempFileTest.java @@ -26,7 +26,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java b/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java index 83a64e00ad..3f68699a21 100644 --- a/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java +++ b/src/test/java/org/cactoos/io/WriterAsOutputStreamTest.java @@ -30,8 +30,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/WriterAsOutputTest.java b/src/test/java/org/cactoos/io/WriterAsOutputTest.java index 190a9f0e11..79be7495f2 100644 --- a/src/test/java/org/cactoos/io/WriterAsOutputTest.java +++ b/src/test/java/org/cactoos/io/WriterAsOutputTest.java @@ -29,8 +29,8 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/io/WriterToTest.java b/src/test/java/org/cactoos/io/WriterToTest.java index d04d839124..836bd5a08e 100644 --- a/src/test/java/org/cactoos/io/WriterToTest.java +++ b/src/test/java/org/cactoos/io/WriterToTest.java @@ -26,8 +26,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import org.cactoos.TextHasString; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.TextOf; import org.hamcrest.MatcherAssert; 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 d2b62a0a20..3202df101d 100644 --- a/src/test/java/org/cactoos/iterable/CycledTest.java +++ b/src/test/java/org/cactoos/iterable/CycledTest.java @@ -24,7 +24,7 @@ package org.cactoos.iterable; import java.util.Collections; -import org.cactoos.ScalarHasValue; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/ItemAtTest.java b/src/test/java/org/cactoos/iterable/ItemAtTest.java index 5387216da1..53777c9841 100644 --- a/src/test/java/org/cactoos/iterable/ItemAtTest.java +++ b/src/test/java/org/cactoos/iterable/ItemAtTest.java @@ -25,7 +25,7 @@ import java.io.IOException; import java.util.Collections; -import org.cactoos.ScalarHasValue; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/PropertiesOfTest.java b/src/test/java/org/cactoos/iterable/PropertiesOfTest.java index e3588d78a4..f8ea1cf2de 100644 --- a/src/test/java/org/cactoos/iterable/PropertiesOfTest.java +++ b/src/test/java/org/cactoos/iterable/PropertiesOfTest.java @@ -26,13 +26,13 @@ import java.security.SecureRandom; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import org.cactoos.ScalarHasValue; -import org.cactoos.func.MatcherOf; import org.cactoos.io.InputOf; import org.cactoos.iterator.Repeated; import org.cactoos.map.MapEntry; import org.cactoos.map.MapOf; import org.cactoos.map.StickyMap; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/ReversedTest.java b/src/test/java/org/cactoos/iterable/ReversedTest.java index b359b9a29c..86a97d44a0 100644 --- a/src/test/java/org/cactoos/iterable/ReversedTest.java +++ b/src/test/java/org/cactoos/iterable/ReversedTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.iterable; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.JoinedText; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/SolidIterableTest.java b/src/test/java/org/cactoos/iterable/SolidIterableTest.java index 2dc62942d1..c2e0a33c85 100644 --- a/src/test/java/org/cactoos/iterable/SolidIterableTest.java +++ b/src/test/java/org/cactoos/iterable/SolidIterableTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.iterable; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterable/SyncIterableTest.java b/src/test/java/org/cactoos/iterable/SyncIterableTest.java index 78d6803c26..476388597e 100644 --- a/src/test/java/org/cactoos/iterable/SyncIterableTest.java +++ b/src/test/java/org/cactoos/iterable/SyncIterableTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.iterable; -import org.cactoos.RunsInThreads; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterator/CycledTest.java b/src/test/java/org/cactoos/iterator/CycledTest.java index f3c43f607c..27ade7f37b 100644 --- a/src/test/java/org/cactoos/iterator/CycledTest.java +++ b/src/test/java/org/cactoos/iterator/CycledTest.java @@ -25,9 +25,9 @@ import java.util.Collections; import java.util.NoSuchElementException; -import org.cactoos.ScalarHasValue; import org.cactoos.iterable.IterableNoNulls; import org.cactoos.iterable.IterableOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterator/ItemAtTest.java b/src/test/java/org/cactoos/iterator/ItemAtTest.java index e87cd7571a..4d19921983 100644 --- a/src/test/java/org/cactoos/iterator/ItemAtTest.java +++ b/src/test/java/org/cactoos/iterator/ItemAtTest.java @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.Collections; -import org.cactoos.ScalarHasValue; import org.cactoos.iterable.IterableOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/iterator/StickyTest.java b/src/test/java/org/cactoos/iterator/StickyTest.java index 0d43824814..629943e709 100644 --- a/src/test/java/org/cactoos/iterator/StickyTest.java +++ b/src/test/java/org/cactoos/iterator/StickyTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.cactoos.Text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.cactoos.text.FormattedText; import org.cactoos.text.JoinedText; import org.hamcrest.MatcherAssert; diff --git a/src/test/java/org/cactoos/list/SolidListTest.java b/src/test/java/org/cactoos/list/SolidListTest.java index 3a15c3b8dd..7d58ecd54b 100644 --- a/src/test/java/org/cactoos/list/SolidListTest.java +++ b/src/test/java/org/cactoos/list/SolidListTest.java @@ -25,9 +25,9 @@ import java.util.Collections; import java.util.List; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; import org.cactoos.iterable.IterableOf; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/list/SyncListTest.java b/src/test/java/org/cactoos/list/SyncListTest.java index ed59f49461..887804e12f 100644 --- a/src/test/java/org/cactoos/list/SyncListTest.java +++ b/src/test/java/org/cactoos/list/SyncListTest.java @@ -24,7 +24,7 @@ package org.cactoos.list; import java.util.Collections; -import org.cactoos.RunsInThreads; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/map/SolidMapTest.java b/src/test/java/org/cactoos/map/SolidMapTest.java index bb37636ab8..bee77d8833 100644 --- a/src/test/java/org/cactoos/map/SolidMapTest.java +++ b/src/test/java/org/cactoos/map/SolidMapTest.java @@ -24,8 +24,8 @@ package org.cactoos.map; import java.util.Map; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/map/SyncMapTest.java b/src/test/java/org/cactoos/map/SyncMapTest.java index e17646d5ce..fb58a0b707 100644 --- a/src/test/java/org/cactoos/map/SyncMapTest.java +++ b/src/test/java/org/cactoos/map/SyncMapTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.map; -import org.cactoos.RunsInThreads; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java index e337954853..1b9ff38ef6 100644 --- a/src/test/java/org/cactoos/scalar/AndInThreadsTest.java +++ b/src/test/java/org/cactoos/scalar/AndInThreadsTest.java @@ -28,11 +28,11 @@ import java.util.List; import org.cactoos.Proc; import org.cactoos.Scalar; -import org.cactoos.ScalarHasValue; import org.cactoos.func.FuncOf; -import org.cactoos.func.MatcherOf; import org.cactoos.iterable.IterableOf; import org.cactoos.iterable.Mapped; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; 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 d87cfce700..9b2ff9f3af 100644 --- a/src/test/java/org/cactoos/scalar/AndTest.java +++ b/src/test/java/org/cactoos/scalar/AndTest.java @@ -28,11 +28,11 @@ import java.util.List; import org.cactoos.Proc; import org.cactoos.Scalar; -import org.cactoos.ScalarHasValue; import org.cactoos.func.FuncOf; -import org.cactoos.func.MatcherOf; import org.cactoos.iterable.IterableOf; import org.cactoos.iterable.Mapped; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/AndWithIndexTest.java b/src/test/java/org/cactoos/scalar/AndWithIndexTest.java index de649a3128..0adfbdbda4 100644 --- a/src/test/java/org/cactoos/scalar/AndWithIndexTest.java +++ b/src/test/java/org/cactoos/scalar/AndWithIndexTest.java @@ -25,9 +25,9 @@ import java.util.LinkedList; import java.util.List; -import org.cactoos.ScalarHasValue; import org.cactoos.func.BiFuncOf; -import org.cactoos.func.MatcherOf; +import org.cactoos.matchers.MatcherOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; 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 9757eed6e3..2c82233a8b 100644 --- a/src/test/java/org/cactoos/scalar/OrTest.java +++ b/src/test/java/org/cactoos/scalar/OrTest.java @@ -28,8 +28,8 @@ import java.util.List; import org.cactoos.Proc; import org.cactoos.Scalar; -import org.cactoos.ScalarHasValue; import org.cactoos.iterable.IterableOf; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/SolidScalarTest.java b/src/test/java/org/cactoos/scalar/SolidScalarTest.java index cdfd5b955b..1eaa9cf08b 100644 --- a/src/test/java/org/cactoos/scalar/SolidScalarTest.java +++ b/src/test/java/org/cactoos/scalar/SolidScalarTest.java @@ -24,9 +24,9 @@ package org.cactoos.scalar; import java.security.SecureRandom; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; import org.cactoos.list.ListOf; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/scalar/SyncScalarTest.java b/src/test/java/org/cactoos/scalar/SyncScalarTest.java index a4d42b950e..4b8c22e9ad 100644 --- a/src/test/java/org/cactoos/scalar/SyncScalarTest.java +++ b/src/test/java/org/cactoos/scalar/SyncScalarTest.java @@ -25,8 +25,8 @@ import java.util.LinkedList; import java.util.List; -import org.cactoos.RunsInThreads; import org.cactoos.Scalar; +import org.cactoos.matchers.RunsInThreads; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/AbbreviatedTextTest.java b/src/test/java/org/cactoos/text/AbbreviatedTextTest.java index a042041d3b..1a82235067 100644 --- a/src/test/java/org/cactoos/text/AbbreviatedTextTest.java +++ b/src/test/java/org/cactoos/text/AbbreviatedTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/Base64TextTest.java b/src/test/java/org/cactoos/text/Base64TextTest.java index 0c14b6c26b..e800d03fc4 100644 --- a/src/test/java/org/cactoos/text/Base64TextTest.java +++ b/src/test/java/org/cactoos/text/Base64TextTest.java @@ -25,7 +25,7 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/FormattedTextTest.java b/src/test/java/org/cactoos/text/FormattedTextTest.java index e55cd3f3ba..4c638224f2 100644 --- a/src/test/java/org/cactoos/text/FormattedTextTest.java +++ b/src/test/java/org/cactoos/text/FormattedTextTest.java @@ -28,8 +28,8 @@ import java.util.IllegalFormatConversionException; import java.util.Locale; import java.util.UnknownFormatConversionException; -import org.cactoos.TextHasString; import org.cactoos.list.ListOf; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/HexOfTest.java b/src/test/java/org/cactoos/text/HexOfTest.java index cf816661e7..c8462b1a9f 100644 --- a/src/test/java/org/cactoos/text/HexOfTest.java +++ b/src/test/java/org/cactoos/text/HexOfTest.java @@ -24,8 +24,8 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.TextHasString; import org.cactoos.io.BytesOf; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/IsBlankTest.java b/src/test/java/org/cactoos/text/IsBlankTest.java index f9d1e4a860..d3aeb1fb4b 100644 --- a/src/test/java/org/cactoos/text/IsBlankTest.java +++ b/src/test/java/org/cactoos/text/IsBlankTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.ScalarHasValue; +import org.cactoos.matchers.ScalarHasValue; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/JoinedTextTest.java b/src/test/java/org/cactoos/text/JoinedTextTest.java index 54bb220a49..5ccae04be0 100644 --- a/src/test/java/org/cactoos/text/JoinedTextTest.java +++ b/src/test/java/org/cactoos/text/JoinedTextTest.java @@ -24,7 +24,7 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/LowerTextTest.java b/src/test/java/org/cactoos/text/LowerTextTest.java index d5b990c624..1138d96c6b 100644 --- a/src/test/java/org/cactoos/text/LowerTextTest.java +++ b/src/test/java/org/cactoos/text/LowerTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/NormalizedTextTest.java b/src/test/java/org/cactoos/text/NormalizedTextTest.java index e82f628d53..f6900a6632 100644 --- a/src/test/java/org/cactoos/text/NormalizedTextTest.java +++ b/src/test/java/org/cactoos/text/NormalizedTextTest.java @@ -24,7 +24,7 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/RepeatedTextTest.java b/src/test/java/org/cactoos/text/RepeatedTextTest.java index cc90b0a874..c7b15e8dab 100644 --- a/src/test/java/org/cactoos/text/RepeatedTextTest.java +++ b/src/test/java/org/cactoos/text/RepeatedTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/ReplacedTextTest.java b/src/test/java/org/cactoos/text/ReplacedTextTest.java index 7c609bcedf..d69343a691 100644 --- a/src/test/java/org/cactoos/text/ReplacedTextTest.java +++ b/src/test/java/org/cactoos/text/ReplacedTextTest.java @@ -27,7 +27,7 @@ import java.nio.charset.StandardCharsets; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/ReversedTextTest.java b/src/test/java/org/cactoos/text/ReversedTextTest.java index ea4ee396a9..960974c1cb 100644 --- a/src/test/java/org/cactoos/text/ReversedTextTest.java +++ b/src/test/java/org/cactoos/text/ReversedTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/RotatedTextTest.java b/src/test/java/org/cactoos/text/RotatedTextTest.java index 420b07cf59..87993b978c 100644 --- a/src/test/java/org/cactoos/text/RotatedTextTest.java +++ b/src/test/java/org/cactoos/text/RotatedTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/SplitTextTest.java b/src/test/java/org/cactoos/text/SplitTextTest.java index 95a5ba504c..83e96b4a41 100644 --- a/src/test/java/org/cactoos/text/SplitTextTest.java +++ b/src/test/java/org/cactoos/text/SplitTextTest.java @@ -23,8 +23,8 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; import org.cactoos.iterable.LengthOf; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/SubTextTest.java b/src/test/java/org/cactoos/text/SubTextTest.java index d953be0460..055c746b4e 100644 --- a/src/test/java/org/cactoos/text/SubTextTest.java +++ b/src/test/java/org/cactoos/text/SubTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/SwappedCaseTextTest.java b/src/test/java/org/cactoos/text/SwappedCaseTextTest.java index 3fff56bfcf..9e2af3e352 100644 --- a/src/test/java/org/cactoos/text/SwappedCaseTextTest.java +++ b/src/test/java/org/cactoos/text/SwappedCaseTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/TextBase64Test.java b/src/test/java/org/cactoos/text/TextBase64Test.java index 7cce4668bc..3090aead40 100644 --- a/src/test/java/org/cactoos/text/TextBase64Test.java +++ b/src/test/java/org/cactoos/text/TextBase64Test.java @@ -25,7 +25,7 @@ package org.cactoos.text; import java.io.IOException; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/TextOfTest.java b/src/test/java/org/cactoos/text/TextOfTest.java index f9a60f821a..60ef2cf378 100644 --- a/src/test/java/org/cactoos/text/TextOfTest.java +++ b/src/test/java/org/cactoos/text/TextOfTest.java @@ -28,9 +28,9 @@ import java.io.InputStream; import java.io.StringReader; import java.nio.charset.StandardCharsets; -import org.cactoos.TextHasString; import org.cactoos.io.BytesOf; import org.cactoos.io.InputOf; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java b/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java index ac7802fb83..173ec5052a 100644 --- a/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java +++ b/src/test/java/org/cactoos/text/TrimmedLeftTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/TrimmedRightTextTest.java b/src/test/java/org/cactoos/text/TrimmedRightTextTest.java index a7aabca56c..ab09a45d06 100644 --- a/src/test/java/org/cactoos/text/TrimmedRightTextTest.java +++ b/src/test/java/org/cactoos/text/TrimmedRightTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/TrimmedTextTest.java b/src/test/java/org/cactoos/text/TrimmedTextTest.java index ca3a2909e1..0858fe3a68 100644 --- a/src/test/java/org/cactoos/text/TrimmedTextTest.java +++ b/src/test/java/org/cactoos/text/TrimmedTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test; diff --git a/src/test/java/org/cactoos/text/UpperTextTest.java b/src/test/java/org/cactoos/text/UpperTextTest.java index d184c135b6..96255cadd3 100644 --- a/src/test/java/org/cactoos/text/UpperTextTest.java +++ b/src/test/java/org/cactoos/text/UpperTextTest.java @@ -23,7 +23,7 @@ */ package org.cactoos.text; -import org.cactoos.TextHasString; +import org.cactoos.matchers.TextHasString; import org.hamcrest.MatcherAssert; import org.junit.Test;