This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia.git
The following commit(s) were added to refs/heads/master by this push:
new e8c37c00 Fix checkstyle issues
e8c37c00 is described below
commit e8c37c00dca7b959c204fdb367550106b1083df5
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Sun Apr 20 22:36:07 2025 +0200
Fix checkstyle issues
---
.../apache/maven/doxia/macro/EchoMacroTest.java | 3 ++-
.../maven/doxia/parser/AbstractParserTest.java | 2 +-
.../maven/doxia/parser/Xhtml5BaseParserTest.java | 3 ++-
.../maven/doxia/sink/impl/AbstractXmlSinkTest.java | 4 +++-
.../doxia/sink/impl/SinkEventAttributeSetTest.java | 8 ++++++-
.../maven/doxia/sink/impl/SinkEventElement.java | 12 +++++++---
.../maven/doxia/sink/impl/TestAbstractSink.java | 26 +++++++++++-----------
.../maven/doxia/sink/impl/Xhtml5BaseSinkTest.java | 5 +++--
.../maven/doxia/util/ByLineReaderSourceTest.java | 4 +++-
.../apache/maven/doxia/util/DoxiaUtilsTest.java | 7 +++++-
.../maven/doxia/module/apt/AptUtilsTest.java | 3 ++-
.../maven/doxia/module/xdoc/XdocParserTest.java | 6 ++---
12 files changed, 54 insertions(+), 29 deletions(-)
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
index 7c89212b..a9a50557 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/macro/EchoMacroTest.java
@@ -28,7 +28,8 @@ import org.apache.maven.doxia.sink.impl.SinkEventElement;
import org.apache.maven.doxia.sink.impl.SinkEventTestingSink;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Test echo macro.
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
index 6533aa2b..d0ab394d 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/AbstractParserTest.java
@@ -116,7 +116,7 @@ public abstract class AbstractParserTest extends
AbstractModuleTest {
private final int priority;
- public TestSinkWrapperFactory(int priority) {
+ TestSinkWrapperFactory(int priority) {
super();
this.priority = priority;
}
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
index 084b03f6..6d33ea4d 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/parser/Xhtml5BaseParserTest.java
@@ -26,7 +26,8 @@ import org.apache.maven.doxia.sink.impl.SinkEventTestingSink;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
* Test for Xhtml5BaseParser.
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractXmlSinkTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractXmlSinkTest.java
index 8c19e842..e0738c97 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractXmlSinkTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/AbstractXmlSinkTest.java
@@ -24,7 +24,9 @@ import org.apache.maven.doxia.markup.Markup;
import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
*
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSetTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSetTest.java
index a3a47245..def6eb49 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSetTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventAttributeSetTest.java
@@ -26,7 +26,13 @@ import org.apache.maven.doxia.sink.SinkEventAttributes;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test SinkEventAttributeSet.
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
index 97e12bf1..145b0fba 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/SinkEventElement.java
@@ -100,9 +100,15 @@ public class SinkEventElement {
@Override
public boolean equals(Object obj) {
- if (this == obj) return true;
- if (obj == null) return false;
- if (getClass() != obj.getClass()) return false;
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
SinkEventElement other = (SinkEventElement) obj;
return Arrays.deepEquals(args, other.args) &&
Objects.equals(methodName, other.methodName);
}
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TestAbstractSink.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TestAbstractSink.java
index aefb329b..9090748d 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TestAbstractSink.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/TestAbstractSink.java
@@ -25,21 +25,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class TestAbstractSink {
@Test
public void testUnifiedEOL() {
- String EOL = AbstractSink.EOL;
- String EOL_MACOS9 = "\r";
- String EOL_UNIX = "\n";
- String EOL_WIN = "\r\n";
+ String eol = AbstractSink.EOL;
+ String eolMacOS = "\r";
+ String eolUnix = "\n";
+ String eolWin = "\r\n";
- assertEquals("Hello " + EOL + " world", AbstractSink.unifyEOLs("Hello
" + EOL_MACOS9 + " world"));
- assertEquals("Hello " + EOL + " world", AbstractSink.unifyEOLs("Hello
" + EOL_UNIX + " world"));
- assertEquals("Hello " + EOL + " world", AbstractSink.unifyEOLs("Hello
" + EOL_WIN + " world"));
+ assertEquals("Hello " + eol + " world", AbstractSink.unifyEOLs("Hello
" + eolMacOS + " world"));
+ assertEquals("Hello " + eol + " world", AbstractSink.unifyEOLs("Hello
" + eolUnix + " world"));
+ assertEquals("Hello " + eol + " world", AbstractSink.unifyEOLs("Hello
" + eolWin + " world"));
- assertEquals("Hello world" + EOL, AbstractSink.unifyEOLs("Hello world"
+ EOL_MACOS9));
- assertEquals("Hello world" + EOL, AbstractSink.unifyEOLs("Hello world"
+ EOL_UNIX));
- assertEquals("Hello world" + EOL, AbstractSink.unifyEOLs("Hello world"
+ EOL_WIN));
+ assertEquals("Hello world" + eol, AbstractSink.unifyEOLs("Hello world"
+ eolMacOS));
+ assertEquals("Hello world" + eol, AbstractSink.unifyEOLs("Hello world"
+ eolUnix));
+ assertEquals("Hello world" + eol, AbstractSink.unifyEOLs("Hello world"
+ eolWin));
- assertEquals(EOL + "Hello world", AbstractSink.unifyEOLs(EOL_MACOS9 +
"Hello world"));
- assertEquals(EOL + "Hello world", AbstractSink.unifyEOLs(EOL_UNIX +
"Hello world"));
- assertEquals(EOL + "Hello world", AbstractSink.unifyEOLs(EOL_WIN +
"Hello world"));
+ assertEquals(eol + "Hello world", AbstractSink.unifyEOLs(eolMacOS +
"Hello world"));
+ assertEquals(eol + "Hello world", AbstractSink.unifyEOLs(eolUnix +
"Hello world"));
+ assertEquals(eol + "Hello world", AbstractSink.unifyEOLs(eolWin +
"Hello world"));
}
}
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
index 8f9930f5..57363282 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/sink/impl/Xhtml5BaseSinkTest.java
@@ -30,7 +30,8 @@ import
org.apache.maven.doxia.sink.impl.SinkEventAttributeSet.Semantics;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test for Xhtml5BaseSink.
@@ -40,7 +41,7 @@ public class Xhtml5BaseSinkTest {
private final SinkEventAttributes attributes = SinkEventAttributeSet.BOLD;
private Writer writer;
- String EOL = System.lineSeparator();
+ private static final String EOL = System.lineSeparator();
@BeforeEach
public void setUp() {
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
index 4760763d..598d89d0 100644
---
a/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
+++
b/doxia-core/src/test/java/org/apache/maven/doxia/util/ByLineReaderSourceTest.java
@@ -23,7 +23,9 @@ import java.io.StringReader;
import org.apache.maven.doxia.parser.ParseException;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Unit test for {@link org.apache.maven.doxia.util.ByLineReaderSource}.
diff --git
a/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
b/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
index 27ea2f3e..652dc4f1 100644
--- a/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
+++ b/doxia-core/src/test/java/org/apache/maven/doxia/util/DoxiaUtilsTest.java
@@ -26,7 +26,12 @@ import java.util.GregorianCalendar;
import org.codehaus.plexus.testing.PlexusTest;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* Test case for <code>DoxiaUtils</code>.
diff --git
a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
index 8474b592..a05dd5df 100644
---
a/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
+++
b/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptUtilsTest.java
@@ -20,7 +20,8 @@ package org.apache.maven.doxia.module.apt;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Test AptUtils.
diff --git
a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
index f8bff32a..7acad169 100644
---
a/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
+++
b/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocParserTest.java
@@ -425,9 +425,9 @@ public class XdocParserTest extends AbstractParserTest {
SinkEventElement cdataElm = it.next();
assertEquals("unknown", cdataElm.getName());
assertEquals("CDATA", cdataElm.getArgs()[0]);
- SinkEventElement styleElm_ = it.next();
- assertEquals("unknown", styleElm_.getName());
- assertEquals("style", styleElm_.getArgs()[0]);
+ SinkEventElement styleElm2 = it.next();
+ assertEquals("unknown", styleElm2.getName());
+ assertEquals("style", styleElm2.getArgs()[0]);
assertFalse(it.hasNext());
}
