From 046a401b091b4f11aacb023118e438cdbb388f51 Mon Sep 17 00:00:00 2001
From: Stephan Schroevers <stephan.schroevers@teampicnic.com>
Date: Sat, 28 Oct 2023 22:32:19 +0200
Subject: [PATCH] Revert "Doh"

This reverts commit 55d53138649f27335f17c1128a8bcd7ddf1825da.
---
 .../checkstyle-10.12.4-expected-changes.patch | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/integration-tests/checkstyle-10.12.4-expected-changes.patch b/integration-tests/checkstyle-10.12.4-expected-changes.patch
index 8f63711bec9..4ef2b9af3f0 100644
--- a/integration-tests/checkstyle-10.12.4-expected-changes.patch
+++ b/integration-tests/checkstyle-10.12.4-expected-changes.patch
@@ -50200,7 +50200,7 @@
  
    private static final String TEST_FILE_NAME = "InputMainFrame.java";
    private static final String NON_EXISTENT_FILE_NAME = "non-existent.file";
-@@ -59,12 +59,12 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -59,17 +59,17 @@ public class MainFrameTest extends AbstractGuiTestSupport {
    }
  
    @BeforeEach
@@ -50212,10 +50212,7 @@
    @AfterEach
 -  public void tearDown() {
 +  void tearDown() {
-     // Avoid an NPE when testing with `-Djava.awt.headless=true`.
-     // XXX: File a PR for this upstream.
-     if (mainFrame != null) {
-@@ -73,7 +73,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+     Arrays.stream(mainFrame.getOwnedWindows()).forEach(Window::dispose);
    }
  
    @Test
@@ -50224,7 +50221,7 @@
      mainFrame.openFile(new File(getPath(TEST_FILE_NAME)));
      assertWithMessage("Unexpected frame title")
          .that(mainFrame.getTitle())
-@@ -87,7 +87,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -83,7 +83,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
     * @throws IOException if I/O exception occurs while forming the path.
     */
    @Test
@@ -50233,7 +50230,7 @@
      final File file = new File(getPath(NON_EXISTENT_FILE_NAME));
      try (MockedStatic<JOptionPane> optionPane = mockStatic(JOptionPane.class)) {
        mainFrame.openFile(file);
-@@ -103,7 +103,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -99,7 +99,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
    }
  
    @Test
@@ -50242,7 +50239,7 @@
      final JComboBox<MainFrameModel.ParseMode> modesCombobox =
          findComponentByName(mainFrame, "modesCombobox");
      modesCombobox.setSelectedIndex(MainFrameModel.ParseMode.JAVA_WITH_COMMENTS.ordinal());
-@@ -121,7 +121,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -117,7 +117,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
     * @throws IOException if I/O exception occurs while forming the path.
     */
    @Test
@@ -50251,7 +50248,7 @@
      final JButton openFileButton = findComponentByName(mainFrame, "openFileButton");
      final File testFile = new File(getPath(TEST_FILE_NAME));
      try (MockedConstruction<JFileChooser> mocked =
-@@ -143,7 +143,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -139,7 +139,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
     * JFileChooser} is mocked to obtain an instance of {@code JavaFileFilter} class.
     */
    @Test
@@ -50260,7 +50257,7 @@
      final JButton openFileButton = findComponentByName(mainFrame, "openFileButton");
      try (MockedConstruction<JFileChooser> mocked =
          mockConstruction(
-@@ -166,7 +166,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -162,7 +162,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
    }
  
    @Test
@@ -50269,7 +50266,7 @@
      final JButton expandButton = findComponentByName(mainFrame, "expandButton");
      final JTextArea xpathTextArea = findComponentByName(mainFrame, "xpathTextArea");
      expandButton.doClick();
-@@ -180,7 +180,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
+@@ -176,7 +176,7 @@ public class MainFrameTest extends AbstractGuiTestSupport {
    }
  
    @Test