stonger tests

yegor256 · yegor256 · commit 814d863c73d6 · 2025-01-22T07:04:19.000+03:00
diff --git a/src/main/java/org/eolang/lints/comments/LtAsciiOnly.java b/src/main/java/org/eolang/lints/comments/LtAsciiOnly.java
@@ -70,7 +70,7 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
                     xmir.xpath("/program/@name").stream().findFirst().orElse("unknown"),
                     Integer.parseInt(line),
                     String.format(
-                        "Only ASCII characters are allowed in comments, while '%s' is used at the %sth line at the %sth position",
+                        "Only ASCII characters are allowed in comments, while \"%s\" is used at the line no.%s at the position no.%s",
                         chr,
                         line,
                         comment.xpath("text()").get(0).indexOf(chr) + 1
diff --git a/src/main/java/org/eolang/lints/critical/LtIncorrectAlias.java b/src/main/java/org/eolang/lints/critical/LtIncorrectAlias.java
@@ -84,7 +84,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
                                     xmir.xpath("/program/metas/meta[head='alias'][1]/@line").get(0)
                                 ),
                                 String.format(
-                                    "Incorrect pointing alias '%s', since there is no %s",
+                                    "Incorrect pointing alias \"%s\", since there is no \"%s\"",
                                     pointer,
                                     lookup
                                 )
diff --git a/src/main/java/org/eolang/lints/errors/LtAtomIsNotUnique.java b/src/main/java/org/eolang/lints/errors/LtAtomIsNotUnique.java
@@ -156,7 +156,7 @@ private Defect singleDefect(final XML xmir, final String fqn, final int pos) {
                     )
                 ).get(pos)
             ),
-            String.format("Atom '%s' is duplicated", fqn)
+            String.format("Atom \"%s\" is duplicated", fqn)
         );
     }
 
@@ -174,7 +174,7 @@ private Defect sharedDefect(final XML xmir, final XML original, final String fqn
                 ).get(0)
             ),
             String.format(
-                "Atom with FQN '%s' is duplicated, original was found in '%s'",
+                "Atom with FQN \"%s\" is duplicated, original was found in \"%s\"",
                 fqn, original.xpath("/program/@name").stream().findFirst().orElse("unknown")
             )
         );
diff --git a/src/main/java/org/eolang/lints/errors/LtObjectIsNotUnique.java b/src/main/java/org/eolang/lints/errors/LtObjectIsNotUnique.java
@@ -82,7 +82,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
                                     .orElse("unknown"),
                                 Integer.parseInt(object.getValue()),
                                 String.format(
-                                    "The object name '%s' is not unique, original object was found in '%s'",
+                                    "The object name \"%s\" is not unique, original object was found in \"%s\"",
                                     object.getKey(), src
                                 )
                             )
diff --git a/src/main/java/org/eolang/lints/units/LtUnitTestMissing.java b/src/main/java/org/eolang/lints/units/LtUnitTestMissing.java
@@ -55,7 +55,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) throws IOException
                     Severity.WARNING,
                     name,
                     0,
-                    String.format("Unit test is not found for %s", name)
+                    String.format("Unit test is not found for \"%s\"", name)
                 )
             );
         }
diff --git a/src/main/java/org/eolang/lints/units/LtUnitTestWithoutLiveFile.java b/src/main/java/org/eolang/lints/units/LtUnitTestWithoutLiveFile.java
@@ -65,7 +65,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
                     name,
                     0,
                     String.format(
-                        "Live .eo file '%s' was not found for '%s'", live, name
+                        "Live \".eo\" file \"%s\" was not found for \"%s\"", live, name
                     )
                 )
             );
diff --git a/src/test/java/org/eolang/lints/DefectMatcher.java b/src/test/java/org/eolang/lints/DefectMatcher.java
@@ -35,7 +35,7 @@
  *
  * @since 0.0.34
  */
