Fix styling

jenkinsci · Feb 14, 2023 · 7cb4be7 · 7cb4be7
1 parent 2adaf02
commit 7cb4be7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/JpiPlugin.groovy b/src/main/groovy/org/jenkinsci/gradle/plugins/jpi/JpiPlugin.groovy
@@ -587,7 +587,7 @@ class JpiPlugin implements Plugin<Project>, PluginDependencyProvider {
 
     private configureCheckstyle(Project project) {
         def checkstyle = project.extensions.getByType(CheckstyleExtension)
-        checkstyle.config = project.resources.text.fromUri(JpiPlugin.class.getResource('/sun_checks.xml').toURI())
+        checkstyle.config = project.resources.text.fromUri(JpiPlugin.getResource('/sun_checks.xml').toURI())
         project.tasks.withType(Checkstyle).configureEach {
             it.reports {
                 xml.required = true

diff --git a/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/CheckstylePluginSpec.groovy b/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/CheckstylePluginSpec.groovy
@@ -21,7 +21,7 @@ class CheckstylePluginSpec extends IntegrationSpec {
         TestSupport.PASSING_TEST.writeTo(inProjectDir('src/test/java'))
     }
 
-    def "build should not run checkstyle tasks by default"() {
+    def "should not run checkstyle tasks by default"() {
         given:
         build << """jenkinsPlugin {
             jenkinsVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
@@ -37,7 +37,7 @@ class CheckstylePluginSpec extends IntegrationSpec {
         result.task(':checkstyleTest').outcome == TaskOutcome.SKIPPED
     }
 
-    def "build should run checkstyle tasks with default sun-checks and generate only xml"() {
+    def "should run checkstyle tasks with default sun-checks and generate only xml"() {
         given:
         build << """
             jenkinsPlugin {

diff --git a/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/JacocoPluginSpec.groovy b/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/JacocoPluginSpec.groovy
@@ -25,7 +25,7 @@ class JacocoPluginSpec extends IntegrationSpec {
         TestSupport.PASSING_TEST.writeTo(inProjectDir('src/test/java'))
     }
 
-    def "build should not run jacoco report task by default"() {
+    def "should not run jacoco report task by default"() {
         given:
         build << """jenkinsPlugin {
             jenkinsVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
@@ -40,7 +40,7 @@ class JacocoPluginSpec extends IntegrationSpec {
         result.task(':jacocoTestReport') == null
     }
 
-    def "build should run jacoco task and generate only xml report"() {
+    def "should run jacoco task and generate only xml report"() {
         given:
         build << """
             jenkinsPlugin {

diff --git a/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/SpotBugsPluginSpec.groovy b/src/test/groovy/org/jenkinsci/gradle/plugins/jpi/SpotBugsPluginSpec.groovy
@@ -24,7 +24,7 @@ class SpotBugsPluginSpec extends IntegrationSpec {
     }
 
     @Requires({ gradle7AndAbove() })
-    def "build should not run SpotBugs tasks by default (Gradle 7)"() {
+    def "should not run SpotBugs tasks by default (Gradle 7)"() {
         given:
         build << """jenkinsPlugin {
             jenkinsVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
@@ -41,7 +41,7 @@ class SpotBugsPluginSpec extends IntegrationSpec {
     }
 
     @Requires({ gradle7AndAbove() })
-    def "build should run SpotBugs tasks with default and generate only xml"() {
+    def "should run SpotBugs tasks with default and generate only xml"() {
         given:
         build << """
             jenkinsPlugin {
@@ -91,7 +91,7 @@ class SpotBugsPluginSpec extends IntegrationSpec {
     }
 
     @Requires({ belowGradle7() })
-    def "build should not run SpotBugs tasks and not fail (Gradle 6)"() {
+    def "should not run SpotBugs tasks and not fail (Gradle 6)"() {
         given:
         build << """jenkinsPlugin {
             jenkinsVersion = '${TestSupport.RECENT_JENKINS_VERSION}'
@@ -116,5 +116,3 @@ class SpotBugsPluginSpec extends IntegrationSpec {
     }
 
 }
-
-