Make Checkstyle integration test macOS-compatible #867

rickie · 2023-10-30T12:55:39Z

No description provided.

rickie · 2023-10-30T12:55:55Z

/integration-test

github-actions · 2023-10-30T12:57:24Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2023-10-30T13:06:15Z

/integration-test

rickie · 2023-10-30T13:14:23Z

/integration-test

github-actions · 2023-10-30T13:16:04Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2023-10-30T13:20:08Z

/integration-test

github-actions · 2023-10-30T13:21:34Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2023-10-30T14:02:05Z

/integration-test

rickie · 2023-10-30T14:02:55Z

/integration-test

github-actions · 2023-10-31T12:34:15Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

github-actions · 2023-11-10T07:23:37Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

github-actions · 2023-11-10T17:20:25Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2023-11-10T17:21:17Z

Either @benhalasi or @mohamedsamehsalah can you try to run this on your Mac and let us know if it works?

github-actions · 2023-11-10T17:22:43Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2023-11-10T17:29:18Z

Ah, I mean the ./integration-tests/checkstyle-10.12.4.sh from the root folder. 😄

benhalasi · 2023-11-11T08:28:11Z

I've run it:

> ./integration-tests/checkstyle-10.12.4.sh                                       
usage: paste [-s] [-d delimiters] file ...
xargs: ggrep: terminated with signal 13; aborting

rickie · 2023-11-13T07:26:38Z

Thanks @benhalasi , I added something I didn't move over. Could you try again?

github-actions · 2023-11-13T07:27:23Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

github-actions · 2023-11-13T07:27:44Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

benhalasi · 2023-11-13T08:42:24Z

Yep, it runs now, but it says there are unexpected changes:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.11.0:compile (error-prone-compile) on project checkstyle: Fatal error compiling: DeleteEmptyMethod is not a valid checker name -> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
Inspecting changes...
--- /Users/benhalasi/PicnicSupermarket/error-prone-support/integration-tests/checkstyle-10.12.4-expected-changes.patch  2023-11-11 08:39:51
+++ /var/folders/2b/q73x_kyx6s10rrdnjwtv2zb80000gn/T/tmp.C4fad86ddk/checkstyle-10.12.4-changes.patch    2023-11-13 09:33:21
@@ -51469,17 +51469,17 @@
 -import java.util.stream.Collectors;
  import javax.xml.parsers.ParserConfigurationException;
  import org.junit.jupiter.api.BeforeEach;
- import org.junit.jupiter.api.Test;
-@@ -71,7 +70,7 @@ import org.w3c.dom.NamedNodeMap;
- import org.w3c.dom.Node;
+ import org.junit.jupiter.api.Disabled;
+@@ -73,7 +72,7 @@ import org.w3c.dom.Node;
  import org.w3c.dom.NodeList;
  
+ @Disabled("Reason: https://github.com/junit-team/junit5/issues/3536.")
 -public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
 +final class XdocsJavaDocsTest extends AbstractModuleTestSupport {
    private static final Map<String, Class<?>> FULLY_QUALIFIED_CLASS_NAMES =
        ImmutableMap.<String, Class<?>>builder()
            .put("int", int.class)
-@@ -103,16 +102,15 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
+@@ -105,16 +104,15 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
            .build();
  
    private static final Set<String> NON_BASE_TOKEN_PROPERTIES =
@@ -51505,7 +51505,7 @@
  
    private static final List<List<Node>> CHECK_PROPERTIES = new ArrayList<>();
    private static final Map<String, String> CHECK_PROPERTY_DOC = new HashMap<>();
-@@ -130,7 +128,7 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
+@@ -132,7 +130,7 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
    }
  
    @BeforeEach
@@ -51514,7 +51514,7 @@
      final DefaultConfiguration checkConfig =
          new DefaultConfiguration(JavaDocCapture.class.getName());
      checker = createChecker(checkConfig);
-@@ -144,7 +142,7 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
+@@ -146,7 +144,7 @@ public class XdocsJavaDocsTest extends AbstractModuleTestSupport {
     *     method
     */
    @Test
@@ -52239,9 +52239,9 @@
  import java.util.stream.Stream;
  import org.itsallcode.io.Capturable;
  import org.itsallcode.junit.sysextensions.SystemOutGuard;
-@@ -40,10 +41,10 @@ import org.junit.jupiter.api.Test;
- import org.junit.jupiter.api.extension.ExtendWith;
+@@ -42,10 +43,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
  
+ @Disabled("Reason: https://github.com/junit-team/junit5/issues/3536.")
  @ExtendWith(SystemOutGuard.class)
 -public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
 +final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
@@ -52252,7 +52252,7 @@
            "Checker",
            "TreeWalker",
            "JavadocMetadataScraper",
-@@ -67,7 +68,7 @@ public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
+@@ -69,7 +70,7 @@ public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
     *     System.out} for error messages
     */
    @Test