-final class DefectMatcher extends BaseMatcher<Defect> {
+public final class DefectMatcher extends BaseMatcher<Defect> {
 
     /**
      * Synthetic matcher that is built when input arrives.
diff --git a/src/test/java/org/eolang/lints/DefectsMatcher.java b/src/test/java/org/eolang/lints/DefectsMatcher.java
@@ -36,7 +36,7 @@
  *
  * @since 0.0.34
  */
-final class DefectsMatcher extends BaseMatcher<XML> {
+public final class DefectsMatcher extends BaseMatcher<XML> {
 
     /**
      * Synthetic matcher that is built when input arrives.
diff --git a/src/test/java/org/eolang/lints/comments/LtAsciiOnlyTest.java b/src/test/java/org/eolang/lints/comments/LtAsciiOnlyTest.java
@@ -24,10 +24,10 @@
 package org.eolang.lints.comments;
 
 import java.io.IOException;
-import java.util.Collection;
 import org.cactoos.io.InputOf;
 import org.cactoos.list.ListOf;
 import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.parser.EoSyntax;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -42,23 +42,33 @@
 final class LtAsciiOnlyTest {
 
     @Test
-    void catchesNonAsciiInComment() throws IOException {
-        final Collection<Defect> defects = new LtAsciiOnly().defects(
-            new EoSyntax(
-                new InputOf("# привет\n# как дела?\n[] > foo\n")
-            ).parsed()
-        );
+    void catchesSomeNonAsciiInComment() throws IOException {
         MatcherAssert.assertThat(
             "non-ascii comment is not welcome",
-            defects,
-            Matchers.hasSize(Matchers.greaterThan(0))
+            new LtAsciiOnly().defects(
+                new EoSyntax(
+                    new InputOf("# привет\n# как дела?\n[] > foo\n")
+                ).parsed()
+            ),
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
         );
+    }
+
+    @Test
+    void catchesNonAsciiInComment() throws IOException {
         MatcherAssert.assertThat(
             "non-ascii comment error should contain abusive character",
-            new ListOf<>(defects).get(0).text(),
-            Matchers.is(
-                "Only ASCII characters are allowed in comments, while 'п' is used at the 3th line at the 1th position"
-            )
+            new ListOf<>(
+                new LtAsciiOnly().defects(
+                    new EoSyntax(
+                        new InputOf("# привет\n# как дела?\n[] > foo\n")
+                    ).parsed()
+                )
+            ).get(0).text(),
+            Matchers.containsString("Only ASCII characters are allowed in comments")
         );
     }
 
diff --git a/src/test/java/org/eolang/lints/critical/LtIncorrectAliasTest.java b/src/test/java/org/eolang/lints/critical/LtIncorrectAliasTest.java
@@ -31,6 +31,8 @@
 import java.nio.file.Path;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
+import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.lints.ParsedEo;
 import org.eolang.lints.Programs;
 import org.hamcrest.MatcherAssert;
@@ -61,7 +63,10 @@ void catchesBrokenAlias() throws Exception {
                     )
                 )
             ),
-            Matchers.hasSize(Matchers.greaterThan(0))
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
         );
     }
 
diff --git a/src/test/java/org/eolang/lints/errors/LtAtomIsNotUniqueTest.java b/src/test/java/org/eolang/lints/errors/LtAtomIsNotUniqueTest.java
@@ -26,6 +26,8 @@
 import com.jcabi.xml.XML;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
+import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.lints.ParsedEo;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -148,7 +150,10 @@ void catchesDuplicatesInSingleFile() throws Exception {
                     )
                 )
             ),
-            Matchers.hasSize(Matchers.greaterThan(0))
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
         );
     }
 
diff --git a/src/test/java/org/eolang/lints/errors/LtObjectIsNotUniqueTest.java b/src/test/java/org/eolang/lints/errors/LtObjectIsNotUniqueTest.java
@@ -26,6 +26,8 @@
 import com.jcabi.xml.XML;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
+import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.lints.ParsedEo;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -58,7 +60,10 @@ void catchesDuplicates() throws Exception {
                     )
                 )
             ),
-            Matchers.hasSize(Matchers.greaterThan(0))
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
         );
     }
 
diff --git a/src/test/java/org/eolang/lints/misc/LtTestIsNotVerbTest.java b/src/test/java/org/eolang/lints/misc/LtTestIsNotVerbTest.java
@@ -24,6 +24,8 @@
 package org.eolang.lints.misc;
 
 import com.yegor256.MayBeSlow;
+import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.lints.ParsedEo;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -47,7 +49,10 @@ void catchesBadName() throws Exception {
                     "org/eolang/lints/misc/test-object-is-not-verb-in-singular/bad-tests.eo"
                 ).value()
             ),
-            Matchers.hasSize(40)
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(40),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
         );
     }
 
diff --git a/src/test/java/org/eolang/lints/units/LtUnitTestMissingTest.java b/src/test/java/org/eolang/lints/units/LtUnitTestMissingTest.java
@@ -30,10 +30,10 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Collection;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
 import org.eolang.lints.Defect;
+import org.eolang.lints.DefectMatcher;
 import org.eolang.lints.Programs;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
@@ -50,27 +50,39 @@ final class LtUnitTestMissingTest {
 
     @Test
     void acceptsValidPackage() throws IOException {
-        final Collection<Defect> defects = new LtUnitTestMissing().defects(
-            new MapOf<String, XML>(
-                new MapEntry<>("foo", new XMLDocument("<program/>")),
-                new MapEntry<>("foo-test", new XMLDocument("<program/>"))
-            )
-        );
         MatcherAssert.assertThat(
-            "no problems found",
-            defects,
+            "some problems found by mistake",
+            new LtUnitTestMissing().defects(
+                new MapOf<String, XML>(
+                    new MapEntry<>("bar", new XMLDocument("<program name='bar'/>")),
+                    new MapEntry<>("bar-test", new XMLDocument("<program name='bar-test'/>"))
+                )
+            ),
             Matchers.emptyIterable()
         );
     }
 
     @Test
     void acceptsValidDirectory(@Mktmp final Path dir) throws IOException {
-        Files.write(dir.resolve("foo.xmir"), "<program/>".getBytes());
-        Files.write(dir.resolve("foo-test.xmir"), "<program/>".getBytes());
+        Files.write(dir.resolve("foo.xmir"), "<program name='foo'/>".getBytes());
+        Files.write(dir.resolve("foo-test.xmir"), "<program name='foo-test'/>".getBytes());
         MatcherAssert.assertThat(
-            "no defects found",
+            "some defects found by mistake",
             new Programs(dir).defects(),
             Matchers.emptyIterable()
         );
     }
+
+    @Test
+    void detectsMissingTest(@Mktmp final Path dir) throws IOException {
+        Files.write(dir.resolve("aaa.xmir"), "<program name='aaa'/>".getBytes());
+        MatcherAssert.assertThat(
+            " defects found",
+            new Programs(dir).defects(),
+            Matchers.allOf(
+                Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),
+                Matchers.<Defect>everyItem(new DefectMatcher())
+            )
+        );
+    }
 }
diff --git a/src/test/java/org/eolang/lints/units/LtUnitTestWithoutLiveFileTest.java b/src/test/java/org/eolang/lints/units/LtUnitTestWithoutLiveFileTest.java
@@ -27,6 +27,7 @@
 import com.jcabi.xml.XMLDocument;
 import org.cactoos.map.MapEntry;
 import org.cactoos.map.MapOf;
+import org.eolang.lints.DefectMatcher;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
@@ -44,22 +45,36 @@ void catchesAbsenceOfLiveFile() {
             "Defects are empty, but they should not",
             new LtUnitTestWithoutLiveFile().defects(
                 new MapOf<String, XML>(
-                    new MapEntry<>("foo-test", new XMLDocument("<program/>")),
-                    new MapEntry<>("bar", new XMLDocument("<program/>"))
+                    new MapEntry<>("abc-test", new XMLDocument("<program/>")),
+                    new MapEntry<>("cde", new XMLDocument("<program/>"))
                 )
             ),
             Matchers.hasSize(Matchers.greaterThan(0))
         );
     }
 
+    @Test
+    void reportsProperly() {
+        MatcherAssert.assertThat(
+            "Defects are empty, but they should not",
+            new LtUnitTestWithoutLiveFile().defects(
+                new MapOf<String, XML>(
+                    new MapEntry<>("xyz-test", new XMLDocument("<program name='xyz-test'/>")),
+                    new MapEntry<>("bar", new XMLDocument("<program name='bar'/>"))
+                )
+            ),
+            Matchers.everyItem(new DefectMatcher())
+        );
+    }
+
     @Test
     void acceptsValidPackage() {
         MatcherAssert.assertThat(
             "Defects are not empty, but they should",
             new LtUnitTestWithoutLiveFile().defects(
                 new MapOf<String, XML>(
-                    new MapEntry<>("foo-test", new XMLDocument("<program/>")),
-                    new MapEntry<>("foo", new XMLDocument("<program/>"))
+                    new MapEntry<>("foo-test", new XMLDocument("<program name='foo-test'/>")),
+                    new MapEntry<>("foo", new XMLDocument("<program name='foo'/>"))
                 )
             ),
             Matchers.emptyIterable()

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {`
`84`	`84`	`xmir.xpath("/program/metas/meta[head='alias'][1]/@line").get(0)`
`85`	`85`	`),`
`86`	`86`	`String.format(`
`87`		`- "Incorrect pointing alias '%s', since there is no %s",`
	`87`	`+ "Incorrect pointing alias \"%s\", since there is no \"%s\"",`
`88`	`88`	`pointer,`
`89`	`89`	`lookup`
`90`	`90`	`)`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private Defect singleDefect(final XML xmir, final String fqn, final int pos) {`
`156`	`156`	`)`
`157`	`157`	`).get(pos)`
`158`	`158`	`),`
`159`		`- String.format("Atom '%s' is duplicated", fqn)`
	`159`	`+ String.format("Atom \"%s\" is duplicated", fqn)`
`160`	`160`	`);`
`161`	`161`	`}`
`162`	`162`
`@@ -174,7 +174,7 @@ private Defect sharedDefect(final XML xmir, final XML original, final String fqn`
`174`	`174`	`).get(0)`
`175`	`175`	`),`
`176`	`176`	`String.format(`
`177`		`- "Atom with FQN '%s' is duplicated, original was found in '%s'",`
	`177`	`+ "Atom with FQN \"%s\" is duplicated, original was found in \"%s\"",`
`178`	`178`	`fqn, original.xpath("/program/@name").stream().findFirst().orElse("unknown")`
`179`	`179`	`)`
`180`	`180`	`);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {`
`82`	`82`	`.orElse("unknown"),`
`83`	`83`	`Integer.parseInt(object.getValue()),`
`84`	`84`	`String.format(`
`85`		`- "The object name '%s' is not unique, original object was found in '%s'",`
	`85`	`+ "The object name \"%s\" is not unique, original object was found in \"%s\"",`
`86`	`86`	`object.getKey(), src`
`87`	`87`	`)`
`88`	`88`	`)`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) throws IOException`
`55`	`55`	`Severity.WARNING,`
`56`	`56`	`name,`
`57`	`57`	`0,`
`58`		`- String.format("Unit test is not found for %s", name)`
	`58`	`+ String.format("Unit test is not found for \"%s\"", name)`
`59`	`59`	`)`
`60`	`60`	`);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {`
`65`	`65`	`name,`
`66`	`66`	`0,`
`67`	`67`	`String.format(`
`68`		`- "Live .eo file '%s' was not found for '%s'", live, name`
	`68`	`+ "Live \".eo\" file \"%s\" was not found for \"%s\"", live, name`
`69`	`69`	`)`
`70`	`70`	`)`
`71`	`71`	`);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* @since 0.0.34`
`37`	`37`	`*/`
`38`		`-final class DefectMatcher extends BaseMatcher<Defect> {`
	`38`	`+public final class DefectMatcher extends BaseMatcher<Defect> {`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Synthetic matcher that is built when input arrives.`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`*`
`37`	`37`	`* @since 0.0.34`
`38`	`38`	`*/`
`39`		`-final class DefectsMatcher extends BaseMatcher<XML> {`
	`39`	`+public final class DefectsMatcher extends BaseMatcher<XML> {`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* Synthetic matcher that is built when input arrives.`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`import java.nio.file.Path;`
`32`	`32`	`import org.cactoos.map.MapEntry;`
`33`	`33`	`import org.cactoos.map.MapOf;`
	`34`	`+import org.eolang.lints.Defect;`
	`35`	`+import org.eolang.lints.DefectMatcher;`
`34`	`36`	`import org.eolang.lints.ParsedEo;`
`35`	`37`	`import org.eolang.lints.Programs;`
`36`	`38`	`import org.hamcrest.MatcherAssert;`
`@@ -61,7 +63,10 @@ void catchesBrokenAlias() throws Exception {`
`61`	`63`	`)`
`62`	`64`	`)`
`63`	`65`	`),`
`64`		`- Matchers.hasSize(Matchers.greaterThan(0))`
	`66`	`+ Matchers.allOf(`
	`67`	`+ Matchers.<Defect>iterableWithSize(Matchers.greaterThan(0)),`
	`68`	`+ Matchers.<Defect>everyItem(new DefectMatcher())`
	`69`	`+ )`
`65`	`70`	`);`
`66`	`71`	`}`
`67`	`72`