Merge branch 'master' into renovate/org.pitest-pitest-maven-1.x

Author: yegor256

pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>eo-parser</artifactId>
-      <version>0.56.4</version>
+      <version>0.56.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

src/main/java/org/eolang/lints/LtAsciiOnly.java

@@ -15,7 +15,7 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.IoCheckedText;
 import org.cactoos.text.TextOf;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * A comment must include only ASCII characters.
@@ -56,7 +56,7 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
                 new Defect.Default(
                     "ascii-only",
                     Severity.ERROR,
-                    new ObjectName(xmir).get(),
+                    new OnDefault(xmir).get(),
                     Integer.parseInt(line),
                     String.format(
                         "Only ASCII characters are allowed in comments, while \"%s\" is used at the line no.%s at the position no.%s",

src/main/java/org/eolang/lints/LtAtomIsNotUnique.java

@@ -24,7 +24,7 @@
 import org.cactoos.list.ListOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * All atom FQNs in the entire scope of EO program must be unique.
@@ -129,7 +129,7 @@ private Defect singleDefect(final Xnav xml, final String fqn, final int pos) {
         return new Defect.Default(
             this.name(),
             Severity.ERROR,
-            new ObjectName(new XMLDocument(xml.node())).get(),
+            new OnDefault(new XMLDocument(xml.node())).get(),
             Integer.parseInt(
                 xml.path(
                     String.format("//o[@name='%s' and o[@name='λ']]", LtAtomIsNotUnique.oname(fqn))
@@ -145,7 +145,7 @@ private Defect sharedDefect(final Xnav xml, final Xnav original, final String fq
         return new Defect.Default(
             this.name(),
             Severity.ERROR,
-            new ObjectName(new XMLDocument(xml.node())).get(),
+            new OnDefault(new XMLDocument(xml.node())).get(),
             Integer.parseInt(
                 xml.path(
                     String.format("//o[@name='%s' and o[@name='λ']]", LtAtomIsNotUnique.oname(fqn))
@@ -156,7 +156,7 @@ private Defect sharedDefect(final Xnav xml, final Xnav original, final String fq
             String.format(
                 "Atom with FQN \"%s\" is duplicated, original was found in \"%s\"",
                 fqn,
-                new ObjectName(new XMLDocument(original.node())).get()
+                new OnDefault(new XMLDocument(original.node())).get()
             )
         );
     }

src/main/java/org/eolang/lints/LtByXsl.java

@@ -20,7 +20,7 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.IoCheckedText;
 import org.cactoos.text.TextOf;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Lint by XSL.
@@ -103,7 +103,7 @@ public Collection<Defect> defects(final XML xmir) {
                     new Defect.Default(
                         this.rule,
                         Severity.parsed(sever.get()),
-                        new ObjectName(xmir).get(),
+                        new OnDefault(xmir).get(),
                         this.lineno(xml),
                         xml.text().get(),
                         LtByXsl.experimental(xml)

src/main/java/org/eolang/lints/LtInconsistentArgs.java

@@ -21,7 +21,7 @@
 import org.cactoos.map.MapOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 import org.w3c.dom.Node;
 
 /**
@@ -64,7 +64,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) throws IOException
                                 .filter(search.get(xpath))
                                 .forEach(
                                     o -> {
-                                        final String current = new ObjectName(
+                                        final String current = new OnDefault(
                                             new XMLDocument(src.node())
                                         ).get();
                                         final int cline = Integer.parseInt(
@@ -128,7 +128,7 @@ private static Map<Xnav, Map<String, List<Integer>>> scanUsages(final Map<String
                             if (LtInconsistentArgs.voidAttribute(base, o)) {
                                 ref = LtInconsistentArgs.voidFqn(base, o);
                             } else {
-                                ref = String.format("%s.%s", new ObjectName(source).get(), base);
+                                ref = String.format("%s.%s", new OnDefault(source).get(), base);
                             }
                         } else {
                             ref = base;
@@ -204,7 +204,7 @@ private static Map<String, List<Integer>> clashes(
                     .filter(search.get(xpath))
                     .forEach(
                         o -> {
-                            final String program = new ObjectName(
+                            final String program = new OnDefault(
                                 new XMLDocument(src.node())
                             ).get();
                             final int line = Integer.parseInt(
@@ -336,10 +336,10 @@ private static Map<String, Predicate<Xnav>> fqnToSearch(final String fqn, final
      * @return Relativized object base
      */
     private static String relativizeToTopObject(final String base, final Xnav source) {
-        final String top = new ObjectName(source).get();
+        final String top = new OnDefault(source).get();
         final String result;
         if (base.startsWith(String.format("%s.$.", top))) {
-            result = base.replace(String.format("%s.", new ObjectName(source).get()), "");
+            result = base.replace(String.format("%s.", new OnDefault(source).get()), "");
         } else {
             result = base;
         }

src/main/java/org/eolang/lints/LtIncorrectAlias.java

@@ -17,7 +17,7 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Checks that `+alias` is pointing to existing `.xmir` files.
@@ -49,7 +49,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
                             new Defect.Default(
                                 "incorrect-alias",
                                 Severity.CRITICAL,
-                                new ObjectName(xmir).get(),
+                                new OnDefault(xmir).get(),
                                 Integer.parseInt(
                                     alias.attribute("line").text().orElse("0")
                                 ),

src/main/java/org/eolang/lints/LtIncorrectUnlint.java

@@ -13,7 +13,7 @@
 import org.cactoos.set.SetOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Lint that all unlint metas point to existing lint.
@@ -55,7 +55,7 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
                     new Defect.Default(
                         this.name(),
                         Severity.ERROR,
-                        new ObjectName(xmir).get(),
+                        new OnDefault(xmir).get(),
                         Integer.parseInt(u.attribute("line").text().orElse("0")),
                         String.format(
                             "Suppressing \"%s\" does not make sense, because there is no lint with that name",

src/main/java/org/eolang/lints/LtObjectIsNotUnique.java

@@ -18,7 +18,7 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Object is not unique.
@@ -37,7 +37,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
         final Collection<Defect> defects = new ArrayList<>(0);
         for (final XML xmir : pkg.values()) {
             final Xnav xml = new Xnav(xmir.inner());
-            final String src = new ObjectName(xmir).get();
+            final String src = new OnDefault(xmir).get();
             for (final XML oth : pkg.values()) {
                 final Xnav second = new Xnav(oth.inner());
                 if (Objects.equals(oth, xmir)) {
@@ -53,7 +53,7 @@ public Collection<Defect> defects(final Map<String, XML> pkg) {
                             new Defect.Default(
                                 this.name(),
                                 Severity.ERROR,
-                                new ObjectName(oth).get(),
+                                new OnDefault(oth).get(),
                                 Integer.parseInt(object.getValue()),
                                 String.format(
                                     "The object name \"%s\" is not unique, original object was found in \"%s\"",

src/main/java/org/eolang/lints/LtReservedName.java

@@ -13,7 +13,7 @@
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Lint for reserved names.
@@ -62,7 +62,7 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
                             new Defect.Default(
                                 this.name(),
                                 Severity.WARNING,
-                                new ObjectName(xmir).get(),
+                                new OnDefault(xmir).get(),
                                 Integer.parseInt(object.attribute("line").text().orElse("0")),
                                 String.format(
                                     "Object name \"%s\" is already reserved by object in the \"%s\"",

src/main/java/org/eolang/lints/LtTestNotVerb.java

@@ -22,7 +22,7 @@
 import org.cactoos.list.ListOf;
 import org.cactoos.text.TextOf;
 import org.cactoos.text.UncheckedText;
-import org.eolang.parser.ObjectName;
+import org.eolang.parser.OnDefault;
 
 /**
  * Lint that checks test object name is a verb in singular.
@@ -71,10 +71,10 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
         final Collection<Defect> defects = new ArrayList<>(0);
         final Xnav xml = new Xnav(xmir.inner());
         final List<Xnav> objects = xml
-            .path("/object[metas/meta[head='tests']]/o[@name]")
+            .path("/object//o[@name and starts-with(@name, '+')]")
             .collect(Collectors.toList());
         for (final Xnav object : objects) {
-            final String name = object.attribute("name").text().get();
+            final String name = object.attribute("name").text().get().replace("+", "");
             final String first = new ListOf<>(
                 this.model.tag(
                     Stream
@@ -91,7 +91,7 @@ public Collection<Defect> defects(final XML xmir) throws IOException {
                     new Defect.Default(
                         "unit-test-is-not-verb",
                         Severity.WARNING,
-                        new ObjectName(xmir).get(),
+                        new OnDefault(xmir).get(),
                         Integer.parseInt(object.attribute("line").text().orElse("0")),
                         String.format(
                             "Test object name: \"%s\" doesn't start with verb in singular form",