Skip to content

Commit 25710ce

Browse files
committed
fix: fix failed tests screenshot comment
Signed-off-by: Stephane Bouchet <[email protected]>
1 parent f245b04 commit 25710ce

File tree

19 files changed

+52
-38
lines changed

19 files changed

+52
-38
lines changed

src/main/java/com/redhat/devtools/intellij/commonuitest/utils/testextension/ScreenshotAfterTestFailExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void afterTestExecution(ExtensionContext extensionContext) {
5555
String testClass = extensionContext.getRequiredTestClass().getName();
5656
String testMethod = extensionContext.getRequiredTestMethod().getName();
5757
step("Take a screenshot after a test has failed",
58-
() -> ScreenshotUtils.takeScreenshot(remoteRobot, testClass+"_"+testMethod)
58+
() -> ScreenshotUtils.takeScreenshot(remoteRobot, testClass + "_" + testMethod)
5959
);
6060
step("Return to the 'Welcome Frame' dialog",
6161
() -> cleanAfterTestFail(remoteRobot)

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/LibraryTestBase.java renamed to src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/AbstractLibraryBaseTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
3030
*/
3131
@ExtendWith(ScreenshotAfterTestFailExtension.class)
32-
public class LibraryTestBase {
33-
protected static final Logger LOGGER = Logger.getLogger(LibraryTestBase.class.getName());
32+
public abstract class AbstractLibraryBaseTest {
33+
protected static final Logger LOGGER = Logger.getLogger(AbstractLibraryBaseTest.class.getName());
3434
private static final IntelliJVersion communityIdeaVersion = IntelliJVersion.getFromStringVersion(System.getProperty("communityIdeaVersion"));
3535
protected static RemoteRobot remoteRobot;
3636
protected static int ideaVersionInt;
@@ -39,7 +39,7 @@ public class LibraryTestBase {
3939

4040
@BeforeAll
4141
static void startIntelliJ() {
42-
if (!intelliJHasStarted) {
42+
if (!intelliJHasStarted) {
4343
ideaVersionInt = communityIdeaVersion.toInt();
4444
remoteRobot = UITestRunner.runIde(communityIdeaVersion, TEST_RUNNER_PORT);
4545

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/FlatWelcomeFrameTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.intellij.remoterobot.fixtures.JListFixture;
1414
import com.intellij.remoterobot.fixtures.JTreeFixture;
1515
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
16-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
16+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1717
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
1919
import com.redhat.devtools.intellij.commonuitest.utils.constants.ProjectLocation;
@@ -35,7 +35,7 @@
3535
*
3636
3737
*/
38-
class FlatWelcomeFrameTest extends LibraryTestBase {
38+
class FlatWelcomeFrameTest extends AbstractLibraryBaseTest {
3939
private static final String PROJECT_NAME = "welcome_frame_java_project";
4040
private FlatWelcomeFrame flatWelcomeFrame;
4141

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/CodeWithMeDialogTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
******************************************************************************/
1111
package com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information;
1212

13-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
13+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1414
import com.redhat.devtools.intellij.commonuitest.UITestRunner;
1515
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.information.CodeWithMeDialog;
1616
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
@@ -34,7 +34,7 @@
3434
*
3535
3636
*/
37-
class CodeWithMeDialogTest extends LibraryTestBase {
37+
class CodeWithMeDialogTest extends AbstractLibraryBaseTest {
3838
private static final String PROJECT_NAME = "code_with_me_java_project";
3939
private static final boolean IDEA_VERSION_WITH_CWM_DIALOG_OPENED = ideaVersionInt >= 20212;
4040

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/ProjectStructureDialogTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import com.intellij.remoterobot.fixtures.CommonContainerFixture;
1414
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
15-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
15+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1616
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.information.ProjectStructureDialog;
1717
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
@@ -31,7 +31,7 @@
3131
*
3232
3333
*/
34-
class ProjectStructureDialogTest extends LibraryTestBase {
34+
class ProjectStructureDialogTest extends AbstractLibraryBaseTest {
3535
private static final String PROJECT_NAME = "tip_dialog_java_project";
3636

3737
@BeforeAll

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/TipDialogTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.intellij.remoterobot.fixtures.JListFixture;
1414
import com.intellij.remoterobot.fixtures.JTreeFixture;
1515
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
16-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
16+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1717
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.information.TipDialog;
1919
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
@@ -33,7 +33,7 @@
3333
*
3434
3535
*/
36-
class TipDialogTest extends LibraryTestBase {
36+
class TipDialogTest extends AbstractLibraryBaseTest {
3737
private TipDialog tipDialog;
3838

3939
@AfterAll

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/project_manipulation/NewProjectDialogTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import com.intellij.remoterobot.fixtures.*;
1414
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
15-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
15+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1616
import com.redhat.devtools.intellij.commonuitest.UITestRunner;
1717
import com.redhat.devtools.intellij.commonuitest.exceptions.UITestException;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
@@ -50,7 +50,7 @@
5050
*
5151
5252
*/
53-
class NewProjectDialogTest extends LibraryTestBase {
53+
class NewProjectDialogTest extends AbstractLibraryBaseTest {
5454
private static final String PLAIN_JAVA_PROJECT_NAME = "plain_java_project_name_test";
5555
private static final String MORE_SETTINGS_SHOULD_BE_VISIBLE = "The 'More Settings' should be visible.";
5656
private static final String MORE_SETTINGS_SHOULD_BE_HIDDEN = "The 'More Settings' should be hidden.";

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/settings/SettingsDialogTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import com.intellij.remoterobot.fixtures.JCheckboxFixture;
1515
import com.intellij.remoterobot.fixtures.JTreeFixture;
1616
import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
17-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
17+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1818
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
1919
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.SettingsDialog;
2020
import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
@@ -37,7 +37,7 @@
3737
*
3838
3939
*/
40-
class SettingsDialogTest extends LibraryTestBase {
40+
class SettingsDialogTest extends AbstractLibraryBaseTest {
4141
private static FlatWelcomeFrame flatWelcomeFrame;
4242
private SettingsDialog settingsDialog = null;
4343
private static final String APPEARANCE_AND_BEHAVIOR = "Appearance & Behavior";

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/settings/pages/NotificationsPageTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
******************************************************************************/
1111
package com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.pages;
1212

13-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
13+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1414
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
1515
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.SettingsDialog;
1616
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.pages.NotificationsPage;
@@ -30,7 +30,7 @@
3030
*
3131
3232
*/
33-
class NotificationsPageTest extends LibraryTestBase {
33+
class NotificationsPageTest extends AbstractLibraryBaseTest {
3434
private static SettingsDialog settingsDialog;
3535
private static NotificationsPage notificationsPage;
3636
private boolean balloonNotificationsCheckBox;

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/idestatusbar/IdeStatusBarTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
package com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.idestatusbar;
1212

1313
import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
14-
import com.redhat.devtools.intellij.commonuitest.LibraryTestBase;
14+
import com.redhat.devtools.intellij.commonuitest.AbstractLibraryBaseTest;
1515
import com.redhat.devtools.intellij.commonuitest.UITestRunner;
1616
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
1717
import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.pages.MavenGradleNewProjectFinalPage;
@@ -35,7 +35,7 @@
3535
*
3636
3737
*/
38-
class IdeStatusBarTest extends LibraryTestBase {
38+
class IdeStatusBarTest extends AbstractLibraryBaseTest {
3939
private static final String PROJECT_NAME = "ide_status_bar_java_project";
4040

4141
private static kotlin.Pair<Boolean, IdeStatusBar> isProgressbarWithLabelVisible() {

0 commit comments

Comments
 (0)