@@ -52261,7 +52261,7 @@
        throws Exception {
      systemOut.captureMuted();
  
-@@ -117,12 +118,12 @@ public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
+@@ -119,12 +120,12 @@ public final class MetadataGeneratorUtilTest extends AbstractModuleTestSupport {
                .filter(path -> !path.toString().endsWith(".properties"))
                .map(MetadataGeneratorUtilTest::getMetaFileName)
                .sorted()
There are unexpected changes.

rickie · 2023-11-13T08:55:52Z

Ah those were the changes that I introduced, they shouldn't be there. Let me fix that.

Thanks for checking @benhalasi 🚀 !

Stephan202

Rebased and added a commit; further review TBD.

Stephan202 · 2023-11-18T23:22:02Z

integration-tests/checkstyle-10.12.4-init.patch

+diff --git a/pom.xml b/pom.xml
+index ca1f3d5..33ad480 100644


Here and below: let's omit this meta-data.

rickie · 2024-01-31T12:03:53Z

Rebased and resolved conflict.

github-actions · 2024-01-31T12:05:40Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

rickie · 2024-01-31T12:47:47Z

/integration-test

rickie · 2024-02-01T07:04:23Z

@benhalasi or @mohamedsamehsalah can one of you take a look and try to run the ./integration-tests/checkstyle.sh? 😄

github-actions · 2024-02-01T07:04:57Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

benhalasi

🚀

run on MacOS, openjdk 17.0.3 2022-04-19

mvnd -DskipTests -Dverification.skip clean install 
./integration-tests/checkstyle.sh
git status

didn't produce any diff!

Stephan202

I rebased the branch and added two commits.

Suggested commit message:

Make Checkstyle integration test macOS-compatible (#867)

NB: Initially I observed the following error:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.12.1:compile (error-prone-compile) on project checkstyle: Fatal error compiling: DeleteEmptyMethod is not a valid checker name -> [Help 1]

This happened because the workshop/target directory of the workshop Git branch still existed. This is a bug in the script we may at some point want to fix. (But it's not related to the changes in this PR.)

Stephan202 · 2024-02-03T18:16:30Z

integration-tests/checkstyle.sh

-    | sed -r 's,(.*),-Xep:\1:WARN,' \
-    | grep -v ErrorProneRuntimeClasspath \
-    | paste -s -d ' '
+    | xargs -0 ${grep_command} -hoP '[^.]+$' \


Suggested change

| xargs -0 ${grep_command} -hoP '[^.]+$' \

| xargs -0 "${grep_command}" -hoP '[^.]+$' \

Stephan202 · 2024-02-03T18:18:39Z

integration-tests/checkstyle.sh

+    echo "Execute the following command to see the changes:"
+    echo "$ diff -u ${expected_changes} ${actual_changes}"


Here and below: the script already prints this output as part of the if-statement; we should call that out.

But also: actual_changes refers to a file in a temporary directory that is cleaned up when the script exits. I'll propose something.

Stephan202 · 2024-02-03T20:34:49Z

/integration-test

github-actions · 2024-02-03T20:36:12Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

Stephan202 · 2024-02-04T10:22:12Z

/integration-test

This build was skipped. Not sure why 🤔.

rickie · 2024-02-09T15:11:12Z

/integration-test

rickie · 2024-02-09T17:15:29Z

It ran successfully when I posted a comment 🤔. So I'd say let's merge, right? Rebased.

rickie · 2024-02-09T17:15:44Z

See: https://github.com/PicnicSupermarket/error-prone-support/actions/runs/7845898450?pr=867+%28comment%29.

github-actions · 2024-02-09T17:16:53Z

Looks good. No mutations were possible for these changes.
Mutation testing report by Pitest. Review any surviving mutants by inspecting the line comments under Files changed.

sonarqubecloud · 2024-02-09T17:17:16Z

Quality Gate passed

Issues
0 New issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Stephan202 · 2024-02-10T09:40:32Z

Sure, then let's merge 👍. (I would also have expected it to show up in the check overview, but alas.)

rickie force-pushed the rossendrijver/mac_compatibility branch from 5975326 to 0c8c90d Compare October 31, 2023 12:32

rickie force-pushed the rossendrijver/mac_compatibility branch from 0c8c90d to 380fcb4 Compare November 10, 2023 07:22

rickie marked this pull request as ready for review November 10, 2023 17:20

rickie requested a review from Stephan202 November 10, 2023 17:21

rickie added the improvement label Nov 10, 2023

rickie force-pushed the rossendrijver/mac_compatibility branch from a95e69b to 1ccf32d Compare November 13, 2023 07:26

rickie requested a review from benhalasi November 13, 2023 07:26

Stephan202 force-pushed the rossendrijver/mac_compatibility branch from 1ccf32d to 0e9b183 Compare November 18, 2023 23:22

Stephan202 reviewed Nov 18, 2023

View reviewed changes

rickie force-pushed the sschroevers/update-integration-test branch from 6b3d076 to 4638392 Compare January 30, 2024 14:05

Base automatically changed from sschroevers/update-integration-test to master January 30, 2024 14:18

rickie force-pushed the rossendrijver/mac_compatibility branch from 2c1f289 to 8cdc569 Compare January 31, 2024 12:03

Stephan202 changed the title ~~Make integration-tests setup MacOS compatible~~ Make integration-tests setup macOS compatible Jan 31, 2024

benhalasi approved these changes Feb 1, 2024

View reviewed changes

Stephan202 force-pushed the rossendrijver/mac_compatibility branch from fa13fd4 to 0d9ef72 Compare February 3, 2024 20:34

Stephan202 approved these changes Feb 3, 2024

View reviewed changes

Stephan202 changed the title ~~Make integration-tests setup macOS compatible~~ Make Checkstyle integration test macOS-compatible Feb 3, 2024

rickie and others added 5 commits February 9, 2024 18:15

Make integration-tests setup Mac compatible

e54069e

Fixes!

b1e3af0

Print a command instead of writing to a file

25d291a

Suggestions

2c289fa

Suggestions (2)

c178c0b

rickie force-pushed the rossendrijver/mac_compatibility branch from 0d9ef72 to c178c0b Compare February 9, 2024 17:15

Stephan202 merged commit 03ba14b into master Feb 10, 2024
16 checks passed

Stephan202 deleted the rossendrijver/mac_compatibility branch February 10, 2024 09:40

	\| xargs -0 ${grep_command} -hoP '[^.]+$' \
	\| xargs -0 "${grep_command}" -hoP '[^.]+$' \

		echo "Execute the following command to see the changes:"
		echo "$ diff -u ${expected_changes} ${actual_changes}"

Make Checkstyle integration test macOS-compatible #867

Make Checkstyle integration test macOS-compatible #867

Conversation

rickie commented Oct 30, 2023

rickie commented Oct 30, 2023

github-actions bot commented Oct 30, 2023

rickie commented Oct 30, 2023

rickie commented Oct 30, 2023

github-actions bot commented Oct 30, 2023

rickie commented Oct 30, 2023

github-actions bot commented Oct 30, 2023

rickie commented Oct 30, 2023

rickie commented Oct 30, 2023

github-actions bot commented Oct 31, 2023

github-actions bot commented Nov 10, 2023

github-actions bot commented Nov 10, 2023

rickie commented Nov 10, 2023

github-actions bot commented Nov 10, 2023

rickie commented Nov 10, 2023

benhalasi commented Nov 11, 2023

rickie commented Nov 13, 2023

github-actions bot commented Nov 13, 2023

github-actions bot commented Nov 13, 2023

benhalasi commented Nov 13, 2023

rickie commented Nov 13, 2023

Stephan202 left a comment

Choose a reason for hiding this comment

Stephan202 Nov 18, 2023

Choose a reason for hiding this comment

rickie commented Jan 31, 2024

github-actions bot commented Jan 31, 2024

rickie commented Jan 31, 2024

rickie commented Feb 1, 2024

github-actions bot commented Feb 1, 2024

benhalasi left a comment

Choose a reason for hiding this comment

Stephan202 left a comment

Choose a reason for hiding this comment

Stephan202 Feb 3, 2024

Choose a reason for hiding this comment

Stephan202 Feb 3, 2024

Choose a reason for hiding this comment

Stephan202 commented Feb 3, 2024

github-actions bot commented Feb 3, 2024

Stephan202 commented Feb 4, 2024

rickie commented Feb 9, 2024

rickie commented Feb 9, 2024

rickie commented Feb 9, 2024

github-actions bot commented Feb 9, 2024

sonarqubecloud bot commented Feb 9, 2024

Quality Gate passed

Stephan202 commented Feb 10, 2024