From f5d38caeb5cd14519c1c5de9a19a9558e57f362a Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Thu, 9 Mar 2023 10:09:02 -0800 Subject: [PATCH] Organize imports (#687) --- .../plugins/folder/HaveAFolderCreated.java | 6 +-- .../folder/HaveANestedProjectCreated.java | 4 +- .../plugins/folder/tasks/CreateAFolder.java | 12 ++--- .../aether/ArtifactTransporter.java | 13 ++--- .../aether/ConsoleRepositoryListener.java | 3 +- .../aether/ConsoleTransferListener.java | 9 ++-- .../matchers/ProjectInformationMatchers.java | 4 +- .../build_monitor/model/ProjectStatus.java | 7 +-- .../questions/ProjectWidget.java | 8 ++- .../project_widget/ProjectBadgesState.java | 5 +- .../ProjectWidgetProgressBarsState.java | 5 +- .../project_widget/ProjectWidgetState.java | 5 +- .../build_monitor/tasks/AddProjects.java | 4 +- .../tasks/ConfigureEmptyBuildMonitorView.java | 13 +++-- .../tasks/CreateABuildMonitorView.java | 10 ++-- .../tasks/HaveABuildMonitorViewCreated.java | 4 +- .../build_monitor/tasks/HideBadges.java | 9 ++-- .../tasks/ModifyControlPanelOptions.java | 14 +++-- .../build_monitor/tasks/ShowBadges.java | 9 ++-- .../configuration/ConfigureViewSettings.java | 4 +- .../configuration/DisplayAllProjects.java | 4 +- .../tasks/configuration/DisplayBadges.java | 4 +- .../configuration/DisplayBadgesFrom.java | 4 +- .../DisplayJunitRealtimeProgress.java | 4 +- .../configuration/DisplayNestedProjects.java | 4 +- .../SaveTheChangesToBuildMonitor.java | 6 +-- .../DefineABuildLogIndicatedFailureCause.java | 8 +-- .../HaveAShellScriptFailureCauseDefined.java | 4 +- .../bfa/UseFailureCauseManagement.java | 11 ++-- .../bfa/tasks/DefineAFailureCause.java | 4 +- .../configuration/LineInTheBuildLog.java | 4 +- .../FailureCauseManagementPage.java | 2 +- .../HaveAFailingClaimableProjectCreated.java | 8 +-- .../hudson/plugins/claim/tasks/Claim.java | 4 +- .../configuration/BrokenBuildClaiming.java | 4 +- .../tasks/SetBuildDescription.java | 4 +- .../jenkins/JenkinsArtifactTransporter.java | 1 - .../integration/jenkins/JenkinsInstance.java | 25 ++++----- .../integration/jenkins/TestEnvironment.java | 10 ++-- .../jenkins/client/JenkinsClient.java | 26 ++++----- .../integration/jenkins/environment/CWD.java | 6 +-- .../jenkins/environment/Directories.java | 4 +- .../environment/PluginDescription.java | 9 ++-- .../jenkins/environment/UpdateCenter.java | 5 +- .../environment/rules/FindFreePort.java | 9 ++-- .../rules/InstallPluginsFromDisk.java | 18 +++---- .../rules/ManageJenkinsServer.java | 5 +- .../environment/rules/SandboxJenkinsHome.java | 13 ++--- .../process/JenkinsLogLineWatcher.java | 5 +- .../jenkins/process/JenkinsLogWatcher.java | 12 +++-- .../jenkins/process/JenkinsProcess.java | 21 ++++---- .../integration/utils/CommandLineTools.java | 4 +- .../integration/utils/RuleChains.java | 10 ++-- .../interactions/NotifyOfExternalProject.java | 4 +- .../jenkins/HaveAFailingProjectCreated.java | 8 +-- .../jenkins/HaveAPipelineProjectCreated.java | 8 +-- .../jenkins/HaveAProjectCreated.java | 4 +- .../HaveASuccessfulProjectCreated.java | 8 +-- .../jenkins/HaveAnExternalProjectCreated.java | 8 +-- .../screenplay/jenkins/JenkinsUser.java | 3 +- .../screenplay/jenkins/actions/Choose.java | 4 +- .../screenplay/jenkins/actions/EnterCode.java | 11 ++-- .../screenplay/jenkins/targets/Button.java | 4 +- .../screenplay/jenkins/targets/Input.java | 4 +- .../screenplay/jenkins/targets/Label.java | 4 +- .../screenplay/jenkins/targets/Link.java | 4 +- .../tasks/CreateAFreestyleProject.java | 4 +- .../jenkins/tasks/CreateAPipelineProject.java | 6 +-- .../jenkins/tasks/CreateAProject.java | 4 +- .../tasks/CreateAnExternalProject.java | 4 +- .../screenplay/jenkins/tasks/GoBack.java | 4 +- .../screenplay/jenkins/tasks/LogIn.java | 4 +- .../jenkins/tasks/ScheduleABuild.java | 6 +-- .../jenkins/tasks/configuration/TodoList.java | 13 +++-- .../AddAGroovyPostbuildScript.java | 6 +-- .../build_steps/ExecuteAShellScript.java | 8 +-- .../build_steps/GroovyScript.java | 4 +- .../build_steps/SetPipelineDefinition.java | 4 +- .../build_steps/ShellScript.java | 4 +- .../navigation/Breadcrumbs.java | 4 +- .../user_interface/navigation/Buttons.java | 2 +- .../user_interface/navigation/SidePanel.java | 2 +- .../screenplayx/actions/Navigate.java | 7 ++- .../screenplayx/actions/ScrollToTarget.java | 6 +-- .../test/java/environment/JenkinsSandbox.java | 17 +++--- .../features/BuildMonitorAcceptanceTest.java | 4 +- .../BuildMonitorShouldBeEasyToSetUp.java | 15 +++--- .../ProjectStatusShouldBeEasyToDetermine.java | 17 +++--- .../features/ShouldDescribeEachProject.java | 10 ++-- .../java/features/ShouldDisplayBadges.java | 30 +++++------ .../ShouldDisplayConcurrentBuilds.java | 10 ++-- .../features/ShouldDisplayPipelineStage.java | 10 ++-- .../features/ShouldDisplayTestProgress.java | 17 +++--- .../ShouldSupportCloudBeesFolders.java | 14 ++--- .../ShouldSupportExternalProjects.java | 16 +++--- .../features/ShouldTellWhatBrokeTheBuild.java | 10 ++-- .../ShouldTellWhoIsFixingTheBrokenBuild.java | 19 +++---- .../buildmonitor/BuildMonitorDescriptor.java | 5 +- .../buildmonitor/BuildMonitorLogger.java | 10 ++-- .../buildmonitor/BuildMonitorView.java | 18 +++---- .../plugins/buildmonitor/Config.java | 3 +- .../plugins/buildmonitor/api/Respond.java | 9 ++-- .../plugins/buildmonitor/api/Success.java | 1 - .../culprits/BuildCulpritsAbstractBuild.java | 2 - .../culprits/BuildCulpritsNotImplemented.java | 1 - .../culprits/BuildCulpritsRetriever.java | 1 - .../culprits/BuildCulpritsWorkflowRun.java | 3 +- .../BuildMonitorInstallation.java | 1 - .../buildmonitor/order/ByDisplayName.java | 1 - .../order/ByEstimatedDuration.java | 1 - .../buildmonitor/order/ByFullName.java | 1 - .../buildmonitor/order/ByLastBuildTime.java | 1 - .../plugins/buildmonitor/order/ByName.java | 1 - .../plugins/buildmonitor/order/ByStatus.java | 1 - .../buildmonitor/pipeline/PipelineHelper.java | 3 +- .../pipeline/WorkflowNodeTraversal.java | 3 +- .../buildmonitor/readability/Lister.java | 8 ++- .../buildmonitor/readability/Pluraliser.java | 4 +- .../buildmonitor/viewmodel/BuildView.java | 5 +- .../viewmodel/BuildViewModel.java | 1 - .../viewmodel/BuildingPredicate.java | 1 - .../buildmonitor/viewmodel/CssStatus.java | 16 +++--- .../buildmonitor/viewmodel/JobView.java | 5 +- .../viewmodel/JobViewSerialiser.java | 3 +- .../buildmonitor/viewmodel/JobViews.java | 13 +++-- .../buildmonitor/viewmodel/NullBuildView.java | 1 - .../viewmodel/features/CanBeClaimed.java | 1 - .../features/CanBeDiagnosedForProblems.java | 1 - .../features/HasBadgesBadgePlugin.java | 8 ++- .../viewmodel/features/HasConfig.java | 3 +- .../viewmodel/features/HasHeadline.java | 10 +++- .../viewmodel/features/HasJunitRealtime.java | 6 +-- .../features/KnowsCurrentBuildsDetails.java | 1 - .../features/headline/HeadlineOfAborted.java | 7 +-- .../headline/HeadlineOfExecuting.java | 1 - .../features/headline/HeadlineOfFailing.java | 10 ++-- .../features/headline/HeadlineOfFixed.java | 8 ++- .../BuildMonitorDescriptorTest.java | 16 +++--- .../BuildMonitorInstallationTest.java | 6 +-- .../jcasc/ConfigurationAsCodeTest.java | 16 +++--- .../BreadthFirstNodeTraversalTest.java | 9 ++-- .../pipeline/PipelineHelperTest.java | 12 ++--- .../buildmonitor/viewmodel/BuildViewTest.java | 8 +-- .../buildmonitor/viewmodel/JobViewTest.java | 54 ++++++++++--------- .../viewmodel/features/CanBeClaimedTest.java | 27 +++++----- .../CanBeDiagnosedForProblemsTest.java | 19 ++++--- .../features/HasBadgesBadgePluginTest.java | 23 +++++--- ...HasHeadlineShowingAbortedBuildDetails.java | 15 +++--- ...HeadlineShowingFailedBuildDetailsTest.java | 15 +++--- ...sHeadlineShowingFixedBuildDetailsTest.java | 17 +++--- ...eadlineShowingRunningBuildDetailsTest.java | 17 +++--- .../HasHeadlineWhichShowsNothingTest.java | 12 +++-- .../features/HasJunitRealtimeTest.java | 6 +-- .../KnowsCurrentBuildsDetailsTest.java | 22 ++++---- .../KnowsLastCompletedBuildDetailsTest.java | 22 ++++---- .../viewmodel/readability/ListerTest.java | 9 ++-- .../viewmodel/readability/PluraliserTest.java | 6 +-- .../BadgeBadgePluginRecipe.java | 7 ++- .../syntacticsugar/BuildStateRecipe.java | 23 ++++---- .../syntacticsugar/ConfigStateRecipe.java | 1 - .../syntacticsugar/JobStateRecipe.java | 11 ++-- .../syntacticsugar/JobViewRecipe.java | 1 - .../RealtimeTestPluginRecipe.java | 7 ++- .../viewmodel/syntacticsugar/Sugar.java | 7 ++- .../viewmodel/syntacticsugar/TimeMachine.java | 6 +-- 165 files changed, 627 insertions(+), 711 deletions(-) diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java index f3866cc1c..3910c689a 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java +++ b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveAFolderCreated.java @@ -1,13 +1,13 @@ package com.cloudbees.hudson.plugins.folder; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.cloudbees.hudson.plugins.folder.tasks.CreateAFolder; -import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class HaveAFolderCreated implements Task { public static HaveAFolderCreated called(String name) { diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java index 816ccd193..f55df1ad7 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/HaveANestedProjectCreated.java @@ -1,5 +1,7 @@ package com.cloudbees.hudson.plugins.folder; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.cloudbees.hudson.plugins.folder.user_interface.FolderDetailsPage; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplay.jenkins.tasks.CreateAFreestyleProject; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class HaveANestedProjectCreated implements Task { public static Task called(String name) { diff --git a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java index 5a9f7e3a4..90eef9480 100644 --- a/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java +++ b/build-monitor-acceptance/src/main/java/com/cloudbees/hudson/plugins/folder/tasks/CreateAFolder.java @@ -1,17 +1,17 @@ package com.cloudbees.hudson.plugins.folder.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.actions.Enter; import net.serenitybdd.screenplay.jenkins.actions.Choose; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; +import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; import net.thucydides.core.annotations.Step; - -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons.Save; -import static org.openqa.selenium.Keys.ENTER; +import org.openqa.selenium.Keys; public class CreateAFolder implements Task { public static CreateAFolder called(String name) { @@ -24,8 +24,8 @@ public void performAs(T actor) { actor.attemptsTo( Click.on(SidePanel.New_Item_Link), Choose.the(NewJobPage.Folder), - Enter.theValue(name).into(NewJobPage.Item_Name_Field).thenHit(ENTER), - Click.on(Save) + Enter.theValue(name).into(NewJobPage.Item_Name_Field).thenHit(Keys.ENTER), + Click.on(Buttons.Save) ); } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java index 148b4f18f..e0dd82226 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ArtifactTransporter.java @@ -1,5 +1,9 @@ package com.smartcodeltd.aether; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.apache.maven.repository.internal.MavenRepositorySystemUtils; import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.RepositorySystem; @@ -20,13 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static java.lang.String.format; - public class ArtifactTransporter { private static final Logger Log = LoggerFactory.getLogger(ArtifactTransporter.class); @@ -68,7 +65,7 @@ public Path get(@NotNull String groupName, @NotNull String artifactName, @NotNul return artifact.getFile().toPath(); } catch (ArtifactResolutionException e) { - throw new RuntimeException(format("Couldn't resolve a '%s' artifact for '%s:%s:%s'", + throw new RuntimeException(String.format("Couldn't resolve a '%s' artifact for '%s:%s:%s'", artifactFileExtension, groupName, artifactName, version ), e); } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java index 0dbb6994f..3c9628f6a 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleRepositoryListener.java @@ -1,10 +1,9 @@ package com.smartcodeltd.aether; +import java.io.PrintStream; import org.eclipse.aether.AbstractRepositoryListener; import org.eclipse.aether.RepositoryEvent; -import java.io.PrintStream; - public class ConsoleRepositoryListener extends AbstractRepositoryListener { private PrintStream out; diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java index 0407b1a94..726c622ae 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/aether/ConsoleTransferListener.java @@ -13,17 +13,16 @@ * Sonatype, Inc. - initial API and implementation *******************************************************************************/ -import org.eclipse.aether.transfer.AbstractTransferListener; -import org.eclipse.aether.transfer.MetadataNotFoundException; -import org.eclipse.aether.transfer.TransferEvent; -import org.eclipse.aether.transfer.TransferResource; - import java.io.PrintStream; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.eclipse.aether.transfer.AbstractTransferListener; +import org.eclipse.aether.transfer.MetadataNotFoundException; +import org.eclipse.aether.transfer.TransferEvent; +import org.eclipse.aether.transfer.TransferResource; /** * A simplistic transfer listener that logs uploads/downloads to the console. diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java index eeeac646d..cb4836af7 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/matchers/ProjectInformationMatchers.java @@ -5,8 +5,6 @@ import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; -import static java.lang.String.format; - public class ProjectInformationMatchers { public static ProjectStatusMatcher displaysProjectStatusAs(ProjectStatus desiredStatus) { return new ProjectStatusMatcher(desiredStatus); @@ -29,7 +27,7 @@ protected boolean matchesSafely(ProjectInformation information) { public void describeTo(Description description) { description .appendText("displaying the status as ") - .appendText(format("'%s'", desiredStatus.toString())); + .appendText(String.format("'%s'", desiredStatus.toString())); } } } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java index d39366e5b..30b6b6e9b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/model/ProjectStatus.java @@ -9,9 +9,6 @@ import java.util.stream.Stream; import org.jetbrains.annotations.NotNull; -import static java.lang.String.format; -import static java.util.stream.Collectors.toList; - public enum ProjectStatus { Successful("successful"), Failing("failing"), @@ -51,7 +48,7 @@ public static ProjectStatus from(@NotNull String cssClass) { } } - throw new IllegalArgumentException(format("'%s' is not a recognised value of the ProjectStatus enum", cssClass)); + throw new IllegalArgumentException(String.format("'%s' is not a recognised value of the ProjectStatus enum", cssClass)); } // todo: Java 8? @@ -71,7 +68,7 @@ private static Set setOf(List items) { private static List stringRepresentationsOf(Collection items) { return items.stream() .map(Object::toString) - .collect(toList()); + .collect(Collectors.toList()); } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java index 47ba1c24d..665328329 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/ProjectWidget.java @@ -1,7 +1,13 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.questions; import com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectInformation; -import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.*; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectBadgesState; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetBuilds; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetDetails; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetInformation; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetPipelineStages; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetProgressBarsState; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.project_widget.ProjectWidgetState; import net.serenitybdd.core.pages.WebElementState; import net.serenitybdd.screenplay.Question; diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java index c13f411cc..524ad8ec8 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectBadgesState.java @@ -5,10 +5,9 @@ import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Question; import net.serenitybdd.screenplay.annotations.Subject; +import net.serenitybdd.screenplay.questions.WebElementQuestion; import net.serenitybdd.screenplay.targets.Target; -import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf; - @Subject("the badges of widget representing the '#projectName' project on the Build Monitor") public class ProjectBadgesState implements Question { @@ -16,7 +15,7 @@ public class ProjectBadgesState implements Question { public WebElementState answeredBy(Actor actor) { Target widget = BuildMonitorDashboard.Project_Widget_Badges.of(projectName); - return stateOf(widget).answeredBy(actor); + return WebElementQuestion.stateOf(widget).answeredBy(actor); } public ProjectBadgesState(String projectName) { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java index b4670df46..d775e956a 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetProgressBarsState.java @@ -5,10 +5,9 @@ import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Question; import net.serenitybdd.screenplay.annotations.Subject; +import net.serenitybdd.screenplay.questions.WebElementQuestion; import net.serenitybdd.screenplay.targets.Target; -import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf; - @Subject("the progress bars of widget representing the '#projectName' project on the Build Monitor") public class ProjectWidgetProgressBarsState implements Question { @@ -16,7 +15,7 @@ public class ProjectWidgetProgressBarsState implements Question public WebElementState answeredBy(Actor actor) { Target widget = BuildMonitorDashboard.Project_Widget_Progress_Bars.of(projectName); - return stateOf(widget).answeredBy(actor); + return WebElementQuestion.stateOf(widget).answeredBy(actor); } public ProjectWidgetProgressBarsState(String projectName) { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java index 7f9cbd01a..94d2ee05d 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/questions/project_widget/ProjectWidgetState.java @@ -5,10 +5,9 @@ import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Question; import net.serenitybdd.screenplay.annotations.Subject; +import net.serenitybdd.screenplay.questions.WebElementQuestion; import net.serenitybdd.screenplay.targets.Target; -import static net.serenitybdd.screenplay.questions.WebElementQuestion.stateOf; - @Subject("the widget representing the '#projectName' project on the Build Monitor") public class ProjectWidgetState implements Question { @@ -16,7 +15,7 @@ public class ProjectWidgetState implements Question { public WebElementState answeredBy(Actor actor) { Target widget = BuildMonitorDashboard.Project_Widget.of(projectName); - return stateOf(widget).answeredBy(actor); + return WebElementQuestion.stateOf(widget).answeredBy(actor); } public ProjectWidgetState(String projectName) { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java index 6d9453738..0ae9a9ac8 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/AddProjects.java @@ -1,13 +1,13 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class AddProjects implements Task { public static Task toAnEmptyBuildMonitor() { return instrumented(AddProjects.class); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java index d2b20c4ba..4832d428f 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ConfigureEmptyBuildMonitorView.java @@ -1,21 +1,20 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor; -import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; +import java.util.Arrays; +import java.util.List; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Performable; import net.serenitybdd.screenplay.Task; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.thucydides.core.annotations.Step; -import java.util.List; - -import static java.util.Arrays.asList; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class ConfigureEmptyBuildMonitorView implements Task { public static ConfigureEmptyBuildMonitorView to(Task... configurationTasks) { - return instrumented(ConfigureEmptyBuildMonitorView.class, asList(configurationTasks)); + return instrumented(ConfigureEmptyBuildMonitorView.class, Arrays.asList(configurationTasks)); } @Override diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java index 6b3888de5..71a71f8a6 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/CreateABuildMonitorView.java @@ -1,18 +1,18 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.SaveTheChangesToBuildMonitor; -import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; -import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage; -import net.serenitybdd.screenplay.jenkins.user_interface.NewViewPage; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.actions.Enter; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; +import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage; +import net.serenitybdd.screenplay.jenkins.user_interface.NewViewPage; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class CreateABuildMonitorView implements Task { public static CreateABuildMonitorView called(String name) { return instrumented(CreateABuildMonitorView.class, name); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java index 6e64fe117..aff83c8a7 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HaveABuildMonitorViewCreated.java @@ -1,12 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayAllProjects; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class HaveABuildMonitorViewCreated implements Task { public static Task showingAllTheProjects() { return instrumented(HaveABuildMonitorViewCreated.class); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java index fc38bc04b..3493e8371 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/HideBadges.java @@ -1,16 +1,15 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; -import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; +import static net.serenitybdd.screenplay.Tasks.instrumented; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.UncheckCheckbox; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplay.waits.WaitUntil; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isVisible; - public class HideBadges implements Task { public static Task onTheDashboard() { return instrumented(HideBadges.class); @@ -20,7 +19,7 @@ public static Task onTheDashboard() { @Override public void performAs(T actor) { actor.attemptsTo( - WaitUntil.the(BuildMonitorDashboard.Show_Badges, isVisible()), + WaitUntil.the(BuildMonitorDashboard.Show_Badges, WebElementStateMatchers.isVisible()), UncheckCheckbox.of(BuildMonitorDashboard.Show_Badges) ); } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java index a1a0c97ad..c581d04c4 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ModifyControlPanelOptions.java @@ -1,23 +1,21 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; -import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; +import static net.serenitybdd.screenplay.Tasks.instrumented; -import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; +import java.util.Arrays; +import java.util.List; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Performable; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.thucydides.core.annotations.Step; -import java.util.List; - -import static java.util.Arrays.asList; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class ModifyControlPanelOptions implements Task { public static ModifyControlPanelOptions to(Task... configurationTasks) { - return instrumented(ModifyControlPanelOptions.class, asList(configurationTasks)); + return instrumented(ModifyControlPanelOptions.class, Arrays.asList(configurationTasks)); } @Override diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java index a2113e836..d6573609b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/ShowBadges.java @@ -1,16 +1,15 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks; -import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; +import static net.serenitybdd.screenplay.Tasks.instrumented; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.user_interface.BuildMonitorDashboard; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.CheckCheckbox; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplay.waits.WaitUntil; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isVisible; - public class ShowBadges implements Task { public static Task onTheDashboard() { return instrumented(ShowBadges.class); @@ -20,7 +19,7 @@ public static Task onTheDashboard() { @Override public void performAs(T actor) { actor.attemptsTo( - WaitUntil.the(BuildMonitorDashboard.Show_Badges, isVisible()), + WaitUntil.the(BuildMonitorDashboard.Show_Badges, WebElementStateMatchers.isVisible()), CheckCheckbox.of(BuildMonitorDashboard.Show_Badges) ); } diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java index c7bde38c5..120a3e56e 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/ConfigureViewSettings.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.Sleep; import java.util.concurrent.TimeUnit; import net.serenitybdd.screenplay.Actor; @@ -10,8 +12,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class ConfigureViewSettings implements Task { public static Task toggleShowBadges() { diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java index b6f068787..fc6a3068b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayAllProjects.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.Sleep; import java.util.concurrent.TimeUnit; import net.serenitybdd.screenplay.Actor; @@ -10,8 +12,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DisplayAllProjects implements Task { public static Task usingARegularExpression() { return instrumented(DisplayAllProjects.class); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java index 4056cb66e..6b0ddcb8e 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadges.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.SelectFromOptions; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DisplayBadges implements Task { public static DisplayBadges asAUserSetting() { return instrumented(DisplayBadges.class, "User Setting"); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java index 8d3d35b35..184f28761 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayBadgesFrom.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.SelectFromOptions; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DisplayBadgesFrom implements Task { public static DisplayBadgesFrom theLastBuild() { return instrumented(DisplayBadgesFrom.class, "Last Build"); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java index a0949ad05..97dac7762 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayJunitRealtimeProgress.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.CheckCheckbox; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DisplayJunitRealtimeProgress implements Task { public static Task bars() { return instrumented(DisplayJunitRealtimeProgress.class); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java index 74b7283cd..13db601f1 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/DisplayNestedProjects.java @@ -1,5 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.actions.Choose; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DisplayNestedProjects implements Task { public static Task fromSubfolders() { return instrumented(DisplayNestedProjects.class); diff --git a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java index d491109d0..fb8c09f0b 100644 --- a/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java +++ b/build-monitor-acceptance/src/main/java/com/smartcodeltd/jenkinsci/plugins/build_monitor/tasks/configuration/SaveTheChangesToBuildMonitor.java @@ -1,12 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; -import net.thucydides.core.annotations.Step; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Buttons; - -import static net.serenitybdd.screenplay.Tasks.instrumented; +import net.thucydides.core.annotations.Step; public class SaveTheChangesToBuildMonitor implements Task { public static Task andExitTheConfigurationScreen() { diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java index f6d74e232..3d8ff2b42 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/DefineABuildLogIndicatedFailureCause.java @@ -1,14 +1,14 @@ package com.sonyericsson.jenkins.plugins.bfa; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.sonyericsson.jenkins.plugins.bfa.tasks.DefineAFailureCause; import com.sonyericsson.jenkins.plugins.bfa.tasks.configuration.LineInTheBuildLog; +import net.serenitybdd.integration.utils.Nulls; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.integration.utils.Nulls.getOrElse; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DefineABuildLogIndicatedFailureCause implements Task { public static DefineABuildLogIndicatedFailureCause called(String name) { @@ -31,7 +31,7 @@ public DefineABuildLogIndicatedFailureCause matching(String regex) { @Override public void performAs(T actor) { actor.attemptsTo( - DefineAFailureCause.called(name).describedAs(getOrElse(description, name)).indicatedBy( + DefineAFailureCause.called(name).describedAs(Nulls.getOrElse(description, name)).indicatedBy( LineInTheBuildLog.matching(regex) ) ); diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/HaveAShellScriptFailureCauseDefined.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/HaveAShellScriptFailureCauseDefined.java index 3f1c3e761..a02609970 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/HaveAShellScriptFailureCauseDefined.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/HaveAShellScriptFailureCauseDefined.java @@ -1,10 +1,10 @@ package com.sonyericsson.jenkins.plugins.bfa; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class HaveAShellScriptFailureCauseDefined implements Task { public static HaveAShellScriptFailureCauseDefined called(String name) { diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java index a07f87e39..6174d0db5 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/UseFailureCauseManagement.java @@ -1,6 +1,10 @@ package com.sonyericsson.jenkins.plugins.bfa; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.sonyericsson.jenkins.plugins.bfa.user_interface.JenkinsHomePageWithBFA; +import java.util.Arrays; +import java.util.List; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; @@ -8,14 +12,9 @@ import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Breadcrumbs; import net.thucydides.core.annotations.Step; -import java.util.List; - -import static java.util.Arrays.asList; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class UseFailureCauseManagement implements Task { public static UseFailureCauseManagement to(Task... defineFailureCauses) { - return instrumented(UseFailureCauseManagement.class, asList(defineFailureCauses)); + return instrumented(UseFailureCauseManagement.class, Arrays.asList(defineFailureCauses)); } @Step("{0} uses the 'Failure Cause Management'") diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/DefineAFailureCause.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/DefineAFailureCause.java index 4a859208a..6eaa9de5d 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/DefineAFailureCause.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/DefineAFailureCause.java @@ -1,5 +1,7 @@ package com.sonyericsson.jenkins.plugins.bfa.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.sonyericsson.jenkins.plugins.bfa.user_interface.FailureCauseManagementPage; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplay.actions.Enter; import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class DefineAFailureCause implements Task { public static DefineAFailureCause called(String name) { return instrumented(DefineAFailureCause.class, name); diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java index 0a4a555a1..1397745a8 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/tasks/configuration/LineInTheBuildLog.java @@ -1,5 +1,7 @@ package com.sonyericsson.jenkins.plugins.bfa.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import com.sonyericsson.jenkins.plugins.bfa.user_interface.FailureCauseManagementPage; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; @@ -10,8 +12,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class LineInTheBuildLog implements Task { public static LineInTheBuildLog matching(String pattern) { return instrumented(LineInTheBuildLog.class, pattern); diff --git a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java index 526c7b11d..64f2e9b58 100644 --- a/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java +++ b/build-monitor-acceptance/src/main/java/com/sonyericsson/jenkins/plugins/bfa/user_interface/FailureCauseManagementPage.java @@ -1,7 +1,7 @@ package com.sonyericsson.jenkins.plugins.bfa.user_interface; -import net.serenitybdd.screenplay.jenkins.targets.Input; import net.serenitybdd.screenplay.jenkins.targets.Button; +import net.serenitybdd.screenplay.jenkins.targets.Input; import net.serenitybdd.screenplay.jenkins.targets.Link; import net.serenitybdd.screenplay.targets.Target; diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java index e668499fc..56eb0880d 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/HaveAFailingClaimableProjectCreated.java @@ -1,16 +1,16 @@ package hudson.plugins.claim; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import hudson.plugins.claim.tasks.configuration.BrokenBuildClaiming; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.HaveAProjectCreated; import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat.Finishes_With_Error; - public class HaveAFailingClaimableProjectCreated implements Task { public static Task called(String name) { return instrumented(HaveAFailingClaimableProjectCreated.class, name); @@ -21,7 +21,7 @@ public static Task called(String name) { public void performAs(T actor) { actor.attemptsTo( HaveAProjectCreated.called(projectName).andConfiguredTo( - ExecuteAShellScript.that(Finishes_With_Error), + ExecuteAShellScript.that(ShellScriptThat.Finishes_With_Error), BrokenBuildClaiming.allow() ), ScheduleABuild.of(projectName) diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java index fec19ebc6..b539c5b68 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java +++ b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/Claim.java @@ -1,5 +1,7 @@ package hudson.plugins.claim.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import hudson.plugins.claim.user_interface.ClaimableBuildDetailsPage; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; @@ -10,8 +12,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class Claim implements Task { public static Claim lastBrokenBuildOf(String project) { return instrumented(Claim.class, project); diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java index c3a0231d0..f98587a02 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java +++ b/build-monitor-acceptance/src/main/java/hudson/plugins/claim/tasks/configuration/BrokenBuildClaiming.java @@ -1,12 +1,12 @@ package hudson.plugins.claim.tasks.configuration; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.AddAPostBuildAction; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class BrokenBuildClaiming implements Task { public static Task allow() { diff --git a/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java b/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java index a2bf4fb2b..20b44ab28 100644 --- a/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java +++ b/build-monitor-acceptance/src/main/java/hudson/plugins/descriptionsetter/tasks/SetBuildDescription.java @@ -1,5 +1,7 @@ package hudson.plugins.descriptionsetter.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Enter; @@ -7,8 +9,6 @@ import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.AddABuildStep; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class SetBuildDescription implements Task { private final String description; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsArtifactTransporter.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsArtifactTransporter.java index 28c441935..ec68f456a 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsArtifactTransporter.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsArtifactTransporter.java @@ -2,7 +2,6 @@ import com.smartcodeltd.aether.ArtifactTransporter; import com.smartcodeltd.aether.RemoteRepository; - import java.nio.file.Path; import java.nio.file.Paths; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsInstance.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsInstance.java index a9eb88dd8..792ca2fd6 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsInstance.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/JenkinsInstance.java @@ -1,27 +1,24 @@ package net.serenitybdd.integration.jenkins; +import java.net.MalformedURLException; +import java.net.URL; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import net.serenitybdd.integration.jenkins.client.JenkinsClient; import net.serenitybdd.integration.jenkins.environment.PluginDescription; import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; import net.serenitybdd.integration.jenkins.environment.rules.InstallPlugins; import net.serenitybdd.integration.jenkins.environment.rules.ManageJenkinsServer; +import net.serenitybdd.integration.utils.ListFunctions; import net.serenitybdd.integration.utils.RuleChains; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import java.net.MalformedURLException; -import java.net.URL; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import static java.lang.String.format; -import static net.serenitybdd.integration.utils.ListFunctions.concat; - public class JenkinsInstance implements TestRule { private Path jenkinsHome = Paths.get(System.getProperty("java.io.tmpdir")); private int portNumber = 8080; @@ -65,9 +62,9 @@ public void setClient(JenkinsClient client) { public URL url() { try { - return new URL(format("http://localhost:%d/", portNumber)); + return new URL(String.format("http://localhost:%d/", portNumber)); } catch (MalformedURLException e) { - throw new RuntimeException(format("Couldn't instantiate a URL as 'http://localhost:%d/'", portNumber)); + throw new RuntimeException(String.format("Couldn't instantiate a URL as 'http://localhost:%d/'", portNumber)); } } @@ -93,7 +90,7 @@ public > JenkinsInstance afterS @Override public Statement apply(final Statement base, final Description description) { - return chainOf(concat(customRulesToApplyBeforeStart, defaultRules, customRulesToApplyAfterStart)).apply(base, description); + return chainOf(ListFunctions.concat(customRulesToApplyBeforeStart, defaultRules, customRulesToApplyAfterStart)).apply(base, description); } private > RuleChain chainOf(List rules) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/TestEnvironment.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/TestEnvironment.java index 3b1f17e1b..3128150ae 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/TestEnvironment.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/TestEnvironment.java @@ -1,11 +1,9 @@ package net.serenitybdd.integration.jenkins; -import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; - import java.util.ArrayList; +import java.util.Arrays; import java.util.List; - -import static java.util.Arrays.asList; +import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; public class TestEnvironment { private final JenkinsInstance instance; @@ -22,11 +20,11 @@ public JenkinsInstance create() { } public > TestEnvironment beforeStart(ATR... rules) { - return beforeStart(asList(rules)); + return beforeStart(Arrays.asList(rules)); } public > TestEnvironment afterStart(ATR... rules) { - return afterStart(asList(rules)); + return afterStart(Arrays.asList(rules)); } public > TestEnvironment beforeStart(List rules) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/client/JenkinsClient.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/client/JenkinsClient.java index 3230848f1..db1d32c30 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/client/JenkinsClient.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/client/JenkinsClient.java @@ -1,11 +1,6 @@ package net.serenitybdd.integration.jenkins.client; import hudson.cli.CLI; -import net.serenitybdd.integration.jenkins.process.JenkinsProcess; -import org.jdeferred.Promise; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URL; @@ -14,9 +9,10 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; - -import static java.lang.String.format; -import static net.serenitybdd.integration.jenkins.process.JenkinsProcess.JENKINS_IS_FULLY_UP_AND_RUNNING; +import net.serenitybdd.integration.jenkins.process.JenkinsProcess; +import org.jdeferred.Promise; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JenkinsClient { private static final Logger logger = LoggerFactory.getLogger(JenkinsClient.class); @@ -39,7 +35,7 @@ public JenkinsClient(URL jenkinsUrl, JenkinsProcess process) { public void registerAccount(String username, String password) { logger.info("Enabling Jenkins Security and registering account for '{}', identified by '{}'", username, password); - String endScriptMessage = format("Account for '%s' created", username); + String endScriptMessage = String.format("Account for '%s' created", username); Promise promise = process.promiseWhen(endScriptMessage); try { @@ -47,13 +43,13 @@ public void registerAccount(String username, String password) { "def instance = jenkins.model.Jenkins.get()", "def usersCanRegister = true", "def realm = new hudson.security.HudsonPrivateSecurityRealm(usersCanRegister)", - format("realm.createAccount(\"%s\",\"%s\")", username, password), + String.format("realm.createAccount(\"%s\",\"%s\")", username, password), "instance.setSecurityRealm(realm)", "instance.save()", "", "import java.util.logging.Logger", "Logger rootLogger = Logger.getLogger('')", - format("rootLogger.info(\"%s\")", endScriptMessage) + String.format("rootLogger.info(\"%s\")", endScriptMessage) ); logger.info(endScriptMessage); } catch (InterruptedException e) { @@ -76,7 +72,7 @@ public void populateUpdateCenterCaches() { "", "import java.util.logging.Logger", "Logger rootLogger = Logger.getLogger('')", - format("rootLogger.info(\"%s\")", endScriptMessage) + String.format("rootLogger.info(\"%s\")", endScriptMessage) ); logger.info(endScriptMessage); } catch (InterruptedException e) { @@ -88,7 +84,7 @@ public void installPlugin(String pluginName) { // http://stackoverflow.com/questions/7709993/how-can-i-update-jenkins-plugins-from-the-terminal executeCommand("install-plugin", pluginName, "-restart"); - process.waitUntil(JENKINS_IS_FULLY_UP_AND_RUNNING); + process.waitUntil(JenkinsProcess.JENKINS_IS_FULLY_UP_AND_RUNNING); } @@ -134,14 +130,14 @@ public void safeShutdown() { private void safeRestart() { executeCommand("safe-restart"); - process.waitUntil(JENKINS_IS_FULLY_UP_AND_RUNNING); + process.waitUntil(JenkinsProcess.JENKINS_IS_FULLY_UP_AND_RUNNING); } public void setExternalBuildResult(String projectName, String result) { executeCommand("set-external-build-result", "--job", projectName, "--result", result, - "--log", format("%s finished with %s", projectName, result) + "--log", String.format("%s finished with %s", projectName, result) ); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/CWD.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/CWD.java index c13e4eb7f..03a955d77 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/CWD.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/CWD.java @@ -3,9 +3,7 @@ import edu.umd.cs.findbugs.annotations.Nullable; import java.nio.file.Path; import java.nio.file.Paths; - -import static java.lang.System.getProperty; -import static net.serenitybdd.integration.utils.Nulls.getOrElse; +import net.serenitybdd.integration.utils.Nulls; public class CWD { public static CWD or(String arbitraryCurrentWorkingDirectory) { @@ -17,7 +15,7 @@ public CWD() { } public CWD(@Nullable String path) { - cwd = Paths.get(getOrElse(path, getProperty("user.dir"))); + cwd = Paths.get(Nulls.getOrElse(path, System.getProperty("user.dir"))); } public Path resolve(String pathToChild) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/Directories.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/Directories.java index 31d1a2714..5ee9c86b7 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/Directories.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/Directories.java @@ -3,8 +3,6 @@ import java.nio.file.Path; import java.nio.file.Paths; -import static java.lang.System.getProperty; - public class Directories { - public static final Path Default_Temp_Dir = Paths.get(getProperty("java.io.tmpdir")); + public static final Path Default_Temp_Dir = Paths.get(System.getProperty("java.io.tmpdir")); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java index 44896cb1d..d5060788d 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/PluginDescription.java @@ -1,14 +1,13 @@ package net.serenitybdd.integration.jenkins.environment; -import net.serenitybdd.integration.jenkins.environment.rules.FindFreePort; -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.nio.file.Path; import java.util.jar.Attributes; import java.util.jar.JarFile; +import net.serenitybdd.integration.jenkins.environment.rules.FindFreePort; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class PluginDescription { private static final Logger Log = LoggerFactory.getLogger(FindFreePort.class); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/UpdateCenter.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/UpdateCenter.java index a53562123..21f042759 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/UpdateCenter.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/UpdateCenter.java @@ -1,9 +1,6 @@ package net.serenitybdd.integration.jenkins.environment; import com.github.zafarkhaja.semver.Version; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.FileOutputStream; import java.io.IOException; import java.net.MalformedURLException; @@ -15,6 +12,8 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class UpdateCenter { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/FindFreePort.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/FindFreePort.java index 9eeda40c0..923a575a8 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/FindFreePort.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/FindFreePort.java @@ -1,5 +1,7 @@ package net.serenitybdd.integration.jenkins.environment.rules; +import java.io.IOException; +import java.net.ServerSocket; import net.serenitybdd.integration.jenkins.JenkinsInstance; import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; @@ -7,11 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.net.ServerSocket; - -import static java.lang.String.format; - public class FindFreePort implements ApplicativeTestRule { private static final Logger Log = LoggerFactory.getLogger(FindFreePort.class); @@ -31,7 +28,7 @@ public static FindFreePort useFreePortFromTheFollowingRange(int rangeStart, int public FindFreePort(int rangeStart, int rangeEnd) { if (rangeStart > rangeEnd) { - throw new IllegalArgumentException(format("Start of the port range (%d) should be lower than the end of the range (%d)", rangeStart, rangeEnd)); + throw new IllegalArgumentException(String.format("Start of the port range (%d) should be lower than the end of the range (%d)", rangeStart, rangeEnd)); } this.rangeStart = rangeStart; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/InstallPluginsFromDisk.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/InstallPluginsFromDisk.java index 283d50055..f1bff98e0 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/InstallPluginsFromDisk.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/InstallPluginsFromDisk.java @@ -1,21 +1,19 @@ package net.serenitybdd.integration.jenkins.environment.rules; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import net.serenitybdd.integration.jenkins.JenkinsInstance; -import org.junit.rules.TestRule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; - -import static java.util.Arrays.asList; +import net.serenitybdd.integration.jenkins.JenkinsInstance; +import org.junit.rules.TestRule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InstallPluginsFromDisk implements ApplicativeTestRule { private static final Logger Log = LoggerFactory.getLogger(InstallPluginsFromDisk.class); @@ -25,7 +23,7 @@ public class InstallPluginsFromDisk implements ApplicativeTestRule { private final Path javaExecutable; private final ArtifactTransporter transporter; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/SandboxJenkinsHome.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/SandboxJenkinsHome.java index 0f5ba4efb..2f09940a3 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/SandboxJenkinsHome.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/environment/rules/SandboxJenkinsHome.java @@ -1,5 +1,8 @@ package net.serenitybdd.integration.jenkins.environment.rules; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import net.serenitybdd.integration.jenkins.JenkinsInstance; import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; @@ -7,12 +10,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -import static java.lang.String.format; - public class SandboxJenkinsHome implements ApplicativeTestRule { private static final Logger Log = LoggerFactory.getLogger(SandboxJenkinsHome.class); @@ -48,12 +45,12 @@ private Path temporaryJenkinsHomeFor(Description test) { fileSystemSafeNameOf(test) + "_" ); } catch (IOException e) { - throw new RuntimeException(format("Couldn't create a temporary directory for '%s' at '%s'.", test, rootDirectory), e); + throw new RuntimeException(String.format("Couldn't create a temporary directory for '%s' at '%s'.", test, rootDirectory), e); } } private String fileSystemSafeNameOf(Description description) { - return format("%s_%s", + return String.format("%s_%s", simplified(description.getClassName()), description.getMethodName() ); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogLineWatcher.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogLineWatcher.java index 9a27b4804..476738812 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogLineWatcher.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogLineWatcher.java @@ -1,12 +1,11 @@ package net.serenitybdd.integration.jenkins.process; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.jdeferred.Deferred; import org.jdeferred.Promise; import org.jdeferred.impl.DeferredObject; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - class JenkinsLogLineWatcher { private final Pattern pattern; private final Deferred deferred = new DeferredObject(); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogWatcher.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogWatcher.java index d76d3b3d6..074681781 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogWatcher.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsLogWatcher.java @@ -1,14 +1,16 @@ package net.serenitybdd.integration.jenkins.process; -import org.jdeferred.Promise; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.*; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.regex.Matcher; +import org.jdeferred.Promise; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JenkinsLogWatcher implements AutoCloseable, Runnable { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java index f41ca59d0..4d3ffe149 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/jenkins/process/JenkinsProcess.java @@ -1,20 +1,17 @@ package net.serenitybdd.integration.jenkins.process; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.jdeferred.Promise; -import org.jetbrains.annotations.NotNull; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.regex.Matcher; - -import static java.lang.String.format; -import static java.util.Arrays.asList; +import org.jdeferred.Promise; +import org.jetbrains.annotations.NotNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JenkinsProcess { private static final Logger Log = LoggerFactory.getLogger(JenkinsProcess.class); @@ -84,13 +81,13 @@ public void start() throws IOException { jenkinsStarted.waitSafely(Startup_Timeout); if (! jenkinsStarted.isResolved()) { - throw new RuntimeException(format("Jenkins failed to start within %s seconds, aborting the test.", Startup_Timeout)); + throw new RuntimeException(String.format("Jenkins failed to start within %s seconds, aborting the test.", Startup_Timeout)); } Log.info("Jenkins is now available at http://localhost:{}", port); } catch (InterruptedException e) { throw portConflictDetected.isResolved() - ? new RuntimeException(format("Couldn't start Jenkins on port '%s', the port is already in use", port), e) + ? new RuntimeException(String.format("Couldn't start Jenkins on port '%s', the port is already in use", port), e) : new RuntimeException("Couldn't start Jenkins", e); } } @@ -103,7 +100,7 @@ public void waitUntil(String logLine) { try { jenkinsLogWatcher.watchFor(logLine).waitSafely(Startup_Timeout); } catch (InterruptedException e) { - throw new RuntimeException(format("Did not see '%s' in the Jenkins log within %s ms", logLine, Startup_Timeout), e); + throw new RuntimeException(String.format("Did not see '%s' in the Jenkins log within %s ms", logLine, Startup_Timeout), e); } } @@ -117,7 +114,7 @@ public void stop() { private ProcessBuilder process(Path executable, String... arguments) { List args = new ArrayList<>(windowsOrUnix(executable)); - args.addAll(asList(arguments)); + args.addAll(Arrays.asList(arguments)); return new ProcessBuilder(args); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/CommandLineTools.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/CommandLineTools.java index ac15149dc..f075dd84a 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/CommandLineTools.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/CommandLineTools.java @@ -4,11 +4,9 @@ import java.nio.file.Path; import java.nio.file.Paths; -import static net.serenitybdd.integration.utils.Nulls.coalesce; - public class CommandLineTools { public static Path java() { - String javaHomeString = coalesce(System.getenv("JENKINS_JAVA_HOME"), System.getenv("JAVA_HOME"), + String javaHomeString = Nulls.coalesce(System.getenv("JENKINS_JAVA_HOME"), System.getenv("JAVA_HOME"), System.getProperty("java.home")); if (javaHomeString == null) { throw new RuntimeException("'java' executable not found. Please set the JAVA_HOME env variable to point to your Java home directory."); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/RuleChains.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/RuleChains.java index 01cd7dda3..22dd2185e 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/RuleChains.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/integration/utils/RuleChains.java @@ -1,13 +1,9 @@ package net.serenitybdd.integration.utils; -import org.junit.rules.RuleChain; -import org.junit.rules.TestRule; - import java.util.Arrays; import java.util.List; - -import static net.serenitybdd.integration.utils.ListFunctions.head; -import static net.serenitybdd.integration.utils.ListFunctions.tail; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; public class RuleChains { public static RuleChain from(TestRule... rules) { @@ -26,6 +22,6 @@ public static RuleChain chained(List customRules) { public static RuleChain chained(RuleChain acc, List customRules) { return customRules.isEmpty() ? acc - : chained(acc.around(head(customRules)), tail(customRules)); + : chained(acc.around(ListFunctions.head(customRules)), ListFunctions.tail(customRules)); } } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java index abe8b3727..4ba02b2ad 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/interacting_with_jenkins_api/interactions/NotifyOfExternalProject.java @@ -1,9 +1,9 @@ package net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions; -import net.serenitybdd.screenplay.Interaction; - import static net.serenitybdd.screenplay.Tasks.instrumented; +import net.serenitybdd.screenplay.Interaction; + public class NotifyOfExternalProject { public static Interaction successOf(String project) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java index 347a53fae..e8dc4357e 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAFailingProjectCreated.java @@ -1,14 +1,14 @@ package net.serenitybdd.screenplay.jenkins; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat.Finishes_With_Error; - public class HaveAFailingProjectCreated implements Task { public static Task called(String name) { @@ -20,7 +20,7 @@ public static Task called(String name) { public void performAs(T actor) { actor.attemptsTo( HaveAProjectCreated.called(projectName).andConfiguredTo( - ExecuteAShellScript.that(Finishes_With_Error) + ExecuteAShellScript.that(ShellScriptThat.Finishes_With_Error) ), ScheduleABuild.of(projectName) ); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java index c6658eba4..983c99594 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAPipelineProjectCreated.java @@ -1,15 +1,15 @@ package net.serenitybdd.screenplay.jenkins; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.jenkins.tasks.CreateAPipelineProject; import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; +import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel.Back_to_Dashboard; - public class HaveAPipelineProjectCreated implements Task { public static HaveAPipelineProjectCreated called(String name) { @@ -27,7 +27,7 @@ public Task andConfiguredTo(Task... configurationTasks) { public void performAs(T actor) { actor.attemptsTo( CreateAPipelineProject.called(projectName).andConfigureItTo(requiredConfiguration), - Click.on(Back_to_Dashboard) + Click.on(SidePanel.Back_to_Dashboard) ); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java index cd9e21f94..900383948 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAProjectCreated.java @@ -1,5 +1,7 @@ package net.serenitybdd.screenplay.jenkins; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; @@ -8,8 +10,6 @@ import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class HaveAProjectCreated implements Task { public static HaveAProjectCreated called(String name) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java index 0c421cb41..2480c2087 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveASuccessfulProjectCreated.java @@ -1,14 +1,14 @@ package net.serenitybdd.screenplay.jenkins; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScriptThat.Finishes_With_Success; - public class HaveASuccessfulProjectCreated implements Task { public static Task called(String name) { @@ -20,7 +20,7 @@ public static Task called(String name) { public void performAs(T actor) { actor.attemptsTo( HaveAProjectCreated.called(projectName).andConfiguredTo( - ExecuteAShellScript.that(Finishes_With_Success) + ExecuteAShellScript.that(ShellScriptThat.Finishes_With_Success) ), ScheduleABuild.of(projectName) ); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java index 72c1d1e91..184483dea 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/HaveAnExternalProjectCreated.java @@ -1,14 +1,14 @@ package net.serenitybdd.screenplay.jenkins; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.jenkins.tasks.CreateAnExternalProject; +import net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; -import static net.serenitybdd.screenplay.jenkins.user_interface.navigation.SidePanel.Back_to_Dashboard; - public class HaveAnExternalProjectCreated implements Task { public static HaveAnExternalProjectCreated called(String name) { @@ -20,7 +20,7 @@ public static HaveAnExternalProjectCreated called(String name) { public void performAs(T actor) { actor.attemptsTo( CreateAnExternalProject.called(projectName), - Click.on(Back_to_Dashboard) + Click.on(SidePanel.Back_to_Dashboard) ); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/JenkinsUser.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/JenkinsUser.java index e69a8b092..d322c06bb 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/JenkinsUser.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/JenkinsUser.java @@ -1,8 +1,7 @@ package net.serenitybdd.screenplay.jenkins; -import net.serenitybdd.screenplay.Actor; - import java.util.UUID; +import net.serenitybdd.screenplay.Actor; public class JenkinsUser extends Actor { public static JenkinsUser named(String username) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java index 3267da209..15a7cdfde 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/Choose.java @@ -1,12 +1,12 @@ package net.serenitybdd.screenplay.jenkins.actions; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.targets.Target; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class Choose implements Interaction { public static Interaction the(Target radioButton) { return instrumented(Choose.class, radioButton); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java index 37be30b06..5386b03bb 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/actions/EnterCode.java @@ -1,5 +1,9 @@ package net.serenitybdd.screenplay.jenkins.actions; +import static net.serenitybdd.screenplay.Tasks.instrumented; + +import java.util.Arrays; +import java.util.List; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.actions.Click; @@ -7,14 +11,9 @@ import net.serenitybdd.screenplayx.actions.Evaluate; import net.thucydides.core.annotations.Step; -import java.util.List; - -import static java.util.Arrays.asList; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class EnterCode { public static EnterCode asFollows(String... lines) { - return new EnterCode(asList(lines)); + return new EnterCode(Arrays.asList(lines)); } public Interaction intoTheCodeMirror(Target editorField) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Button.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Button.java index 1d4df1e0e..3c3c26d1f 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Button.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Button.java @@ -2,11 +2,9 @@ import net.serenitybdd.screenplay.targets.Target; -import static java.lang.String.format; - public class Button { public static Target called(String text) { - return Target.the(format("the '%s' button", text)) + return Target.the(String.format("the '%s' button", text)) .locatedBy("//button[contains(.,'{0}')]") .of(text); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Input.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Input.java index b3dbda7e2..19adebd34 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Input.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Input.java @@ -2,11 +2,9 @@ import net.serenitybdd.screenplay.targets.Target; -import static java.lang.String.format; - public class Input { public static Target named(String name) { - return Target.the(format("the '%s' input", name)) + return Target.the(String.format("the '%s' input", name)) .locatedBy("//input[@name='{0}']") .of(name); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Label.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Label.java index cfe30f8f6..8abe16f32 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Label.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Label.java @@ -2,11 +2,9 @@ import net.serenitybdd.screenplay.targets.Target; -import static java.lang.String.format; - public class Label { public static Target called(String text) { - return Target.the(format("the '%s' label", text)) + return Target.the(String.format("the '%s' label", text)) .locatedBy("//label[contains(.,'{0}')]") .of(text); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Link.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Link.java index b15416e48..eb8195ea2 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Link.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/targets/Link.java @@ -2,15 +2,13 @@ import net.serenitybdd.screenplay.targets.Target; -import static java.lang.String.format; - public class Link { public static Target called(String text) { return to(text); } public static Target to(String text) { - return Target.the(format("the '%s' link", text)) + return Target.the(String.format("the '%s' link", text)) .locatedBy("//a[contains(., '{0}')]") .of(text); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java index 00d7b417f..cab915b16 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAFreestyleProject.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class CreateAFreestyleProject implements Task { public static CreateAFreestyleProject called(String name) { return instrumented(CreateAFreestyleProject.class, name); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java index 3b2f69727..895359ce8 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAPipelineProject.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks; -import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.TodoList; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class CreateAPipelineProject implements Task { public static CreateAPipelineProject called(String name) { return instrumented(CreateAPipelineProject.class, name); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java index 73005ff7f..b676ec0fa 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAProject.java @@ -1,5 +1,7 @@ package net.serenitybdd.screenplay.jenkins.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; @@ -13,8 +15,6 @@ import net.serenitybdd.screenplayx.actions.Scroll; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - class CreateAProject implements Task { public static CreateAProject called(String name) { return instrumented(CreateAProject.class, name); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java index e983072d3..f26063e65 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/CreateAnExternalProject.java @@ -1,12 +1,12 @@ package net.serenitybdd.screenplay.jenkins.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.user_interface.NewJobPage; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class CreateAnExternalProject implements Task { public static CreateAnExternalProject called(String name) { return instrumented(CreateAnExternalProject.class, name); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java index 52644abdd..feb574166 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/GoBack.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; import net.serenitybdd.screenplay.jenkins.user_interface.navigation.Breadcrumbs; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class GoBack implements Task { public static Task to(String target) { return instrumented(GoBack.class, target); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java index d32fb1c5d..73f1c2885 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/LogIn.java @@ -1,5 +1,7 @@ package net.serenitybdd.screenplay.jenkins.tasks; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; @@ -9,8 +11,6 @@ import net.serenitybdd.screenplay.jenkins.user_interface.LogInForm; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class LogIn implements Task { public static LogIn as(JenkinsUser actor) { return instrumented(LogIn.class, actor); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java index 681340f7c..a3fd12171 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/ScheduleABuild.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks; -import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Click; +import net.serenitybdd.screenplay.jenkins.user_interface.JenkinsHomePage; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class ScheduleABuild implements Task { public static Task of(String project) { return instrumented(ScheduleABuild.class, project); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/TodoList.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/TodoList.java index bacb06fcc..18555bebb 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/TodoList.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/TodoList.java @@ -1,14 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration; -import net.serenitybdd.screenplay.Actor; -import net.serenitybdd.screenplay.Performable; -import net.serenitybdd.screenplay.Task; +import static net.serenitybdd.screenplay.Tasks.instrumented; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; - -import static java.util.Arrays.asList; -import static net.serenitybdd.screenplay.Tasks.instrumented; +import net.serenitybdd.screenplay.Actor; +import net.serenitybdd.screenplay.Performable; +import net.serenitybdd.screenplay.Task; public class TodoList implements Task { public static TodoList empty() { @@ -22,7 +21,7 @@ public TodoList add(T task) { } public TodoList addAll(T... tasks) { - todos.addAll(asList(tasks)); + todos.addAll(Arrays.asList(tasks)); return this; } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java index e89117fa6..82b210e5d 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/AddAGroovyPostbuildScript.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps; -import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.GroovyPostBuildStep; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.actions.Enter; +import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.GroovyPostBuildStep; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class AddAGroovyPostbuildScript implements Task { public static Task that(GroovyScript expectedOutcome) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java index 3b41a03ee..14c0d97b4 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ExecuteAShellScript.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps; -import net.serenitybdd.screenplay.jenkins.actions.EnterCode; -import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.ShellBuildStep; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; +import net.serenitybdd.screenplay.jenkins.actions.EnterCode; +import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.ShellBuildStep; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class ExecuteAShellScript implements Task { public static Task that(ShellScript expectedOutcome) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/GroovyScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/GroovyScript.java index 2985e74a8..e5ec2b537 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/GroovyScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/GroovyScript.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import static java.util.Arrays.asList; - public class GroovyScript { public static GroovyScript that(String descriptionOfScriptsBehaviour) { @@ -19,7 +17,7 @@ public GroovyScript separatedBy(String lineSeparator) { } public GroovyScript definedAs(String... lines) { - return this.definedAs(asList(lines)); + return this.definedAs(Arrays.asList(lines)); } public GroovyScript definedAs(List lines) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java index f4cfa93cf..507ae5a0a 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/SetPipelineDefinition.java @@ -1,13 +1,13 @@ package net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps; +import static net.serenitybdd.screenplay.Tasks.instrumented; + import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Task; import net.serenitybdd.screenplay.jenkins.actions.EnterCode; import net.serenitybdd.screenplay.jenkins.user_interface.project_configuration.build_steps.PipelineDefinition; import net.thucydides.core.annotations.Step; -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class SetPipelineDefinition implements Task { public static Task asFollows(String pipelineDefintion) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ShellScript.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ShellScript.java index ff61a97c5..f9d682939 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ShellScript.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/tasks/configuration/build_steps/ShellScript.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import static java.util.Arrays.asList; - public class ShellScript { public static ShellScript that(String descriptionOfScriptsBehaviour) { @@ -13,7 +11,7 @@ public static ShellScript that(String descriptionOfScriptsBehaviour) { } public ShellScript definedAs(String... lines) { - return this.definedAs(asList(lines)); + return this.definedAs(Arrays.asList(lines)); } public ShellScript definedAs(List lines) { diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java index 1de4934fa..2e473a04d 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Breadcrumbs.java @@ -2,14 +2,12 @@ import net.serenitybdd.screenplay.targets.Target; -import static java.lang.String.format; - public class Breadcrumbs { // Breadcrumb has been renamed Dashboard in newer Jenkins public static final Target Jenkins_Link = Target.the("the 'Jenkins' link").locatedBy("//a[./text()='Jenkins' or ./text()='Dashboard']"); public static Target linkTo(String name) { - return Target.the(format("the '%s' breadcrumb link", name)) + return Target.the(String.format("the '%s' breadcrumb link", name)) .locatedBy("//ul[@id='breadcrumbs']//a[contains(., '{0}')]") .of(name); } diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java index 8be65528b..3ae54c699 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/Buttons.java @@ -1,7 +1,7 @@ package net.serenitybdd.screenplay.jenkins.user_interface.navigation; -import net.serenitybdd.screenplay.targets.Target; import net.serenitybdd.screenplay.jenkins.targets.Button; +import net.serenitybdd.screenplay.targets.Target; public class Buttons { public static final Target Create = Target.the("the 'Create' button").locatedBy("//input[@name='Submit' and @value='Create']"); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/SidePanel.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/SidePanel.java index 75aee8e85..d0ff6835b 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/SidePanel.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplay/jenkins/user_interface/navigation/SidePanel.java @@ -1,7 +1,7 @@ package net.serenitybdd.screenplay.jenkins.user_interface.navigation; -import net.serenitybdd.screenplay.targets.Target; import net.serenitybdd.screenplay.jenkins.targets.Link; +import net.serenitybdd.screenplay.targets.Target; public class SidePanel { public static final Target New_Item_Link = Link.to("New Item"); diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java index b5e41f383..cd4f65761 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/Navigate.java @@ -1,13 +1,12 @@ package net.serenitybdd.screenplayx.actions; +import static net.serenitybdd.screenplay.Tasks.instrumented; + +import java.net.URL; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import java.net.URL; - -import static net.serenitybdd.screenplay.Tasks.instrumented; - public class Navigate implements Interaction { private final URL destination; diff --git a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java index dae6dbb83..a58f690ce 100644 --- a/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java +++ b/build-monitor-acceptance/src/main/java/net/serenitybdd/screenplayx/actions/ScrollToTarget.java @@ -1,12 +1,10 @@ package net.serenitybdd.screenplayx.actions; +import java.util.HashMap; +import java.util.Map; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.Interaction; import net.serenitybdd.screenplay.targets.Target; - -import java.util.HashMap; -import java.util.Map; - import org.openqa.selenium.WebElement; public class ScrollToTarget implements Interaction { diff --git a/build-monitor-acceptance/src/test/java/environment/JenkinsSandbox.java b/build-monitor-acceptance/src/test/java/environment/JenkinsSandbox.java index 9c9a59b15..dd91949b9 100644 --- a/build-monitor-acceptance/src/test/java/environment/JenkinsSandbox.java +++ b/build-monitor-acceptance/src/test/java/environment/JenkinsSandbox.java @@ -1,12 +1,5 @@ package environment; -import net.serenitybdd.integration.jenkins.JenkinsInstance; -import net.serenitybdd.integration.jenkins.TestEnvironment; -import net.serenitybdd.integration.jenkins.environment.CWD; -import net.serenitybdd.integration.jenkins.environment.PluginDescription; -import net.serenitybdd.integration.jenkins.environment.rules.FindFreePort; -import net.serenitybdd.integration.jenkins.environment.rules.SandboxJenkinsHome; - import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -14,12 +7,16 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Stream; - -import static java.lang.System.getProperty; +import net.serenitybdd.integration.jenkins.JenkinsInstance; +import net.serenitybdd.integration.jenkins.TestEnvironment; +import net.serenitybdd.integration.jenkins.environment.CWD; +import net.serenitybdd.integration.jenkins.environment.PluginDescription; +import net.serenitybdd.integration.jenkins.environment.rules.FindFreePort; +import net.serenitybdd.integration.jenkins.environment.rules.SandboxJenkinsHome; public class JenkinsSandbox { public static TestEnvironment configure() { - CWD cwd = CWD.or(getProperty("project.root")); + CWD cwd = CWD.or(System.getProperty("project.root")); List descriptions = new ArrayList<>(); descriptions.add( diff --git a/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java b/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java index 30fc00323..dd54821ec 100644 --- a/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java +++ b/build-monitor-acceptance/src/test/java/features/BuildMonitorAcceptanceTest.java @@ -1,17 +1,15 @@ package features; import environment.JenkinsSandbox; +import java.util.List; import net.serenitybdd.integration.jenkins.JenkinsInstance; import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; import net.serenitybdd.junit.runners.SerenityRunner; import net.thucydides.core.annotations.Managed; - import org.junit.Rule; import org.junit.runner.RunWith; import org.openqa.selenium.WebDriver; -import java.util.List; - @RunWith(SerenityRunner.class) public abstract class BuildMonitorAcceptanceTest { diff --git a/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java b/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java index eaa3a3c79..2c4623c00 100644 --- a/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java +++ b/build-monitor-acceptance/src/test/java/features/BuildMonitorShouldBeEasyToSetUp.java @@ -1,22 +1,21 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.jenkins.HaveAProjectCreated; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplayx.actions.Navigate; import net.thucydides.core.annotations.Title; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; -import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; -import static net.serenitybdd.screenplay.GivenWhenThen.then; -import static net.serenitybdd.screenplay.GivenWhenThen.when; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isCurrentlyVisible; - public class BuildMonitorShouldBeEasyToSetUp extends BuildMonitorAcceptanceTest { Actor anna = Actor.named("Anna"); @@ -37,6 +36,6 @@ public void adding_project_to_an_empty_build_monitor() { when(anna).attemptsTo(HaveABuildMonitorViewCreated.showingAllTheProjects()); - then(anna).should(seeThat(ProjectWidget.of("My Awesome App").state(), isCurrentlyVisible())); + then(anna).should(seeThat(ProjectWidget.of("My Awesome App").state(), WebElementStateMatchers.isCurrentlyVisible())); } } diff --git a/build-monitor-acceptance/src/test/java/features/ProjectStatusShouldBeEasyToDetermine.java b/build-monitor-acceptance/src/test/java/features/ProjectStatusShouldBeEasyToDetermine.java index a6cc72ca5..084fbb451 100644 --- a/build-monitor-acceptance/src/test/java/features/ProjectStatusShouldBeEasyToDetermine.java +++ b/build-monitor-acceptance/src/test/java/features/ProjectStatusShouldBeEasyToDetermine.java @@ -1,5 +1,12 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + +import com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus; import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import net.serenitybdd.screenplay.Actor; @@ -7,15 +14,9 @@ import net.serenitybdd.screenplay.jenkins.HaveAFailingProjectCreated; import net.serenitybdd.screenplay.jenkins.HaveASuccessfulProjectCreated; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers.displaysProjectStatusAs; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus.Failing; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus.Successful; -import static net.serenitybdd.screenplay.GivenWhenThen.*; - public class ProjectStatusShouldBeEasyToDetermine extends BuildMonitorAcceptanceTest { private Actor anna = Actor.named("Anna"); @@ -36,7 +37,7 @@ public void visualising_a_successful_project() { when(anna).attemptsTo(HaveABuildMonitorViewCreated.showingAllTheProjects()); then(anna).should(seeThat(ProjectWidget.of("My App").information(), - displaysProjectStatusAs(Successful) + ProjectInformationMatchers.displaysProjectStatusAs(ProjectStatus.Successful) )); } @@ -51,7 +52,7 @@ public void visualising_a_failing_project() { when(anna).attemptsTo(HaveABuildMonitorViewCreated.showingAllTheProjects()); then(anna).should(seeThat(ProjectWidget.of("My App").information(), - displaysProjectStatusAs(Failing) + ProjectInformationMatchers.displaysProjectStatusAs(ProjectStatus.Failing) )); } } diff --git a/build-monitor-acceptance/src/test/java/features/ShouldDescribeEachProject.java b/build-monitor-acceptance/src/test/java/features/ShouldDescribeEachProject.java index 469140a9c..2bf01e808 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldDescribeEachProject.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldDescribeEachProject.java @@ -1,5 +1,11 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; +import static org.hamcrest.Matchers.is; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import hudson.plugins.descriptionsetter.tasks.SetBuildDescription; @@ -10,13 +16,9 @@ import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScript; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static org.hamcrest.Matchers.is; - public class ShouldDescribeEachProject extends BuildMonitorAcceptanceTest { private Actor dave = Actor.named("Dave"); diff --git a/build-monitor-acceptance/src/test/java/features/ShouldDisplayBadges.java b/build-monitor-acceptance/src/test/java/features/ShouldDisplayBadges.java index 8d620d4ae..04d409b9f 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldDisplayBadges.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldDisplayBadges.java @@ -1,5 +1,10 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.CreateABuildMonitorView; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HideBadges; @@ -13,20 +18,13 @@ import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.jenkins.HaveAPipelineProjectCreated; import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.GroovyScriptThat; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.SetPipelineDefinition; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; -import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; -import static net.serenitybdd.screenplay.GivenWhenThen.then; -import static net.serenitybdd.screenplay.GivenWhenThen.when; -import static net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.GroovyScriptThat.Adds_A_Badge; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isCurrentlyVisible; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isNotCurrentlyVisible; - public class ShouldDisplayBadges extends BuildMonitorAcceptanceTest { Actor paul = Actor.named("Paul"); @@ -41,7 +39,7 @@ public void user_displaying_build_badges() { givenThat(paul).wasAbleTo( Navigate.to(jenkins.url()), HaveAPipelineProjectCreated.called("My App").andConfiguredTo( - SetPipelineDefinition.asFollows(Adds_A_Badge.code()) + SetPipelineDefinition.asFollows(GroovyScriptThat.Adds_A_Badge.code()) ), ScheduleABuild.of("My App"), @@ -55,7 +53,7 @@ public void user_displaying_build_badges() { when(paul).attemptsTo(ModifyControlPanelOptions.to(ShowBadges.onTheDashboard())); then(paul).should(seeThat(ProjectWidget.of("My App").badges(), - isCurrentlyVisible() + WebElementStateMatchers.isCurrentlyVisible() )); } @@ -64,7 +62,7 @@ public void always_displaying_build_badges() { givenThat(paul).wasAbleTo( Navigate.to(jenkins.url()), HaveAPipelineProjectCreated.called("My App").andConfiguredTo( - SetPipelineDefinition.asFollows(Adds_A_Badge.code()) + SetPipelineDefinition.asFollows(GroovyScriptThat.Adds_A_Badge.code()) ), ScheduleABuild.of("My App"), CreateABuildMonitorView.called("Build Monitor").andConfigureItTo( @@ -78,7 +76,7 @@ public void always_displaying_build_badges() { when(paul).attemptsTo(ModifyControlPanelOptions.to(HideBadges.onTheDashboard())); then(paul).should(seeThat(ProjectWidget.of("My App").badges(), - isCurrentlyVisible() + WebElementStateMatchers.isCurrentlyVisible() )); } @@ -87,7 +85,7 @@ public void never_displaying_build_badges() { givenThat(paul).wasAbleTo( Navigate.to(jenkins.url()), HaveAPipelineProjectCreated.called("My App").andConfiguredTo( - SetPipelineDefinition.asFollows(Adds_A_Badge.code()) + SetPipelineDefinition.asFollows(GroovyScriptThat.Adds_A_Badge.code()) ), ScheduleABuild.of("My App"), CreateABuildMonitorView.called("Build Monitor").andConfigureItTo( @@ -99,8 +97,8 @@ public void never_displaying_build_badges() { when(paul).attemptsTo(ModifyControlPanelOptions.to(ShowBadges.onTheDashboard())); - then(paul).should(seeThat(ProjectWidget.of("My App").badges(), - isNotCurrentlyVisible() + then(paul).should(seeThat(ProjectWidget.of("My App").badges(), + WebElementStateMatchers.isNotCurrentlyVisible() )); } } diff --git a/build-monitor-acceptance/src/test/java/features/ShouldDisplayConcurrentBuilds.java b/build-monitor-acceptance/src/test/java/features/ShouldDisplayConcurrentBuilds.java index e948f03ee..b14993535 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldDisplayConcurrentBuilds.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldDisplayConcurrentBuilds.java @@ -1,5 +1,11 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; +import static org.hamcrest.Matchers.is; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import net.serenitybdd.screenplay.Actor; @@ -10,13 +16,9 @@ import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ExecuteAShellScript; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.ShellScript; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static org.hamcrest.Matchers.is; - public class ShouldDisplayConcurrentBuilds extends BuildMonitorAcceptanceTest { private static String My_App = "My App"; diff --git a/build-monitor-acceptance/src/test/java/features/ShouldDisplayPipelineStage.java b/build-monitor-acceptance/src/test/java/features/ShouldDisplayPipelineStage.java index a41185cbd..8029c50d9 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldDisplayPipelineStage.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldDisplayPipelineStage.java @@ -1,5 +1,11 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; +import static org.hamcrest.Matchers.containsString; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import net.serenitybdd.screenplay.Actor; @@ -8,13 +14,9 @@ import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.SetPipelineDefinition; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static org.hamcrest.Matchers.containsString; - public class ShouldDisplayPipelineStage extends BuildMonitorAcceptanceTest { Actor donald = Actor.named("Donald"); diff --git a/build-monitor-acceptance/src/test/java/features/ShouldDisplayTestProgress.java b/build-monitor-acceptance/src/test/java/features/ShouldDisplayTestProgress.java index 8df6cdc89..733a29786 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldDisplayTestProgress.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldDisplayTestProgress.java @@ -1,25 +1,26 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.CreateABuildMonitorView; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayAllProjects; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayJunitRealtimeProgress; - import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.jenkins.HaveAPipelineProjectCreated; import net.serenitybdd.screenplay.jenkins.tasks.ScheduleABuild; import net.serenitybdd.screenplay.jenkins.tasks.configuration.Disable; +import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.GroovyScriptThat; import net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.SetPipelineDefinition; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static net.serenitybdd.screenplay.jenkins.tasks.configuration.build_steps.GroovyScriptThat.Pause_In_Middle_Of_Tests; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isCurrentlyVisible; - public class ShouldDisplayTestProgress extends BuildMonitorAcceptanceTest { Actor richard = Actor.named("Richard"); @@ -34,7 +35,7 @@ public void display_tests_progress_bar() { givenThat(richard).wasAbleTo( Navigate.to(jenkins.url()), HaveAPipelineProjectCreated.called("My Pipeline").andConfiguredTo( - SetPipelineDefinition.asFollows(Pause_In_Middle_Of_Tests.code()), + SetPipelineDefinition.asFollows(GroovyScriptThat.Pause_In_Middle_Of_Tests.code()), Disable.executingConcurrentBuilds() ), @@ -50,7 +51,7 @@ public void display_tests_progress_bar() { then(richard).should(seeThat(ProjectWidget.of("My Pipeline").testProgressBars(), - isCurrentlyVisible() + WebElementStateMatchers.isCurrentlyVisible() )); } diff --git a/build-monitor-acceptance/src/test/java/features/ShouldSupportCloudBeesFolders.java b/build-monitor-acceptance/src/test/java/features/ShouldSupportCloudBeesFolders.java index b6f6e63d6..85b611bf1 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldSupportCloudBeesFolders.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldSupportCloudBeesFolders.java @@ -1,5 +1,10 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + import com.cloudbees.hudson.plugins.folder.HaveAFolderCreated; import com.cloudbees.hudson.plugins.folder.HaveANestedProjectCreated; import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; @@ -8,14 +13,11 @@ import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.configuration.DisplayNestedProjects; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; +import net.serenitybdd.screenplay.matchers.WebElementStateMatchers; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static net.serenitybdd.screenplay.matchers.WebElementStateMatchers.isVisible; - public class ShouldSupportCloudBeesFolders extends BuildMonitorAcceptanceTest { Actor anna = Actor.named("Anna"); @@ -46,7 +48,7 @@ public void visualising_projects_nested_in_folders() { ) ); - then(anna).should(seeThat(ProjectWidget.of("Search Services » Librarian").state(), isVisible())); - then(anna).should(seeThat(ProjectWidget.of("Search Services » Contracts » Third Party System").state(), isVisible())); + then(anna).should(seeThat(ProjectWidget.of("Search Services » Librarian").state(), WebElementStateMatchers.isVisible())); + then(anna).should(seeThat(ProjectWidget.of("Search Services » Contracts » Third Party System").state(), WebElementStateMatchers.isVisible())); } } diff --git a/build-monitor-acceptance/src/test/java/features/ShouldSupportExternalProjects.java b/build-monitor-acceptance/src/test/java/features/ShouldSupportExternalProjects.java index 25e5ae6ff..b36a2a13f 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldSupportExternalProjects.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldSupportExternalProjects.java @@ -1,21 +1,23 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; + +import com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus; import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import net.serenitybdd.screenplay.Actor; import net.serenitybdd.screenplay.abilities.BrowseTheWeb; -import net.serenitybdd.screenplay.jenkins.HaveAnExternalProjectCreated; import net.serenitybdd.screenplay.interacting_with_jenkins_api.abilities.InteractWithJenkinsAPI; import net.serenitybdd.screenplay.interacting_with_jenkins_api.interactions.NotifyOfExternalProject; +import net.serenitybdd.screenplay.jenkins.HaveAnExternalProjectCreated; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers.displaysProjectStatusAs; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus.Successful; -import static net.serenitybdd.screenplay.GivenWhenThen.*; - public class ShouldSupportExternalProjects extends BuildMonitorAcceptanceTest { Actor maggie = Actor.named("Maggie"); @@ -40,7 +42,7 @@ public void visualising_an_external_project() { ); then(maggie).should(seeThat(ProjectWidget.of("external-project").information(), - displaysProjectStatusAs(Successful) + ProjectInformationMatchers.displaysProjectStatusAs(ProjectStatus.Successful) )); } } diff --git a/build-monitor-acceptance/src/test/java/features/ShouldTellWhatBrokeTheBuild.java b/build-monitor-acceptance/src/test/java/features/ShouldTellWhatBrokeTheBuild.java index 15c7fff89..8df4ccb9a 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldTellWhatBrokeTheBuild.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldTellWhatBrokeTheBuild.java @@ -1,5 +1,11 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; +import static org.hamcrest.Matchers.containsString; + import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import com.sonyericsson.jenkins.plugins.bfa.HaveAShellScriptFailureCauseDefined; @@ -7,13 +13,9 @@ import net.serenitybdd.screenplay.abilities.BrowseTheWeb; import net.serenitybdd.screenplay.jenkins.HaveAFailingProjectCreated; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static org.hamcrest.Matchers.containsString; - public class ShouldTellWhatBrokeTheBuild extends BuildMonitorAcceptanceTest { Actor dave = Actor.named("Dave"); diff --git a/build-monitor-acceptance/src/test/java/features/ShouldTellWhoIsFixingTheBrokenBuild.java b/build-monitor-acceptance/src/test/java/features/ShouldTellWhoIsFixingTheBrokenBuild.java index cd9a72bf1..21adc9878 100644 --- a/build-monitor-acceptance/src/test/java/features/ShouldTellWhoIsFixingTheBrokenBuild.java +++ b/build-monitor-acceptance/src/test/java/features/ShouldTellWhoIsFixingTheBrokenBuild.java @@ -1,9 +1,18 @@ package features; +import static net.serenitybdd.screenplay.GivenWhenThen.givenThat; +import static net.serenitybdd.screenplay.GivenWhenThen.seeThat; +import static net.serenitybdd.screenplay.GivenWhenThen.then; +import static net.serenitybdd.screenplay.GivenWhenThen.when; +import static org.hamcrest.core.Is.is; + +import com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers; +import com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus; import com.smartcodeltd.jenkinsci.plugins.build_monitor.questions.ProjectWidget; import com.smartcodeltd.jenkinsci.plugins.build_monitor.tasks.HaveABuildMonitorViewCreated; import hudson.plugins.claim.HaveAFailingClaimableProjectCreated; import hudson.plugins.claim.tasks.Claim; +import java.util.List; import net.serenitybdd.integration.jenkins.JenkinsInstance; import net.serenitybdd.integration.jenkins.environment.rules.ApplicativeTestRule; import net.serenitybdd.integration.jenkins.environment.rules.RegisterUserAccount; @@ -12,17 +21,9 @@ import net.serenitybdd.screenplay.jenkins.tasks.GoBack; import net.serenitybdd.screenplay.jenkins.tasks.LogIn; import net.serenitybdd.screenplayx.actions.Navigate; - import org.junit.Before; import org.junit.Test; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.matchers.ProjectInformationMatchers.displaysProjectStatusAs; -import static com.smartcodeltd.jenkinsci.plugins.build_monitor.model.ProjectStatus.Claimed; -import static net.serenitybdd.screenplay.GivenWhenThen.*; -import static org.hamcrest.core.Is.is; - -import java.util.List; - public class ShouldTellWhoIsFixingTheBrokenBuild extends BuildMonitorAcceptanceTest { JenkinsUser ben; @@ -51,7 +52,7 @@ public void claiming_a_broken_build() { GoBack.to("Build Monitor") ); - then(ben).should(seeThat(ProjectWidget.of("Responsibly Developed").information(), displaysProjectStatusAs(Claimed))); + then(ben).should(seeThat(ProjectWidget.of("Responsibly Developed").information(), ProjectInformationMatchers.displaysProjectStatusAs(ProjectStatus.Claimed))); then(ben).should(seeThat(ProjectWidget.of("Responsibly Developed").details(), is("Claimed by Ben: My bad, fixing now"))); } } diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java index f38eb25d5..754afdb1f 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptor.java @@ -4,13 +4,12 @@ import hudson.Util; import hudson.model.ViewDescriptor; import hudson.util.FormValidation; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; import net.sf.json.JSONObject; import org.kohsuke.stapler.QueryParameter; import org.kohsuke.stapler.StaplerRequest; -import java.util.regex.Pattern; -import java.util.regex.PatternSyntaxException; - public final class BuildMonitorDescriptor extends ViewDescriptor { public BuildMonitorDescriptor() { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorLogger.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorLogger.java index ab217c893..80dcb6652 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorLogger.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorLogger.java @@ -3,8 +3,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import static java.util.logging.Level.*; - public class BuildMonitorLogger { private final String className; @@ -13,19 +11,19 @@ public static BuildMonitorLogger forClass(Class sourceClass) { } public void debug(String sourceMethod, String template, Object... arguments) { - log(FINEST, sourceMethod, template, arguments); + log(Level.FINEST, sourceMethod, template, arguments); } public void info(String sourceMethod, String template, Object... arguments) { - log(INFO, sourceMethod, template, arguments); + log(Level.INFO, sourceMethod, template, arguments); } public void warning(String sourceMethod, String template, Object... arguments) { - log(WARNING, sourceMethod, template, arguments); + log(Level.WARNING, sourceMethod, template, arguments); } public void error(String sourceMethod, String template, Object... arguments) { - log(SEVERE, sourceMethod, template, arguments); + log(Level.SEVERE, sourceMethod, template, arguments); } diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java index ba87ab1de..ee8a8a930 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorView.java @@ -30,24 +30,22 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobViews; import hudson.Extension; +import hudson.Util; import hudson.model.Descriptor.FormException; import hudson.model.Job; -import hudson.model.View; import hudson.model.ListView; +import hudson.model.View; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import javax.servlet.ServletException; import jenkins.model.Jenkins; import net.sf.json.JSONObject; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.bind.JavaScriptMethod; -import javax.servlet.ServletException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; - -import static hudson.Util.filter; - /** * @author Jan Molak */ @@ -228,7 +226,7 @@ private List jobViews() { //A little bit of evil to make the type system happy. @SuppressWarnings({ "unchecked", "rawtypes" }) - List> projects = new ArrayList(filter(super.getItems(), Job.class)); + List> projects = new ArrayList(Util.filter(super.getItems(), Job.class)); List jobs = new ArrayList<>(); projects.sort(currentConfig().getOrder()); diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/Config.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/Config.java index 087fa56e7..de2546228 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/Config.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/Config.java @@ -1,10 +1,9 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.order.ByName; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.build.GetBuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.build.GetLastBuild; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.order.ByName; import hudson.model.Job; - import java.util.Comparator; import java.util.Optional; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Respond.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Respond.java index 586bc9e0e..8135b2bf1 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Respond.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Respond.java @@ -1,17 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.api; import com.fasterxml.jackson.databind.ObjectMapper; -import net.sf.json.JSONObject; - import java.io.IOException; - -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.api.Success.successful; -import static net.sf.json.JSONSerializer.toJSON; +import net.sf.json.JSONObject; +import net.sf.json.JSONSerializer; public class Respond { private static ObjectMapper mapper = new ObjectMapper(); public static JSONObject withSuccess(T responseData) throws IOException { - return (JSONObject) toJSON(mapper.writeValueAsString(successful(responseData))); + return (JSONObject) JSONSerializer.toJSON(mapper.writeValueAsString(Success.successful(responseData))); } } diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Success.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Success.java index 1ce4042a9..181e9c205 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Success.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/api/Success.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.api; import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsAbstractBuild.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsAbstractBuild.java index 0cf220a64..432dd69bb 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsAbstractBuild.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsAbstractBuild.java @@ -1,12 +1,10 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.culprits; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import hudson.model.AbstractBuild; import hudson.model.Run; import hudson.model.User; import hudson.scm.ChangeLogSet; - import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsNotImplemented.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsNotImplemented.java index cbd081282..723f1177a 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsNotImplemented.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsNotImplemented.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.culprits; import hudson.model.Run; - import java.util.Set; public class BuildCulpritsNotImplemented extends BuildCulpritsRetriever { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsRetriever.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsRetriever.java index 53bad6cbf..6ac43e0de 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsRetriever.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsRetriever.java @@ -5,7 +5,6 @@ import hudson.model.AbstractBuild; import hudson.model.Cause; import hudson.model.Run; - import java.util.Set; /** diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsWorkflowRun.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsWorkflowRun.java index 024fb2c05..0d11c83ca 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsWorkflowRun.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/culprits/BuildCulpritsWorkflowRun.java @@ -2,13 +2,12 @@ import hudson.model.Result; import hudson.model.Run; -import org.jenkinsci.plugins.workflow.job.WorkflowRun; - import java.util.Objects; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.jenkinsci.plugins.workflow.job.WorkflowRun; class BuildCulpritsWorkflowRun extends BuildCulpritsRetriever { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallation.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallation.java index b82386726..6bffa2b40 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallation.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallation.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.installation; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; - import org.apache.commons.codec.digest.DigestUtils; public class BuildMonitorInstallation { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByDisplayName.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByDisplayName.java index ca5128f17..7ee4ec706 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByDisplayName.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByDisplayName.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.order; import hudson.model.Job; - import java.io.Serializable; import java.util.Comparator; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByEstimatedDuration.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByEstimatedDuration.java index 34d82d0d2..9892d72cc 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByEstimatedDuration.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByEstimatedDuration.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.order; import hudson.model.AbstractProject; - import java.io.Serializable; import java.util.Comparator; import java.util.List; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByFullName.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByFullName.java index 65d41c577..15f1d65f7 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByFullName.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByFullName.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.order; import hudson.model.Job; - import java.io.Serializable; import java.util.Comparator; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByLastBuildTime.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByLastBuildTime.java index 247fad41a..333e5f6cb 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByLastBuildTime.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByLastBuildTime.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.order; import hudson.model.Job; - import java.io.Serializable; import java.util.Comparator; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByName.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByName.java index 8cb589e3d..a0ac94846 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByName.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByName.java @@ -1,7 +1,6 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.order; import hudson.model.Job; - import java.io.Serializable; import java.util.Comparator; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByStatus.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByStatus.java index 8281c3475..95b904cef 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByStatus.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/order/ByStatus.java @@ -3,7 +3,6 @@ import hudson.model.Job; import hudson.model.Result; import hudson.model.Run; - import java.io.Serializable; import java.util.Comparator; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelper.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelper.java index 2a1fe2ca9..f9ff37874 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelper.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelper.java @@ -2,11 +2,10 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; import hudson.model.Run; +import java.util.List; import org.jenkinsci.plugins.workflow.flow.FlowExecution; import org.jenkinsci.plugins.workflow.job.WorkflowRun; -import java.util.List; - public class PipelineHelper { private static final String PIPELINE_PLUGIN = "workflow-job"; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/WorkflowNodeTraversal.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/WorkflowNodeTraversal.java index 17fd97efa..3e062777a 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/WorkflowNodeTraversal.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/WorkflowNodeTraversal.java @@ -1,12 +1,11 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.pipeline; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Collection; import org.jenkinsci.plugins.workflow.cps.nodes.StepStartNode; import org.jenkinsci.plugins.workflow.graph.FlowNode; import org.jenkinsci.plugins.workflow.support.steps.StageStep; -import java.util.Collection; - public class WorkflowNodeTraversal extends BreadthFirstNodeTraversal { @Override diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Lister.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Lister.java index 175fc34ed..d5ac794e6 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Lister.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Lister.java @@ -2,8 +2,6 @@ import java.util.List; -import static java.lang.String.format; - public class Lister { private static final String DEFAULT_NO_ITEMS_TEMPLATE = "%s"; @@ -30,7 +28,7 @@ public static String asString(List items) { // -- private static String formatted(String template, List items) { - return format(template, asString(items)); + return String.format(template, asString(items)); } private static String asString(String acc, List tail) { @@ -42,11 +40,11 @@ private static String asString(String acc, List tail) { } private static String and(String first, String second) { - return format("%s and %s", first, second); + return String.format("%s and %s", first, second); } private static String comma(String first, String second) { - return format("%s, %s", first, second); + return String.format("%s, %s", first, second); } private static String headOf(List items) { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Pluraliser.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Pluraliser.java index 91bfa1149..0d0c8e568 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Pluraliser.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/readability/Pluraliser.java @@ -1,10 +1,8 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability; -import static java.lang.String.format; - public class Pluraliser { public static String pluralise(String template, int count) { - return format(template, count); + return String.format(template, count); } public static String pluralise(String singularTemplate, String pluralTemplate, int count) { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildView.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildView.java index 8cc7886a1..480fa2262 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildView.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildView.java @@ -7,8 +7,9 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.Duration; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.DurationInMilliseconds; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.HumanReadableDuration; -import hudson.model.*; - +import hudson.model.Action; +import hudson.model.Result; +import hudson.model.Run; import java.util.Date; import java.util.List; import java.util.Optional; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewModel.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewModel.java index e79a1e569..ccba3ec9c 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewModel.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewModel.java @@ -3,7 +3,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.Duration; import hudson.model.Action; import hudson.model.Result; - import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildingPredicate.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildingPredicate.java index 1f9c4c922..34ed61997 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildingPredicate.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildingPredicate.java @@ -2,7 +2,6 @@ import edu.umd.cs.findbugs.annotations.Nullable; import hudson.model.Run; - import java.util.function.Predicate; public final class BuildingPredicate implements Predicate> { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/CssStatus.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/CssStatus.java index 61a85dc2f..3048f0b0c 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/CssStatus.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/CssStatus.java @@ -1,23 +1,19 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel; import hudson.model.Result; - import java.util.Map; -import static hudson.model.Result.*; - /** * @author Jan Molak */ public class CssStatus { - private static final Map statuses = - Map.of( - SUCCESS, "successful", - UNSTABLE, "unstable", - FAILURE, "failing", - NOT_BUILT, "unknown", - ABORTED, "aborted"); + private static final Map statuses = Map.of( + Result.SUCCESS, "successful", + Result.UNSTABLE, "unstable", + Result.FAILURE, "failing", + Result.NOT_BUILT, "unknown", + Result.ABORTED, "aborted"); public static String of(final JobView job) { Result result = job.lastResult(); diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobView.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobView.java index 8b8ff258b..6a86e41d4 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobView.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobView.java @@ -8,14 +8,11 @@ import hudson.model.Result; import hudson.model.Run; import hudson.util.RunList; - import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Objects; -import static java.lang.String.format; - /** * @author Jan Molak */ @@ -54,7 +51,7 @@ public F which(Class requestedFeature) { } } - throw new RuntimeException(format("%s is not a feature of this project: '%s'", requestedFeature.getSimpleName(), job.getName())); + throw new RuntimeException(String.format("%s is not a feature of this project: '%s'", requestedFeature.getSimpleName(), job.getName())); } public String name() { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewSerialiser.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewSerialiser.java index f41a5049e..6ded4b459 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewSerialiser.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewSerialiser.java @@ -1,10 +1,9 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.Feature; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; - +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.Feature; import java.io.IOException; /** diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViews.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViews.java index 218fb9ab6..a8704b7ca 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViews.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViews.java @@ -2,13 +2,20 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.Config.DisplayOptions; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.*; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.CanBeClaimed; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.CanBeDiagnosedForProblems; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.Feature; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasBadgesBadgePlugin; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasConfig; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasHeadline; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasJunitRealtime; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.KnowsCurrentBuildsDetails; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.KnowsLastCompletedBuildDetails; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; import hudson.model.Job; -import org.jenkinsci.plugins.workflow.job.WorkflowJob; - import java.util.ArrayList; import java.util.List; +import org.jenkinsci.plugins.workflow.job.WorkflowJob; /** * @author Jan Molak diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/NullBuildView.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/NullBuildView.java index ff668f00f..390ce48f7 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/NullBuildView.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/NullBuildView.java @@ -3,7 +3,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.Duration; import hudson.model.Action; import hudson.model.Result; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimed.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimed.java index 023f318e9..4f061972a 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimed.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimed.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import hudson.plugins.claim.ClaimBuildAction; - import java.util.Optional; public class CanBeClaimed implements Feature { diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblems.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblems.java index 7bf7beacd..c450f0e30 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblems.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblems.java @@ -5,7 +5,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseBuildAction; import com.sonyericsson.jenkins.plugins.bfa.model.FoundFailureCause; - import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePlugin.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePlugin.java index 75b2cb9b0..8b7b3ed80 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePlugin.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePlugin.java @@ -1,16 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; +import com.jenkinsci.plugins.badge.action.BadgeAction; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.Predicate; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; -import com.jenkinsci.plugins.badge.action.BadgeAction; - /** * @author Daniel Beland */ diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasConfig.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasConfig.java index 13fc204b2..593d6d41a 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasConfig.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasConfig.java @@ -1,8 +1,7 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - import com.fasterxml.jackson.annotation.JsonProperty; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; public class HasConfig implements Feature { private final com.smartcodeltd.jenkinsci.plugins.buildmonitor.Config config; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadline.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadline.java index 82e4f6c68..aeee8e06a 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadline.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadline.java @@ -1,8 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.*; - +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.CandidateHeadline; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.Headline; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineOfAborted; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineOfExecuting; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineOfFailing; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineOfFixed; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.NoHeadline; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtime.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtime.java index f6f99989e..2632bb7ef 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtime.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtime.java @@ -1,15 +1,13 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonValue; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.BuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.Predicate; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonValue; import org.jenkinsci.plugins.junitrealtimetestreporter.AbstractRealtimeTestResultAction; import org.jenkinsci.plugins.junitrealtimetestreporter.TestProgress; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetails.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetails.java index 462f1882a..beb848dce 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetails.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetails.java @@ -5,7 +5,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.BuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.duration.Duration; - import java.util.ArrayList; import java.util.List; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfAborted.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfAborted.java index e755b88c2..feb673bb1 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfAborted.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfAborted.java @@ -4,13 +4,10 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import hudson.model.Result; import hudson.model.User; +import java.util.Optional; import jenkins.model.CauseOfInterruption; import jenkins.model.InterruptedBuildAction; -import java.util.Optional; - -import static java.lang.String.format; - /** * @author Jan Molak */ @@ -41,7 +38,7 @@ private String text(BuildViewModel build) { Optional username = userResponsibleFor(interruption.get()); if (username.isPresent()) { - return format("Execution aborted by %s", username.get()); + return String.format("Execution aborted by %s", username.get()); } } diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfExecuting.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfExecuting.java index d626258ec..0f04de614 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfExecuting.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfExecuting.java @@ -3,7 +3,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Lister; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.BuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - import java.util.ArrayList; import java.util.HashSet; import java.util.Set; diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFailing.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFailing.java index c571512b8..a2b54e392 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFailing.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFailing.java @@ -4,7 +4,7 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Pluraliser; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.BuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - +import hudson.model.Result; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -12,10 +12,6 @@ import java.util.NoSuchElementException; import java.util.Set; -import static hudson.model.Result.FAILURE; -import static hudson.model.Result.SUCCESS; -import static hudson.model.Result.UNSTABLE; - public class HeadlineOfFailing implements CandidateHeadline { private final JobView job; @@ -28,7 +24,7 @@ public HeadlineOfFailing(JobView job, HeadlineConfig config) { @Override public boolean isApplicableTo(JobView job) { - return FAILURE.equals(job.lastCompletedBuild().result()) || UNSTABLE.equals(job.lastCompletedBuild().result()); + return Result.FAILURE.equals(job.lastCompletedBuild().result()) || Result.UNSTABLE.equals(job.lastCompletedBuild().result()); } @Override @@ -68,7 +64,7 @@ private List failedBuildsSince(BuildViewModel build) { List failedBuilds = new ArrayList<>(); - while (! SUCCESS.equals(currentBuild.result())) { + while (! Result.SUCCESS.equals(currentBuild.result())) { if (! currentBuild.isRunning()) { failedBuilds.add(currentBuild); diff --git a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFixed.java b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFixed.java index 1449238b9..881b7163d 100644 --- a/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFixed.java +++ b/build-monitor-plugin/src/main/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/headline/HeadlineOfFixed.java @@ -3,13 +3,11 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Lister; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.BuildViewModel; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - +import hudson.model.Result; import java.util.HashSet; import java.util.LinkedList; import java.util.Set; -import static hudson.model.Result.*; - public class HeadlineOfFixed implements CandidateHeadline { private final JobView job; @@ -40,12 +38,12 @@ private String textFor(BuildViewModel lastBuild) { } private boolean didTheJobJustGetFixedWith(BuildViewModel build) { - return SUCCESS.equals(build.result()) && previousFailed(build); + return Result.SUCCESS.equals(build.result()) && previousFailed(build); } private boolean previousFailed(BuildViewModel build) { return build.hasPreviousBuild() && - (FAILURE.equals(build.previousBuild().result()) || UNSTABLE.equals(build.previousBuild().result()) || ABORTED.equals(build.previousBuild().result())); + (Result.FAILURE.equals(build.previousBuild().result()) || Result.UNSTABLE.equals(build.previousBuild().result()) || Result.ABORTED.equals(build.previousBuild().result())); } private Set committersOf(BuildViewModel build) { diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptorTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptorTest.java index cc2cec78d..738b59e5e 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptorTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/BuildMonitorDescriptorTest.java @@ -1,5 +1,10 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Loops.asFollows; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + import hudson.util.FormValidation; import org.apache.commons.lang.StringEscapeUtils; import org.junit.Before; @@ -7,13 +12,6 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Loops.asFollows; -import static hudson.util.FormValidation.Kind.ERROR; -import static hudson.util.FormValidation.Kind.OK; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; - public class BuildMonitorDescriptorTest { private BuildMonitorDescriptor validator; @@ -28,7 +26,7 @@ public void setUp() { @Test public void form_validator_should_allow_valid_reg_ex_specifying_what_jobs_to_include() { for (String regex : asFollows(null, "", ".*", "myproject-.*")) { - assertThat(itShouldAllow(regex), validator.doCheckIncludeRegex(regex).kind, is(OK)); + assertThat(itShouldAllow(regex), validator.doCheckIncludeRegex(regex).kind, is(FormValidation.Kind.OK)); } } @@ -36,7 +34,7 @@ public void form_validator_should_allow_valid_reg_ex_specifying_what_jobs_to_inc public void form_validator_should_advise_how_a_regex_could_be_improved() { FormValidation result = validator.doCheckIncludeRegex(")"); - assertThat(result.kind, is(ERROR)); + assertThat(result.kind, is(FormValidation.Kind.ERROR)); assertThat(htmlDecoded(result.getMessage()), containsString("Unmatched closing ')'")); } diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallationTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallationTest.java index 4affb106b..e76745ad5 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallationTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/installation/BuildMonitorInstallationTest.java @@ -1,8 +1,5 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.installation; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; @@ -11,6 +8,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; +import org.junit.Test; + public class BuildMonitorInstallationTest { public static final String PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlEPjwjG6Q3ILlr91qlSxvvys046hUrhFmc8ibz9WvWEJKVs5dS/mCnRV4QFg4w3qoCH2lzuoSNHB7tWBYQXj1ZtbDiwjnFNYw1TyZBL43m2bRYQGjpcvHAUB6u07C7mmoehpaYoFkpJbLEYEGXsKV/0bY22n00cZHwoTGl5biGVX8gvNKq604pK97jdVuBNZeXiOMXS00Yrwv8tgWeRDIUhUCO8T4rj0bBULh1Pyg/aJBsts7z5RydB+Nb5OZfAfaklVTpFld+ZHMjt0Q7VYhkMkbBD+ZFRkHvRNqg2q7wdQFScGGx7G2RstUtcIPv5Ga36fj1okDU6c2vyPHErTuwIDAQAB"; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/jcasc/ConfigurationAsCodeTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/jcasc/ConfigurationAsCodeTest.java index 0726f80a8..00429c1cf 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/jcasc/ConfigurationAsCodeTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/jcasc/ConfigurationAsCodeTest.java @@ -1,23 +1,21 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.jcasc; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.BuildMonitorView; import hudson.model.View; import io.jenkins.plugins.casc.ConfigurationContext; import io.jenkins.plugins.casc.ConfiguratorRegistry; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.Util; import io.jenkins.plugins.casc.model.CNode; import java.util.Collection; import jenkins.model.Jenkins; import org.junit.ClassRule; import org.junit.Test; -import static io.jenkins.plugins.casc.misc.Util.getJenkinsRoot; -import static io.jenkins.plugins.casc.misc.Util.toStringFromYamlFile; -import static io.jenkins.plugins.casc.misc.Util.toYamlString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; - public class ConfigurationAsCodeTest { @ClassRule @@ -41,11 +39,11 @@ public void should_support_configuration_as_code() { public void should_support_configuration_export() throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); - CNode yourAttribute = getJenkinsRoot(context).get("views"); + CNode yourAttribute = Util.getJenkinsRoot(context).get("views"); - String exported = toYamlString(yourAttribute); + String exported = Util.toYamlString(yourAttribute); - String expected = toStringFromYamlFile(this, "configuration-as-code-expected.yml"); + String expected = Util.toStringFromYamlFile(this, "configuration-as-code-expected.yml"); assertThat(exported, is(expected)); } diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/BreadthFirstNodeTraversalTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/BreadthFirstNodeTraversalTest.java index 35ba829e8..8ab1ff17b 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/BreadthFirstNodeTraversalTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/BreadthFirstNodeTraversalTest.java @@ -1,14 +1,13 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.pipeline; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; import java.util.Arrays; import java.util.Collection; import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; +import org.junit.Test; public class BreadthFirstNodeTraversalTest { @Test diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelperTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelperTest.java index b2709e65d..c48ba9a02 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelperTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/pipeline/PipelineHelperTest.java @@ -1,5 +1,11 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.pipeline; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.StaticJenkinsAPIs; import hudson.Plugin; import hudson.model.AbstractBuild; @@ -8,12 +14,6 @@ import org.junit.Test; import org.mockito.MockedStatic; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; -import static org.mockito.Mockito.when; - public class PipelineHelperTest { @Test diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewTest.java index 1eb8ced61..189858159 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/BuildViewTest.java @@ -1,9 +1,5 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel; -import jenkins.model.Jenkins; -import org.junit.Test; -import org.mockito.MockedStatic; - import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; import static org.hamcrest.MatcherAssert.assertThat; @@ -11,6 +7,10 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import jenkins.model.Jenkins; +import org.junit.Test; +import org.mockito.MockedStatic; + public class BuildViewTest { private static final String theName = "1.5+build.3"; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewTest.java index 1b9cb897a..59545ea98 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/JobViewTest.java @@ -1,18 +1,11 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.RelativeLocation; -import jenkins.model.Jenkins; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.MockedStatic; - -import java.util.List; - import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Loops.asFollows; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.TimeMachine.currentTime; -import static hudson.model.Result.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.core.Is.is; @@ -23,6 +16,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.RelativeLocation; +import hudson.model.Result; +import java.util.List; +import jenkins.model.Jenkins; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.MockedStatic; + /** * @author Jan Molak */ @@ -93,7 +95,7 @@ public void progress_of_a_not_started_job_should_be_zero() { @Test public void progress_of_a_finished_job_should_be_zero() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(SUCCESS))))); + a(job().whereTheLast(build().finishedWith(Result.SUCCESS))))); assertThat(view.progress(), is(0)); } @@ -128,7 +130,7 @@ public void should_calculate_the_progress_of_a_running_job() throws Exception { @Test public void should_know_how_long_the_next_build_is_supposed_to_take() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(SUCCESS).and().usuallyTakes(5))))); + a(job().whereTheLast(build().finishedWith(Result.SUCCESS).and().usuallyTakes(5))))); assertThat(view.estimatedDuration(), is("5m 0s")); } @@ -147,7 +149,7 @@ public void should_not_say_anything_if_it_doesnt_know_how_long_the_next_build_is @Test public void should_describe_the_job_as_successful_if_the_last_build_succeeded() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(SUCCESS))))); + a(job().whereTheLast(build().finishedWith(Result.SUCCESS))))); assertThat(view.status(), containsString("successful")); } @@ -155,7 +157,7 @@ public void should_describe_the_job_as_successful_if_the_last_build_succeeded() @Test public void should_describe_the_job_as_failing_if_the_last_build_failed() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(FAILURE))))); + a(job().whereTheLast(build().finishedWith(Result.FAILURE))))); assertThat(view.status(), containsString("failing")); } @@ -163,7 +165,7 @@ public void should_describe_the_job_as_failing_if_the_last_build_failed() { @Test public void should_describe_the_job_as_aborted_if_the_last_build_was_aborted() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(ABORTED))))); + a(job().whereTheLast(build().finishedWith(Result.ABORTED))))); assertThat(view.status(), containsString("aborted")); } @@ -171,7 +173,7 @@ public void should_describe_the_job_as_aborted_if_the_last_build_was_aborted() { @Test public void should_describe_the_job_as_unstable_if_the_last_build_is_unstable() { view = a(jobView().of( - a(job().whereTheLast(build().finishedWith(UNSTABLE))))); + a(job().whereTheLast(build().finishedWith(Result.UNSTABLE))))); assertThat(view.status(), containsString("unstable")); } @@ -211,7 +213,7 @@ public void should_describe_the_job_as_enabled_if_external_job() { @Test public void should_describe_the_job_as_disabled_and_failing_if_the_last_build_failed_and_the_job_is_disabled() { - view = a(jobView().of(a(job().thatIsNotBuildable().whereTheLast(build().finishedWith(FAILURE))))); + view = a(jobView().of(a(job().thatIsNotBuildable().whereTheLast(build().finishedWith(Result.FAILURE))))); assertThat(view.status(), containsString("disabled")); assertThat(view.status(), containsString("failing")); @@ -220,9 +222,9 @@ public void should_describe_the_job_as_disabled_and_failing_if_the_last_build_fa @Test public void should_describe_the_job_as_running_and_successful_if_it_is_running_and_the_previous_build_succeeded() { List views = asFollows( - a(jobView().of(a(job().whereTheLast(build().hasntStartedYet()).andThePrevious(build().finishedWith(SUCCESS))))), - a(jobView().of(a(job().whereTheLast(build().isStillBuilding()).andThePrevious(build().finishedWith(SUCCESS))))), - a(jobView().of(a(job().whereTheLast(build().isStillUpdatingTheLog()).andThePrevious(build().finishedWith(SUCCESS)))))); + a(jobView().of(a(job().whereTheLast(build().hasntStartedYet()).andThePrevious(build().finishedWith(Result.SUCCESS))))), + a(jobView().of(a(job().whereTheLast(build().isStillBuilding()).andThePrevious(build().finishedWith(Result.SUCCESS))))), + a(jobView().of(a(job().whereTheLast(build().isStillUpdatingTheLog()).andThePrevious(build().finishedWith(Result.SUCCESS)))))); // I could do this instead of having two assertions: // assertThat(view.status(), both(containsString("successful")).and(containsString("running"))); @@ -239,13 +241,13 @@ public void should_describe_the_job_as_running_and_failing_if_it_is_running_and_ List views = asFollows( a(jobView().of(a(job(). whereTheLast(build().hasntStartedYet()). - andThePrevious(build().finishedWith(FAILURE))))), + andThePrevious(build().finishedWith(Result.FAILURE))))), a(jobView().of(a(job(). whereTheLast(build().isStillBuilding()). - andThePrevious(build().finishedWith(FAILURE))))), + andThePrevious(build().finishedWith(Result.FAILURE))))), a(jobView().of(a(job(). whereTheLast(build().isStillUpdatingTheLog()). - andThePrevious(build().finishedWith(FAILURE))))) + andThePrevious(build().finishedWith(Result.FAILURE))))) ); for (JobView jobView : views) { @@ -263,7 +265,7 @@ public void should_describe_the_job_as_successful_when_there_are_several_builds_ view = a(jobView().of( a(job().whereTheLast(build().isStillBuilding()). andThePrevious(build().isStillBuilding()). - andThePrevious(build().finishedWith(SUCCESS))))); + andThePrevious(build().finishedWith(Result.SUCCESS))))); assertThat(view.status(), containsString("successful")); } @@ -273,7 +275,7 @@ public void should_describe_the_job_as_failing_when_there_are_several_builds_run view = a(jobView().of( a(job().whereTheLast(build().isStillBuilding()). andThePrevious(build().isStillBuilding()). - andThePrevious(build().finishedWith(FAILURE))))); + andThePrevious(build().finishedWith(Result.FAILURE))))); assertThat(view.status(), containsString("failing")); } diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimedTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimedTest.java index ed1cb695d..78db580c1 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimedTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeClaimedTest.java @@ -1,14 +1,9 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; -import jenkins.model.Jenkins; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.MockedStatic; - -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static hudson.model.Result.FAILURE; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -17,6 +12,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import hudson.model.Result; +import jenkins.model.Jenkins; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.MockedStatic; + public class CanBeClaimedTest { private JobView job; @@ -42,7 +45,7 @@ public void should_know_if_a_failing_build_has_been_claimed() { theReason = "I broke it, sorry, fixing now"; job = a(jobView().which(new CanBeClaimed()).of( - a(job().whereTheLast(build().finishedWith(FAILURE).and().wasClaimedBy(ourPotentialHero, theReason))))); + a(job().whereTheLast(build().finishedWith(Result.FAILURE).and().wasClaimedBy(ourPotentialHero, theReason))))); assertThat(serialisedClaimOf(job).author(), is(ourPotentialHero)); assertThat(serialisedClaimOf(job).reason(), is(theReason)); @@ -52,7 +55,7 @@ public void should_know_if_a_failing_build_has_been_claimed() { @Test public void should_know_if_a_failing_build_has_not_been_claimed() { job = a(jobView().which(new CanBeClaimed()).of( - a(job().whereTheLast(build().finishedWith(FAILURE))))); + a(job().whereTheLast(build().finishedWith(Result.FAILURE))))); assertThat(serialisedClaimOf(job), is(nullValue())); } @@ -60,7 +63,7 @@ public void should_know_if_a_failing_build_has_not_been_claimed() { @Test public void should_complain_if_the_build_was_not_claimable() { job = a(jobView().of( - a(job().withName("my-project").whereTheLast(build().finishedWith(FAILURE))))); + a(job().withName("my-project").whereTheLast(build().finishedWith(Result.FAILURE))))); RuntimeException thrown = assertThrows(RuntimeException.class, () -> job.which(CanBeClaimed.class)); assertEquals("CanBeClaimed is not a feature of this project: 'my-project'", thrown.getMessage()); diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblemsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblemsTest.java index 42f2a3f47..827229e78 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblemsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/CanBeDiagnosedForProblemsTest.java @@ -1,20 +1,23 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItem; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.Config.BuildFailureAnalyzerDisplayedField; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import hudson.model.Result; import jenkins.model.Jenkins; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static hudson.model.Result.FAILURE; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasItem; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class CanBeDiagnosedForProblemsTest { private JobView job; @@ -38,7 +41,7 @@ public void should_describe_known_problems() { String rogueAi = "Pod bay doors didn't open"; job = a(jobView().which(new CanBeDiagnosedForProblems(BuildFailureAnalyzerDisplayedField.Name)).of( - a(job().whereTheLast(build().finishedWith(FAILURE).and().knownProblems(rogueAi))))); + a(job().whereTheLast(build().finishedWith(Result.FAILURE).and().knownProblems(rogueAi))))); assertThat(diagnosedFailuresOf(job).value(), hasItem(rogueAi)); } diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePluginTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePluginTest.java index ab537db7e..cccafd319 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePluginTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasBadgesBadgePluginTest.java @@ -1,13 +1,13 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; -import jenkins.model.Jenkins; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.MockedStatic; - -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.badgePluginBadge; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.hasBadgePluginBadges; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.withConfig; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.withDefaultConfig; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; @@ -15,6 +15,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import jenkins.model.Jenkins; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.MockedStatic; + public class HasBadgesBadgePluginTest { private JobView job; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingAbortedBuildDetails.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingAbortedBuildDetails.java index aa279bbf4..cb84e5c87 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingAbortedBuildDetails.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingAbortedBuildDetails.java @@ -1,5 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; import hudson.model.User; @@ -9,12 +18,6 @@ import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class HasHeadlineShowingAbortedBuildDetails { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFailedBuildDetailsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFailedBuildDetailsTest.java index 50159c8bb..ecc6f0e17 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFailedBuildDetailsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFailedBuildDetailsTest.java @@ -1,5 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; import jenkins.model.Jenkins; @@ -8,12 +17,6 @@ import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class HasHeadlineShowingFailedBuildDetailsTest { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFixedBuildDetailsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFixedBuildDetailsTest.java index 1d85aaa12..f118bc8aa 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFixedBuildDetailsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingFixedBuildDetailsTest.java @@ -1,5 +1,15 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; import jenkins.model.Jenkins; @@ -8,13 +18,6 @@ import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.emptyString; -import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class HasHeadlineShowingFixedBuildDetailsTest { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingRunningBuildDetailsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingRunningBuildDetailsTest.java index 2e2a2dddd..59fee0074 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingRunningBuildDetailsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineShowingRunningBuildDetailsTest.java @@ -1,5 +1,15 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyString; +import static org.hamcrest.Matchers.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; import jenkins.model.Jenkins; @@ -8,13 +18,6 @@ import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.emptyString; -import static org.hamcrest.Matchers.is; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class HasHeadlineShowingRunningBuildDetailsTest { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineWhichShowsNothingTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineWhichShowsNothingTest.java index efa5e430c..a4481dd49 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineWhichShowsNothingTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasHeadlineWhichShowsNothingTest.java @@ -1,14 +1,16 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; -import org.junit.Test; - -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyString; import static org.hamcrest.Matchers.is; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.headline.HeadlineConfig; +import org.junit.Test; + public class HasHeadlineWhichShowsNothingTest { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtimeTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtimeTest.java index 76ce9daf1..5c2b17310 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtimeTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/HasJunitRealtimeTest.java @@ -13,15 +13,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import jenkins.model.Jenkins; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.MockedStatic; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; - -import jenkins.model.Jenkins; - public class HasJunitRealtimeTest { private JobView job; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetailsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetailsTest.java index 0b4d53e6a..a83b68ba5 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetailsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsCurrentBuildsDetailsTest.java @@ -1,15 +1,10 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.KnowsCurrentBuildsDetails.CurrentBuild; - -import jenkins.model.Jenkins; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.MockedStatic; - -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.locatedAt; import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.TimeMachine.assumeThat; import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.TimeMachine.currentTime; import static org.hamcrest.MatcherAssert.assertThat; @@ -17,8 +12,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mockStatic; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.KnowsCurrentBuildsDetails.CurrentBuild; import java.util.Date; import java.util.List; +import jenkins.model.Jenkins; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.MockedStatic; public class KnowsCurrentBuildsDetailsTest { private JobView view; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsLastCompletedBuildDetailsTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsLastCompletedBuildDetailsTest.java index c15910188..afbbc5f88 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsLastCompletedBuildDetailsTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/features/KnowsLastCompletedBuildDetailsTest.java @@ -1,20 +1,24 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.a; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.build; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.job; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.jobView; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.locatedAt; +import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.TimeMachine.currentTime; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; +import hudson.model.Result; import jenkins.model.Jenkins; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.MockedStatic; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.Sugar.*; -import static com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar.TimeMachine.currentTime; -import static hudson.model.Result.SUCCESS; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.mockStatic; - public class KnowsLastCompletedBuildDetailsTest { private JobView view; @@ -65,7 +69,7 @@ public void should_know_the_url_of_the_last_build() { @Test public void should_know_how_long_the_last_build_took_once_its_finished() { view = a(jobView().which(new KnowsLastCompletedBuildDetails()).of( - a(job().whereTheLast(build().finishedWith(SUCCESS).and().took(3))))); + a(job().whereTheLast(build().finishedWith(Result.SUCCESS).and().took(3))))); assertThat(lastCompletedBuildOf(view).duration(), is("3m 0s")); } diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/ListerTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/ListerTest.java index 59b7b33c5..24d44ba32 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/ListerTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/ListerTest.java @@ -1,13 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.readability; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Lister; -import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Lister; import java.util.Arrays; import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; +import org.junit.Test; public class ListerTest { diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/PluraliserTest.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/PluraliserTest.java index a7cae90df..98da58eee 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/PluraliserTest.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/readability/PluraliserTest.java @@ -1,11 +1,11 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.readability; -import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Pluraliser; -import org.junit.Test; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import com.smartcodeltd.jenkinsci.plugins.buildmonitor.readability.Pluraliser; +import org.junit.Test; + public class PluraliserTest { @Test public void should_use_the_plural_format_if_no_other_is_specified() { diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BadgeBadgePluginRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BadgeBadgePluginRecipe.java index dddfbf2da..7de430b9e 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BadgeBadgePluginRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BadgeBadgePluginRecipe.java @@ -1,13 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; -import com.jenkinsci.plugins.badge.action.BadgeAction; - -import java.util.function.Supplier; - import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.jenkinsci.plugins.badge.action.BadgeAction; +import java.util.function.Supplier; + /** * @author Daniel Beland */ diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BuildStateRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BuildStateRecipe.java index 839412770..9e63a4725 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BuildStateRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/BuildStateRecipe.java @@ -1,5 +1,10 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import com.jenkinsci.plugins.badge.action.BadgeAction; import com.sonyericsson.jenkins.plugins.bfa.model.FailureCauseBuildAction; import com.sonyericsson.jenkins.plugins.bfa.model.FoundFailureCause; import hudson.model.AbstractBuild; @@ -8,25 +13,17 @@ import hudson.model.User; import hudson.plugins.claim.ClaimBuildAction; import hudson.scm.ChangeLogSet; -import jenkins.model.CauseOfInterruption; -import jenkins.model.InterruptedBuildAction; - -import com.jenkinsci.plugins.badge.action.BadgeAction; - -import org.jenkinsci.plugins.junitrealtimetestreporter.AbstractRealtimeTestResultAction; -import org.mockito.MockedStatic; -import org.mockito.Mockito; - import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; - -import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import jenkins.model.CauseOfInterruption; +import jenkins.model.InterruptedBuildAction; +import org.jenkinsci.plugins.junitrealtimetestreporter.AbstractRealtimeTestResultAction; +import org.mockito.MockedStatic; +import org.mockito.Mockito; /** * @author Jan Molak diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/ConfigStateRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/ConfigStateRecipe.java index aaa830d51..15984aba5 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/ConfigStateRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/ConfigStateRecipe.java @@ -3,7 +3,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.Config; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.build.GetLastCompletedBuild; import hudson.model.Job; - import java.util.Comparator; import java.util.function.Supplier; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobStateRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobStateRecipe.java index f18a829b8..c26fde434 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobStateRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobStateRecipe.java @@ -1,21 +1,20 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import hudson.model.AbstractBuild; import hudson.model.Job; import hudson.model.ViewJob; import hudson.util.RunList; - import java.util.ArrayList; import java.util.List; import java.util.Stack; import java.util.function.Predicate; import java.util.function.Supplier; -import static org.mockito.Mockito.any; -import static org.mockito.Mockito.lenient; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * @author Jan Molak */ diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobViewRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobViewRecipe.java index dddb47bc3..8376a0f9c 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobViewRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/JobViewRecipe.java @@ -4,7 +4,6 @@ import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.JobView; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.Feature; import hudson.model.Job; - import java.util.ArrayList; import java.util.Arrays; import java.util.Date; diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/RealtimeTestPluginRecipe.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/RealtimeTestPluginRecipe.java index 83230cac3..922f206e0 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/RealtimeTestPluginRecipe.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/RealtimeTestPluginRecipe.java @@ -1,13 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; -import java.util.function.Supplier; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import java.util.function.Supplier; import org.jenkinsci.plugins.junitrealtimetestreporter.PipelineRealtimeTestResultAction; import org.jenkinsci.plugins.junitrealtimetestreporter.TestProgress; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * @author Daniel Beland */ diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/Sugar.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/Sugar.java index a90cd16f8..70976320c 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/Sugar.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/Sugar.java @@ -1,15 +1,14 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import com.smartcodeltd.jenkinsci.plugins.buildmonitor.Config; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.facade.RelativeLocation; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasBadgesBadgePlugin; import com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.features.HasJunitRealtime; - import java.util.function.Supplier; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - public class Sugar { public static JobViewRecipe jobView() { diff --git a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/TimeMachine.java b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/TimeMachine.java index e3fe9591c..a7567824d 100644 --- a/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/TimeMachine.java +++ b/build-monitor-plugin/src/test/java/com/smartcodeltd/jenkinsci/plugins/buildmonitor/viewmodel/syntacticsugar/TimeMachine.java @@ -1,12 +1,12 @@ package com.smartcodeltd.jenkinsci.plugins.buildmonitor.viewmodel.syntacticsugar; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - /** * @author Jan Molak */