#578 moved matchers to src/main

src/test/java/org/cactoos/FuncApplies.java → 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;

src/test/java/org/cactoos/InputHasContent.java → 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;

src/test/java/org/cactoos/func/MatcherOf.java → 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;
 

src/test/java/org/cactoos/RunsInThreads.java → 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;

src/test/java/org/cactoos/ScalarHasValue.java → 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;

src/test/java/org/cactoos/TextHasString.java → 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;

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 ([email protected])
+ * @version $Id$
+ * @since 0.14
+ */
+package org.cactoos.matchers;

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;

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;
 

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;