diff --git a/integrations/pom.xml b/integrations/pom.xml index 739ee9de..e194558f 100644 --- a/integrations/pom.xml +++ b/integrations/pom.xml @@ -13,7 +13,7 @@ true - 2.479.3 + 2.492.1 @@ -128,7 +128,7 @@ org.jenkins-ci.plugins azure-keyvault - 251.vcfe31c013dc7 + 280.v166053ddda_42 test diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java index 34aed3d9..8263dfdf 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/CredentialsTest.java @@ -4,9 +4,10 @@ import static java.util.Objects.requireNonNull; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey; import com.cloudbees.plugins.credentials.CredentialsProvider; @@ -20,24 +21,22 @@ import hudson.util.Secret; import io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import io.jenkins.plugins.casc.model.Mapping; import java.util.Collections; import java.util.List; import java.util.Set; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -public class CredentialsTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class CredentialsTest { @ConfiguredWithCode("GlobalCredentials.yml") @Test - public void testGlobalScopedCredentials() throws Exception { + void testGlobalScopedCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { List creds = CredentialsProvider.lookupCredentials( StandardUsernamePasswordCredentials.class, Jenkins.getInstanceOrNull(), null, Collections.emptyList()); assertThat(creds.size(), is(1)); @@ -60,7 +59,7 @@ public class CredentialsTest { @ConfiguredWithCode("CredentialsWithDomain.yml") @Test - public void testDomainScopedCredentials() throws Exception { + void testDomainScopedCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { List creds = CredentialsProvider.lookupCredentials( StandardUsernamePasswordCredentials.class, Jenkins.getInstanceOrNull(), null, Collections.emptyList()); assertThat(creds.size(), is(1)); @@ -71,7 +70,7 @@ public class CredentialsTest { @Test @ConfiguredWithCode("GlobalCredentials.yml") - public void testExportFileCredentials() throws Exception { + void testExportFileCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CredentialsRootConfigurator root = ExtensionList.lookupSingleton(CredentialsRootConfigurator.class); @@ -101,7 +100,7 @@ public class CredentialsTest { @ConfiguredWithCode("GlobalCredentials.yml") @Test - public void testExportSSHCredentials() throws Exception { + void testExportSSHCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CredentialsRootConfigurator root = ExtensionList.lookupSingleton(CredentialsRootConfigurator.class); @@ -149,11 +148,11 @@ public class CredentialsTest { @Test @Issue("SECURITY-1404") - public void checkUsernamePasswordIsSecret() throws Exception { + void checkUsernamePasswordIsSecret(JenkinsConfiguredWithCodeRule j) throws Exception { Attribute a = getFromDatabound(UsernamePasswordCredentialsImpl.class, "password"); assertTrue( - "Attribute 'password' should be secret", - a.isSecret(new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "1", "2", "3", "4"))); + a.isSecret(new UsernamePasswordCredentialsImpl(CredentialsScope.GLOBAL, "1", "2", "3", "4")), + "Attribute 'password' should be secret"); } @NonNull @@ -165,6 +164,6 @@ public class CredentialsTest { return a; } } - throw new AssertionError("Cannot find databound attribute " + attributeName + " in " + clazz); + return fail("Cannot find databound attribute " + attributeName + " in " + clazz); } } diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/CustomToolsTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/CustomToolsTest.java index 991511b7..35fc6643 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/CustomToolsTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/CustomToolsTest.java @@ -1,7 +1,7 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import com.cloudbees.jenkins.plugins.customtools.CustomTool; import com.cloudbees.jenkins.plugins.customtools.CustomTool.DescriptorImpl; @@ -9,24 +9,22 @@ import hudson.tools.CommandInstaller; import hudson.tools.InstallSourceProperty; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; /** * @author Nicolas De Loof */ -public class CustomToolsTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class CustomToolsTest { @Test @Issue("#97") - @Ignore + @Disabled @ConfiguredWithCode(value = "CustomToolsTest.yml") - public void configure_custom_tools() { + void configure_custom_tools(JenkinsConfiguredWithCodeRule j) { DescriptorImpl descriptor = (DescriptorImpl) j.jenkins.getDescriptorOrDie(CustomTool.class); assertEquals(1, descriptor.getInstallations().length); final CustomTool customTool = descriptor.getInstallations()[0]; diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/DockerWorkflowSymbolTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/DockerWorkflowSymbolTest.java index d63e90a8..d214320b 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/DockerWorkflowSymbolTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/DockerWorkflowSymbolTest.java @@ -5,26 +5,24 @@ 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; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import org.jenkinsci.plugins.docker.workflow.declarative.GlobalConfig; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -public class DockerWorkflowSymbolTest { - - @ClassRule - @ConfiguredWithCode("DockerWorkflowSymbol.yml") - public static JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class DockerWorkflowSymbolTest { @Test @Issue("1260") - public void configure_global_definition() { + @ConfiguredWithCode("DockerWorkflowSymbol.yml") + void configure_global_definition(JenkinsConfiguredWithCodeRule j) { GlobalConfig config = GlobalConfig.get(); assertNotNull(config); @@ -35,7 +33,8 @@ public class DockerWorkflowSymbolTest { @Test @Issue("1260") - public void export_global_definition() throws Exception { + @ConfiguredWithCode("DockerWorkflowSymbol.yml") + void export_global_definition(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CNode yourAttribute = getUnclassifiedRoot(context).get("pipeline-model-docker"); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/EssentialsTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/EssentialsTest.java index b88b2b75..589f66a3 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/EssentialsTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/EssentialsTest.java @@ -3,25 +3,24 @@ package io.jenkins.plugins.casc; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.ExtensionList; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.List; import jenkins.metrics.api.MetricsAccessKey; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class EssentialsTest { - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class EssentialsTest { @Test @ConfiguredWithCode("EssentialsTest.yml") - public void essentialsTest() { + void essentialsTest(JenkinsConfiguredWithCodeRule j) { final Jenkins jenkins = Jenkins.get(); assertEquals("Welcome to Jenkins Essentials!", jenkins.getSystemMessage()); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/GitTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/GitTest.java index b2d591a1..d44066ac 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/GitTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/GitTest.java @@ -1,11 +1,12 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import hudson.plugins.git.GitSCM; import hudson.plugins.git.browser.AssemblaWeb; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.logging.Level; import java.util.logging.Logger; import jenkins.model.GlobalConfiguration; @@ -13,28 +14,23 @@ import jenkins.model.Jenkins; import org.jenkinsci.plugins.workflow.libs.GlobalLibraries; import org.jenkinsci.plugins.workflow.libs.LibraryConfiguration; import org.jenkinsci.plugins.workflow.libs.SCMRetriever; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.LogRecorder; /** * Tests for Git plugin global configurations. */ -public class GitTest { +@WithJenkinsConfiguredWithCode +class GitTest { - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); - public LoggerRule logging = new LoggerRule(); + private final LogRecorder logging = new LogRecorder() + .record(Logger.getLogger(Attribute.class.getName()), Level.INFO) + .capture(2048); - @Rule - public RuleChain chain = RuleChain.outerRule(logging.record(Logger.getLogger(Attribute.class.getName()), Level.INFO) - .capture(2048)) - .around(j); - - @After - public void dumpLogs() { + @AfterEach + void dumpLogs() { for (String message : logging.getMessages()) { System.out.println(message); } @@ -43,7 +39,7 @@ public class GitTest { @Test @Issue("JENKINS-57604") @ConfiguredWithCode("GitTest.yml") - public void checkAssemblaWebIsLoaded() { + void checkAssemblaWebIsLoaded(JenkinsConfiguredWithCodeRule j) { final Jenkins jenkins = Jenkins.get(); final GlobalLibraries libs = jenkins.getExtensionList(GlobalConfiguration.class).get(GlobalLibraries.class); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/GiteaOrganisationFolderTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/GiteaOrganisationFolderTest.java index 632b5b2c..a4f18844 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/GiteaOrganisationFolderTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/GiteaOrganisationFolderTest.java @@ -1,10 +1,11 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.List; import jenkins.branch.OrganizationFolder; import jenkins.scm.api.trait.SCMTrait; @@ -16,17 +17,14 @@ import org.jenkinsci.plugin.gitea.OriginPullRequestDiscoveryTrait; import org.jenkinsci.plugin.gitea.SSHCheckoutTrait; import org.jenkinsci.plugin.gitea.TagDiscoveryTrait; import org.jenkinsci.plugin.gitea.WebhookRegistrationTrait; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class GiteaOrganisationFolderTest { - - @Rule - public JenkinsConfiguredWithCodeRule r = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class GiteaOrganisationFolderTest { @Test @ConfiguredWithCode("SeedJobTest_withGiteaOrganisation.yml") - public void configure_gitea_organisation_folder_seed_job() { + void configure_gitea_organisation_folder_seed_job(JenkinsConfiguredWithCodeRule r) { OrganizationFolder folder = (OrganizationFolder) r.jenkins.getItem("Gitea Organization Folder"); assertNotNull(folder); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/GithubOrganisationFolderTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/GithubOrganisationFolderTest.java index 91130d2c..5b92e10b 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/GithubOrganisationFolderTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/GithubOrganisationFolderTest.java @@ -1,32 +1,32 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.model.TopLevelItem; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import jenkins.branch.OrganizationFolder; import jenkins.model.Jenkins; import org.jenkinsci.plugins.github_branch_source.GitHubSCMNavigator; -import org.junit.Rule; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author Nicolas De Loof */ -public class GithubOrganisationFolderTest { +@WithJenkinsConfiguredWithCode +class GithubOrganisationFolderTest { - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); - - // @Test - // Fails as Items do override submit() with manual data-binding implementation + @Test + @Disabled("Fails as Items do override submit() with manual data-binding implementation") @ConfiguredWithCode("GithubOrganisationFolderTest.yml") - public void configure_github_organisation_folder_seed_job() { + void configure_github_organisation_folder_seed_job(JenkinsConfiguredWithCodeRule j) { final TopLevelItem job = Jenkins.get().getItem("ndeloof"); assertNotNull(job); - assertTrue(job instanceof OrganizationFolder); + assertInstanceOf(OrganizationFolder.class, job); OrganizationFolder folder = (OrganizationFolder) job; assertEquals(1, folder.getNavigators().size()); final GitHubSCMNavigator github = folder.getNavigators().get(GitHubSCMNavigator.class); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/GlobalLibrariesTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/GlobalLibrariesTest.java index 1e6141ae..44360986 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/GlobalLibrariesTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/GlobalLibrariesTest.java @@ -2,10 +2,11 @@ package io.jenkins.plugins.casc; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import org.jenkinsci.plugins.github_branch_source.BranchDiscoveryTrait; import org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait; import org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait.TrustPermission; @@ -14,22 +15,19 @@ import org.jenkinsci.plugins.github_branch_source.OriginPullRequestDiscoveryTrai import org.jenkinsci.plugins.workflow.libs.GlobalLibraries; import org.jenkinsci.plugins.workflow.libs.LibraryConfiguration; import org.jenkinsci.plugins.workflow.libs.SCMSourceRetriever; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; /** * @author Nicolas De Loof */ -public class GlobalLibrariesTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class GlobalLibrariesTest { @Issue("JENKINS-57557") @Test @ConfiguredWithCode("GlobalLibrariesGitHubTest.yml") - public void configure_global_library_using_github() { + void configure_global_library_using_github(JenkinsConfiguredWithCodeRule j) { assertEquals(1, GlobalLibraries.get().getLibraries().size()); final LibraryConfiguration library = GlobalLibraries.get().getLibraries().get(0); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java index 2eafda06..ba91c2ed 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java @@ -5,7 +5,7 @@ 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; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import hudson.slaves.EnvironmentVariablesNodeProperty; import hudson.slaves.NodeProperty; @@ -13,21 +13,19 @@ import hudson.slaves.NodePropertyDescriptor; import hudson.util.DescribableList; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import java.util.Map; import java.util.Set; import jenkins.model.Jenkins; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class GlobalNodePropertiesTest { - - @ClassRule - @ConfiguredWithCode("GlobalNodePropertiesTest.yml") - public static JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class GlobalNodePropertiesTest { @Test - public void configure() { + @ConfiguredWithCode("GlobalNodePropertiesTest.yml") + void configure(JenkinsConfiguredWithCodeRule j) { final Jenkins jenkins = Jenkins.get(); DescribableList, NodePropertyDescriptor> nodeProperties = jenkins.getGlobalNodeProperties(); @@ -43,7 +41,8 @@ public class GlobalNodePropertiesTest { } @Test - public void export() throws Exception { + @ConfiguredWithCode("GlobalNodePropertiesTest.yml") + void export(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CNode yourAttribute = getJenkinsRoot(context).get("globalNodeProperties"); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/LDAPSecurityRealmTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/LDAPSecurityRealmTest.java index bc1dcc15..17aa2fd9 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/LDAPSecurityRealmTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/LDAPSecurityRealmTest.java @@ -8,21 +8,19 @@ import static org.hamcrest.core.Is.is; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Nicolas De Loof */ -public class LDAPSecurityRealmTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class LDAPSecurityRealmTest { @Test @ConfiguredWithCode("LDAPSecurityRealmTestNoSecret.yml") - public void export_ldap_no_secret() throws Exception { + void export_ldap_no_secret(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CNode yourAttribute = diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/MailExtTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/MailExtTest.java index f18fe911..bc260c9e 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/MailExtTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/MailExtTest.java @@ -6,39 +6,34 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import hudson.plugins.emailext.ExtendedEmailPublisher; import hudson.plugins.emailext.ExtendedEmailPublisherDescriptor; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.yaml.YamlSource; import java.util.logging.Level; import java.util.logging.Logger; import org.apache.tools.ant.filters.StringInputStream; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.LogRecorder; -public class MailExtTest { +@WithJenkinsConfiguredWithCode +class MailExtTest { - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); - public LoggerRule logging = new LoggerRule(); - - @Rule - public RuleChain chain = RuleChain.outerRule( - logging.record(Logger.getLogger(Attribute.class.getName()), Level.FINER) - .capture(2048)) - .around(j); + private final LogRecorder logging = new LogRecorder() + .record(Logger.getLogger(Attribute.class.getName()), Level.FINER) + .capture(2048); private static final String SMTP_PASSWORD = "myPassword"; @Test @ConfiguredWithCode("MailExtTest.yml") @Issue("SECURITY-1404") - public void shouldNotExportOrLogCredentials() throws Exception { + void shouldNotExportOrLogCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { assertEquals( SMTP_PASSWORD, ExtendedEmailPublisher.descriptor().getSmtpPassword().getPlainText()); @@ -56,7 +51,7 @@ public class MailExtTest { @Test @Issue("SECURITY-1446") - public void shouldProperlyRoundTripTokenMacro() throws Exception { + void shouldProperlyRoundTripTokenMacro(JenkinsConfiguredWithCodeRule j) throws Exception { final String defaultBody = "${PROJECT_NAME} - Build # ${BUILD_NUMBER} - ${BUILD_STATUS}:\n" + "Check console output at $BUILD_URL to view the results."; // This string contains extra escaping diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/ProjectMatrixAuthorizationTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/ProjectMatrixAuthorizationTest.java index 162b4834..6c652ec3 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/ProjectMatrixAuthorizationTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/ProjectMatrixAuthorizationTest.java @@ -1,31 +1,29 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import hudson.security.ProjectMatrixAuthorizationStrategy; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.ArrayList; import java.util.List; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Created by mads on 2/22/18. */ -public class ProjectMatrixAuthorizationTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class ProjectMatrixAuthorizationTest { @Test @ConfiguredWithCode("ProjectMatrixStrategy.yml") - public void checkCorrectlyConfiguredPermissions() { + void checkCorrectlyConfiguredPermissions(JenkinsConfiguredWithCodeRule j) { assertEquals( - "The configured instance must use the Global Matrix Authentication Strategy", ProjectMatrixAuthorizationStrategy.class, - Jenkins.get().getAuthorizationStrategy().getClass()); + Jenkins.get().getAuthorizationStrategy().getClass(), + "The configured instance must use the Global Matrix Authentication Strategy"); ProjectMatrixAuthorizationStrategy gms = (ProjectMatrixAuthorizationStrategy) Jenkins.get().getAuthorizationStrategy(); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/RoleStrategyTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/RoleStrategyTest.java index 295f2b56..f70e87da 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/RoleStrategyTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/RoleStrategyTest.java @@ -21,27 +21,25 @@ import hudson.model.User; import hudson.security.AuthorizationStrategy; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import java.util.Map; import java.util.Set; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; /** * @author Oleg Nenashev * @since 1.0 */ -public class RoleStrategyTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class RoleStrategyTest { @Test @Issue("Issue #48") @ConfiguredWithCode("RoleStrategy1.yml") - public void shouldReadRolesCorrectly() throws Exception { + void shouldReadRolesCorrectly(JenkinsConfiguredWithCodeRule j) throws Exception { j.jenkins.setSecurityRealm(j.createDummySecurityRealm()); User admin = User.getById("admin", false); User user1 = User.getById("user1", false); @@ -95,7 +93,7 @@ public class RoleStrategyTest { @Test @ConfiguredWithCode("RoleStrategy1.yml") - public void shouldExportRolesCorrect() throws Exception { + void shouldExportRolesCorrect(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CNode yourAttribute = getJenkinsRoot(context).get("authorizationStrategy"); @@ -109,7 +107,7 @@ public class RoleStrategyTest { @Test @Issue("Issue #214") @ConfiguredWithCode("RoleStrategy2.yml") - public void shouldHandleNullItemsAndAgentsCorrectly() { + void shouldHandleNullItemsAndAgentsCorrectly(JenkinsConfiguredWithCodeRule j) { AuthorizationStrategy s = j.jenkins.getAuthorizationStrategy(); assertThat( "Authorization Strategy has been read incorrectly", diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/SSHCredentialsTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/SSHCredentialsTest.java index e0adbde4..7b70897e 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/SSHCredentialsTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/SSHCredentialsTest.java @@ -5,7 +5,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey; import com.cloudbees.plugins.credentials.Credentials; @@ -13,30 +13,26 @@ import com.cloudbees.plugins.credentials.CredentialsProvider; import com.cloudbees.plugins.credentials.common.StandardUsernamePasswordCredentials; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.logging.Level; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.LogRecorder; import org.jvnet.hudson.test.TestExtension; /** * Integration tests for the SSH Credentials Plugin. */ -public class SSHCredentialsTest { +@WithJenkinsConfiguredWithCode +class SSHCredentialsTest { - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); - public LoggerRule logging = new LoggerRule(); - - @Rule - public RuleChain chain = RuleChain.outerRule(logging.record("io.jenkins.plugins.casc.Attribute", Level.INFO) - .capture(2048)) - .around(j); + private final LogRecorder logging = new LogRecorder() + .record("io.jenkins.plugins.casc.Attribute", Level.INFO) + .capture(2048); private static final String CREDENTIALS_PASSWORD = "password-of-userid"; private static final String PRIVATE_KEY = "sp0ds9d+skkfjf"; @@ -44,7 +40,7 @@ public class SSHCredentialsTest { @Test @ConfiguredWithCode("SSHCredentialsTest.yml") @Issue("SECURITY-1279") - public void shouldNotExportOrLogCredentials() throws Exception { + void shouldNotExportOrLogCredentials(JenkinsConfiguredWithCodeRule j) throws Exception { StandardUsernamePasswordCredentials creds = getCredentials(StandardUsernamePasswordCredentials.class); assertEquals(CREDENTIALS_PASSWORD, creds.getPassword().getPlainText()); assertNotInLog(logging, CREDENTIALS_PASSWORD); @@ -69,7 +65,7 @@ public class SSHCredentialsTest { @Test @ConfiguredWithCode("SSHCredentialsTest_Multiline_Key.yml") @Issue("https://github.com/jenkinsci/configuration-as-code-plugin/issues/1189") - public void shouldSupportMultilineCertificates() { + void shouldSupportMultilineCertificates(JenkinsConfiguredWithCodeRule j) { BasicSSHUserPrivateKey certKey = getCredentials(BasicSSHUserPrivateKey.class); assertThat( "Private key roundtrip failed", @@ -80,7 +76,7 @@ public class SSHCredentialsTest { @Test @ConfiguredWithCode("SSHCredentialsTest_Singleline_Key.yml") @Issue("https://github.com/jenkinsci/configuration-as-code-plugin/issues/1189") - public void shouldSupportSinglelineBase64Certificates() { + void shouldSupportSinglelineBase64Certificates(JenkinsConfiguredWithCodeRule j) { BasicSSHUserPrivateKey certKey = getCredentials(BasicSSHUserPrivateKey.class); assertThat( "Private key roundtrip failed", @@ -91,7 +87,7 @@ public class SSHCredentialsTest { private T getCredentials(Class clazz) { List creds = CredentialsProvider.lookupCredentials( clazz, Jenkins.getInstanceOrNull(), null, Collections.emptyList()); - assertEquals("There should be only one credential", 1, creds.size()); + assertEquals(1, creds.size(), "There should be only one credential"); return creds.get(0); } diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/Security1446Test.java b/integrations/src/test/java/io/jenkins/plugins/casc/Security1446Test.java index 22eb4446..61309753 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/Security1446Test.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/Security1446Test.java @@ -4,7 +4,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.cloudbees.plugins.credentials.CredentialsProvider; import com.cloudbees.plugins.credentials.CredentialsScope; @@ -13,6 +13,7 @@ import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl; import io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import java.io.IOException; import java.io.StringWriter; @@ -20,16 +21,13 @@ import java.util.Collections; import java.util.List; import jenkins.model.Jenkins; import org.jenkinsci.plugins.plaincredentials.StringCredentials; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.nodes.Node; -public class Security1446Test { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class Security1446Test { private static final String PATH_PATTERN = "path = \\$\\{PATH\\}"; private static final String JAVA_HOME_PATTERN = "java-home = \\$\\{JAVA_HOME\\}"; @@ -37,17 +35,17 @@ public class Security1446Test { @ConfiguredWithCode("Security1446Test.yml") @Test @Issue("SECURITY-1446") - public void testImportWithEnvVar() { + void testImportWithEnvVar(JenkinsConfiguredWithCodeRule j) { List userPasswCred = CredentialsProvider.lookupCredentials( StandardUsernamePasswordCredentials.class, Jenkins.getInstanceOrNull(), null, Collections.emptyList()); assertThat(userPasswCred.size(), is(1)); for (StandardUsernamePasswordCredentials cred : userPasswCred) { assertTrue( - "The JAVA_HOME environment variable should not be resolved", - cred.getUsername().matches(JAVA_HOME_PATTERN)); + cred.getUsername().matches(JAVA_HOME_PATTERN), + "The JAVA_HOME environment variable should not be resolved"); assertTrue( - "The PATH environment variable should not be resolved", - cred.getDescription().matches(PATH_PATTERN)); + cred.getDescription().matches(PATH_PATTERN), + "The PATH environment variable should not be resolved"); } List stringCred = CredentialsProvider.lookupCredentials( @@ -55,14 +53,14 @@ public class Security1446Test { assertThat(stringCred.size(), is(1)); for (StringCredentials cred : stringCred) { assertTrue( - "The PATH environment variable should not be resolved", - cred.getDescription().matches(PATH_PATTERN)); + cred.getDescription().matches(PATH_PATTERN), + "The PATH environment variable should not be resolved"); } } @Test @Issue("SECURITY-1446") - public void testExportWithEnvVar() throws Exception { + void testExportWithEnvVar(JenkinsConfiguredWithCodeRule j) throws Exception { final String message = "Hello, world! PATH=${PATH} JAVA_HOME=^${JAVA_HOME}"; ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); diff --git a/integrations/src/test/java/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListTest.java b/integrations/src/test/java/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListTest.java index a277fa18..f1a5cdad 100644 --- a/integrations/src/test/java/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListTest.java +++ b/integrations/src/test/java/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListTest.java @@ -8,20 +8,18 @@ import static org.hamcrest.core.Is.is; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; -public class ToolDefaultPropertiesExportIgnoreListTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class ToolDefaultPropertiesExportIgnoreListTest { @Test @Issue("JENKINS-57122") @ConfiguredWithCode("ToolDefaultPropertiesExportIgnoreList.yml") - public void export_tool_configuration() throws Exception { + void export_tool_configuration(JenkinsConfiguredWithCodeRule j) throws Exception { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); ConfigurationContext context = new ConfigurationContext(registry); CNode yourAttribute = getToolRoot(context); diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/AttributeTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/AttributeTest.java index 483b4159..122e0693 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/AttributeTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/AttributeTest.java @@ -1,42 +1,42 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import hudson.util.Secret; import java.util.logging.Level; import java.util.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.For; import org.jvnet.hudson.test.Issue; -import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.LogRecorder; import org.kohsuke.stapler.DataBoundConstructor; @For(Attribute.class) public class AttributeTest { - @Rule - public LoggerRule logging = new LoggerRule(); + private LogRecorder logging; - @Before - public void tearUp() { - logging.record(Logger.getLogger(Attribute.class.getName()), Level.FINEST) + @BeforeEach + void tearUp() { + logging = new LogRecorder() + .record(Logger.getLogger(Attribute.class.getName()), Level.FINEST) .capture(2048); } - @After - public void tearDown() { + @AfterEach + void tearDown() { for (String entry : logging.getMessages()) { System.out.println(entry); } + logging.close(); } @Test @Issue("SECURITY-1279") - public void checkCommonSecretPatterns() { + void checkCommonSecretPatterns() { assertFieldIsSecret(WellDefinedField.class, "secretField"); assertFieldIsSecret(SecretFromGetter.class, "secretField"); assertFieldIsSecret(SecretFromPublicField.class, "secretField"); @@ -47,14 +47,14 @@ public class AttributeTest { @Test @Issue("SECURITY-1279") - public void checkStaticResolution() { + void checkStaticResolution() { // Field is not secret, but the attribute is secret assertFieldIsNotSecret(SecretRenamedFieldFithSecretConstructor.class, "mySecretValue"); } @Test @Issue("SECURITY-1279") - public void checkCommonSecretPatternsForOverrides() { + void checkCommonSecretPatternsForOverrides() { assertFieldIsSecret(WellDefinedField2.class, "secret"); assertFieldIsSecret(SecretFromGetter2.class, "secretField"); @@ -66,20 +66,20 @@ public class AttributeTest { @Test @Issue("SECURITY-1279") - public void checkNonSecretPatterns() { + void checkNonSecretPatterns() { assertFieldIsNotSecret(NonSecretField.class, "passwordPath"); } public static void assertFieldIsSecret(Class clazz, String fieldName) { String displayName = clazz != null ? (clazz.getName() + "#" + fieldName) : fieldName; - assertTrue("Field is not secret: " + displayName, Attribute.calculateIfSecret(clazz, fieldName)); + assertTrue(Attribute.calculateIfSecret(clazz, fieldName), "Field is not secret: " + displayName); } public static void assertFieldIsNotSecret(Class clazz, String fieldName) { String displayName = clazz != null ? (clazz.getName() + "#" + fieldName) : fieldName; assertFalse( - "Field is a secret while it should not be considered as one: " + displayName, - Attribute.calculateIfSecret(clazz, fieldName)); + Attribute.calculateIfSecret(clazz, fieldName), + "Field is a secret while it should not be considered as one: " + displayName); } public static class WellDefinedField { diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/ErrorPageTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/ErrorPageTest.java index 2a9bff50..1b6a3ce0 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/ErrorPageTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/ErrorPageTest.java @@ -3,36 +3,37 @@ package io.jenkins.plugins.casc; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlPage; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class ErrorPageTest { +@WithJenkins +class ErrorPageTest { - @ClassRule - public static JenkinsRule r = new JenkinsRule(); + private JenkinsRule r; - @Rule - public TemporaryFolder folder = new TemporaryFolder(); + @TempDir + public File folder; private Path cascFile; - @Before - public void setup() throws IOException { - cascFile = folder.newFile("jenkins.yaml").toPath(); + @BeforeEach + void setup(JenkinsRule r) throws IOException { + this.r = r; + cascFile = File.createTempFile("jenkins.yaml", null, folder).toPath(); } @Test - public void reloadSimple() throws Exception { + void reloadSimple() throws Exception { Files.write(cascFile, "jenkins:\n systemMessage2: Hello World\n".getBytes()); String pageContent = reloadConfiguration(); @@ -56,7 +57,7 @@ public class ErrorPageTest { } @Test - public void noConfigurator() throws Exception { + void noConfigurator() throws Exception { Files.write(cascFile, "invalid:\n systemMessage2: Hello World\n".getBytes()); String pageContent = reloadConfiguration(); @@ -65,7 +66,7 @@ public class ErrorPageTest { } @Test - public void noImplementationFoundForSymbol() throws Exception { + void noImplementationFoundForSymbol() throws Exception { String content = "jenkins:\n" + " securityRealm:\n" + " unknown:\n" + " username: \"world\"\n"; Files.write(cascFile, content.getBytes()); diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/IgnoreAliasEntryTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/IgnoreAliasEntryTest.java index 3d94b711..ef6c09d1 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/IgnoreAliasEntryTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/IgnoreAliasEntryTest.java @@ -3,22 +3,22 @@ package io.jenkins.plugins.casc; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class IgnoreAliasEntryTest { +class IgnoreAliasEntryTest { @Test - public void aliasKeyIsNull() { + void aliasKeyIsNull() { assertThat(ConfigurationAsCode.isNotAliasEntry(null), is(false)); } @Test - public void aliasKeyStartsWithX() { + void aliasKeyStartsWithX() { assertThat(ConfigurationAsCode.isNotAliasEntry("x-hello"), is(false)); } @Test - public void UnknownRootElementShouldReturnTrue() { + void UnknownRootElementShouldReturnTrue() { assertThat(ConfigurationAsCode.isNotAliasEntry("bob"), is(true)); } } diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/UnknownRootElementTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/UnknownRootElementTest.java index 129d3850..d28aac33 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/UnknownRootElementTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/UnknownRootElementTest.java @@ -2,36 +2,35 @@ package io.jenkins.plugins.casc; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class UnknownRootElementTest { - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class UnknownRootElementTest { @Test - public void oneUnknown() { + void oneUnknown(JenkinsRule j) { assertThrows( - "No configurator for the following root elements alice", ConfiguratorException.class, () -> ConfigurationAsCode.get() - .configure(getClass().getResource("unknown1.yml").toExternalForm())); + .configure(getClass().getResource("unknown1.yml").toExternalForm()), + "No configurator for the following root elements alice"); } @Test - public void twoUnknown() { + void twoUnknown(JenkinsRule j) { assertThrows( - "No configurator for the following root elements bob, alice", ConfiguratorException.class, () -> ConfigurationAsCode.get() - .configure(getClass().getResource("unknown2.yml").toExternalForm())); + .configure(getClass().getResource("unknown2.yml").toExternalForm()), + "No configurator for the following root elements bob, alice"); } @Test - public void ignoreKnownAlias() throws Exception { + void ignoreKnownAlias(JenkinsRule j) throws Exception { ConfigurationAsCode.get().configure(getClass().getResource("known.yml").toExternalForm()); assertThat(j.jenkins.getSystemMessage(), is("Configured by Configuration as Code plugin")); } diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/jmh/BenchmarkRunner.java b/plugin/src/test/java/io/jenkins/plugins/casc/jmh/BenchmarkRunner.java index c6fc8c85..014e3e4f 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/jmh/BenchmarkRunner.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/jmh/BenchmarkRunner.java @@ -2,16 +2,16 @@ package io.jenkins.plugins.casc.jmh; import java.util.concurrent.TimeUnit; import jenkins.benchmark.jmh.BenchmarkFinder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.results.format.ResultFormatType; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.ChainedOptionsBuilder; import org.openjdk.jmh.runner.options.OptionsBuilder; -public final class BenchmarkRunner { +class BenchmarkRunner { @Test - public void runJmhBenchmarks() throws Exception { + void runJmhBenchmarks() throws Exception { ChainedOptionsBuilder options = new OptionsBuilder() .mode(Mode.AverageTime) .warmupIterations(2) diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/model/MappingTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/model/MappingTest.java index 5726bd76..7e47e618 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/model/MappingTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/model/MappingTest.java @@ -1,15 +1,15 @@ package io.jenkins.plugins.casc.model; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class MappingTest { +class MappingTest { @Test - public void empty() { + void empty() { Mapping mapping = new Mapping(); String aKey = "aKey"; mapping.put(aKey, (CNode) null); @@ -19,7 +19,7 @@ public class MappingTest { } @Test - public void notEmpty() throws Exception { + void notEmpty() throws Exception { Mapping mapping = new Mapping(); String aKey = "aKey"; String aValue = "aValue"; diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/permissions/PermissionsTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/permissions/PermissionsTest.java index c44b7b1e..fe72aa93 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/permissions/PermissionsTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/permissions/PermissionsTest.java @@ -11,28 +11,26 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import com.google.common.collect.ImmutableMap; import java.util.Map; import jenkins.model.Jenkins; import org.htmlunit.html.HtmlPage; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.JenkinsRule.WebClient; import org.jvnet.hudson.test.MockAuthorizationStrategy; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class PermissionsTest { +@WithJenkins +class PermissionsTest { private static final String RELATIVE_PATH_MANAGE_PAGE = "manage"; private static final String RELATIVE_PATH_CASC_PAGE = "configuration-as-code"; - @Rule - public JenkinsRule j = new JenkinsRule(); - @Test - public void checkPermissionsForReader() throws Exception { + void checkPermissionsForReader(JenkinsRule j) throws Exception { final String READER = "reader"; j.jenkins.setSecurityRealm(j.createDummySecurityRealm()); j.jenkins.setAuthorizationStrategy( @@ -46,7 +44,7 @@ public class PermissionsTest { } @Test - public void checkPermissionsForSystemReader() throws Exception { + void checkPermissionsForSystemReader(JenkinsRule j) throws Exception { final String SYSTEM_READER = "systemReader"; j.jenkins.setSecurityRealm(j.createDummySecurityRealm()); j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy() @@ -71,7 +69,7 @@ public class PermissionsTest { } @Test - public void checkPermissionsForManager() throws Exception { + void checkPermissionsForManager(JenkinsRule j) throws Exception { final String MANAGER = "manager"; j.jenkins.setSecurityRealm(j.createDummySecurityRealm()); j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy() @@ -93,7 +91,7 @@ public class PermissionsTest { } @Test - public void checkPermissionsForAdmin() throws Exception { + void checkPermissionsForAdmin(JenkinsRule j) throws Exception { final String ADMIN = "admin"; j.jenkins.setSecurityRealm(j.createDummySecurityRealm()); j.jenkins.setAuthorizationStrategy(new MockAuthorizationStrategy() diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategyTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategyTest.java index b54320dd..587c0ed5 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategyTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategyTest.java @@ -1,22 +1,20 @@ package io.jenkins.plugins.casc.yaml; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import io.jenkins.plugins.casc.ConfigurationAsCode; import io.jenkins.plugins.casc.ConfiguratorException; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class ErrorOnConflictMergeStrategyTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class ErrorOnConflictMergeStrategyTest { @Test - public void merge() throws ConfiguratorException { + void merge(JenkinsRule j) throws ConfiguratorException { String normalSource = getClass().getResource("normal.yml").toExternalForm(); String overwriteSource = getClass().getResource("overwrite.yml").toExternalForm(); String conflictsSource = getClass().getResource("conflicts.yml").toExternalForm(); @@ -25,23 +23,25 @@ public class ErrorOnConflictMergeStrategyTest { ConfigurationAsCode.get().configure(normalSource, overwriteSource); // merge with conflicts - assertThrows("Merging two conflict config files", ConfiguratorException.class, () -> ConfigurationAsCode.get() - .configure(normalSource, conflictsSource)); + assertThrows( + ConfiguratorException.class, + () -> ConfigurationAsCode.get().configure(normalSource, conflictsSource), + "Merging two conflict config files"); } @Test - public void incompatible() throws ConfiguratorException { + void incompatible(JenkinsRule j) throws ConfiguratorException { String normalSource = getClass().getResource("normal.yml").toExternalForm(); String incompatibleSource = getClass().getResource("incompatible.yml").toExternalForm(); assertThrows( - "Incompatible config files merging process", ConfiguratorException.class, - () -> ConfigurationAsCode.get().configure(normalSource, incompatibleSource)); + () -> ConfigurationAsCode.get().configure(normalSource, incompatibleSource), + "Incompatible config files merging process"); } @Test - public void hasCorrectDefaultName() { + void hasCorrectDefaultName(JenkinsRule j) { MergeStrategy strategy = MergeStrategyFactory.getMergeStrategyOrDefault(null); assertNotNull(strategy); assertEquals(MergeStrategy.DEFAULT_STRATEGY, strategy.getName()); diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ExportTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ExportTest.java index d7c867a4..82edb0de 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ExportTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/ExportTest.java @@ -12,10 +12,10 @@ import io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator; import io.jenkins.plugins.casc.model.CNode; import java.io.IOException; import java.io.StringWriter; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.nodes.Node; @@ -23,13 +23,11 @@ import org.yaml.snakeyaml.nodes.Node; /** * Contains tests for particular export cases. */ -public class ExportTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class ExportTest { @Test - public void shouldNotExportValuesWithSecretGetters() throws Exception { + void shouldNotExportValuesWithSecretGetters(JenkinsRule j) throws Exception { DataBoundConfigurator c = new DataBoundConfigurator<>(DataBoundSecret.class); String res = export(c, new DataBoundSecret("test")); assertThat(res, not(containsString("test"))); @@ -37,7 +35,7 @@ public class ExportTest { @Test @Issue("SECURITY-1458") - public void shouldNotExportValuesWithSecretFields() throws Exception { + void shouldNotExportValuesWithSecretFields(JenkinsRule j) throws Exception { DataBoundConfigurator c = new DataBoundConfigurator<>(DataBoundSecretField.class); String res = export(c, new DataBoundSecretField("test")); assertThat(res, not(containsString("test"))); @@ -45,7 +43,7 @@ public class ExportTest { @Test @Issue("SECURITY-1458") - public void shouldNotExportValuesWithSecretConstructors() throws Exception { + void shouldNotExportValuesWithSecretConstructors(JenkinsRule j) throws Exception { DataBoundConfigurator c = new DataBoundConfigurator<>(DataBoundSecretConstructor.class); String res = export(c, new DataBoundSecretConstructor(Secret.fromString("test"))); diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyActionTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyActionTest.java index 4c375343..bb025bad 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyActionTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyActionTest.java @@ -1,8 +1,8 @@ package io.jenkins.plugins.casc.yaml; import static org.htmlunit.HttpMethod.GET; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.io.IOException; import java.net.URL; @@ -10,17 +10,15 @@ import java.text.MessageFormat; import net.sf.json.JSONObject; import org.htmlunit.WebRequest; import org.htmlunit.WebResponse; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class MergeStrategyActionTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class MergeStrategyActionTest { @Test - public void test() throws IOException { + void test(JenkinsRule j) throws IOException { URL apiURL = new URL(MessageFormat.format("{0}cascMergeStrategy", j.getURL().toString())); WebRequest request = new WebRequest(apiURL, GET); @@ -29,8 +27,8 @@ public class MergeStrategyActionTest { String strategies = response.getContentAsString(); JSONObject strategiesJSON = JSONObject.fromObject(strategies); - assertEquals("The request should be ok", "ok", strategiesJSON.getString("status")); - assertNotNull("Should have data field", strategiesJSON.getJSONArray("data")); + assertEquals("ok", strategiesJSON.getString("status"), "The request should be ok"); + assertNotNull(strategiesJSON.getJSONArray("data"), "Should have data field"); for (Object item : strategiesJSON.getJSONArray("data")) { String name = JSONObject.fromObject(item).getString("name"); assertEquals( diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyTest.java index 159a64c2..56e1e9b4 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyTest.java @@ -1,25 +1,23 @@ package io.jenkins.plugins.casc.yaml; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.ExtensionList; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; -public class MergeStrategyTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class MergeStrategyTest { @Test - public void haveTheDefaultStrategy() { + void haveTheDefaultStrategy(JenkinsRule j) { ExtensionList strategyExtensionList = Jenkins.get().getExtensionList(MergeStrategy.class); - assertTrue("should have at least one strategy", strategyExtensionList.size() > 0); + assertFalse(strategyExtensionList.isEmpty(), "should have at least one strategy"); assertNotNull( - "default merge strategy should not be null", MergeStrategyFactory.getMergeStrategyOrDefault(null)); + MergeStrategyFactory.getMergeStrategyOrDefault(null), "default merge strategy should not be null"); } } diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlExportTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlExportTest.java index 15eb2b19..5ffb382a 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlExportTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlExportTest.java @@ -2,28 +2,26 @@ package io.jenkins.plugins.casc.yaml; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import io.jenkins.plugins.casc.Attribute; import io.jenkins.plugins.casc.AttributeTest; import io.jenkins.plugins.casc.impl.configurators.DataBoundConfigurator; import java.util.Set; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; /** * Contains tests for particular export cases. */ -public class YamlExportTest { - - @Rule - public JenkinsRule j = new JenkinsRule(); +@WithJenkins +class YamlExportTest { @Test @Issue("SECURITY-1458") - public void shouldDiscoverSecretsBasedOnTheAttributeType() { + void shouldDiscoverSecretsBasedOnTheAttributeType(JenkinsRule j) { DataBoundConfigurator c = new DataBoundConfigurator<>(AttributeTest.SecretRenamedFieldFithSecretConstructor.class); Set attributes = c.describe(); diff --git a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlSourceTest.java b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlSourceTest.java index 423dcfeb..b03c7420 100644 --- a/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlSourceTest.java +++ b/plugin/src/test/java/io/jenkins/plugins/casc/yaml/YamlSourceTest.java @@ -1,6 +1,6 @@ package io.jenkins.plugins.casc.yaml; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import io.jenkins.plugins.casc.MockHttpServletRequest; import jakarta.servlet.http.HttpServletRequest; @@ -9,12 +9,12 @@ import java.io.File; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class YamlSourceTest { +class YamlSourceTest { @Test - public void shouldHaveInformativeToStringForUrlSource() { + void shouldHaveInformativeToStringForUrlSource() { // given String testUrl = "http://example.com/foo/bar"; // and @@ -24,7 +24,7 @@ public class YamlSourceTest { } @Test - public void shouldUseToStringOfSourceInToStringForInputStream() { + void shouldUseToStringOfSourceInToStringForInputStream() { // given InputStream testInputStream = new ByteArrayInputStream("IS content".getBytes(StandardCharsets.UTF_8)); String testInputStreamToString = testInputStream.toString(); @@ -35,7 +35,7 @@ public class YamlSourceTest { } @Test - public void shouldHaveInformativeToStringForPathSource() { + void shouldHaveInformativeToStringForPathSource() { Path path = new File("./test").toPath(); String testPathToString = path.toString(); YamlSource yamlSource = YamlSource.of(path); @@ -43,7 +43,7 @@ public class YamlSourceTest { } @Test - public void shouldHaveInformativeToStringForRequestSource() { + void shouldHaveInformativeToStringForRequestSource() { HttpServletRequest request = new MockHttpServletRequest("/configuration-as-code/check"); YamlSource yamlSource = YamlSource.of(request); assertEquals("YamlSource: /configuration-as-code/check", yamlSource.toString()); diff --git a/pom.xml b/pom.xml index d2f25a56..df7120f2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 5.6 + 5.7 @@ -40,10 +40,11 @@ 999999-SNAPSHOT jenkinsci/configuration-as-code-plugin 2.479 + 2.495 configuration-as-code-@{project.version} - 4051.v78dce3ce8b_d6 + 4136.vca_c3202a_7fd1 false diff --git a/test-harness/pom.xml b/test-harness/pom.xml index 9c16d8b3..0078516e 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -32,7 +32,7 @@ com.github.erosb everit-json-schema - 1.14.4 + 1.14.5 com.github.stefanbirkner diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java index 0e6fa337..fd169d91 100644 --- a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java +++ b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/Util.java @@ -37,6 +37,7 @@ import org.everit.json.schema.ValidationException; import org.everit.json.schema.loader.SchemaLoader; import org.json.JSONObject; import org.json.JSONTokener; +import org.jvnet.hudson.test.LogRecorder; import org.jvnet.hudson.test.LoggerRule; import org.yaml.snakeyaml.nodes.Node; @@ -207,6 +208,17 @@ public class Util { logging.getMessages().stream().anyMatch(m -> m.contains(unexpectedText))); } + /** + * Checks whether {@link LogRecorder} has not recorded the message. + * @param logging Logger rule + * @param unexpectedText Text to check + */ + public static void assertNotInLog(LogRecorder logging, String unexpectedText) { + assertFalse( + "The log should not contain '" + unexpectedText + "'", + logging.getMessages().stream().anyMatch(m -> m.contains(unexpectedText))); + } + /** * Checks whether {@link LoggerRule} has recorded the message. * @param logging Logger rule @@ -219,6 +231,17 @@ public class Util { logging.getMessages().stream().anyMatch(m -> m.contains(expectedText))); } + /** + * Checks whether {@link LogRecorder} has recorded the message. + * @param logging Logger rule + * @param expectedText Text to check + */ + public static void assertLogContains(LogRecorder logging, String expectedText) { + assertTrue( + "The log should contain '" + expectedText + "'", + logging.getMessages().stream().anyMatch(m -> m.contains(expectedText))); + } + /** *

Converts a given yamlString into a JsonString.

*

Example Usage:

diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/junit/jupiter/JUnit5JenkinsConfiguredWithCodeRule.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/junit/jupiter/JUnit5JenkinsConfiguredWithCodeRule.java index f77797f6..95d304d4 100644 --- a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/junit/jupiter/JUnit5JenkinsConfiguredWithCodeRule.java +++ b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/junit/jupiter/JUnit5JenkinsConfiguredWithCodeRule.java @@ -1,6 +1,7 @@ package io.jenkins.plugins.casc.misc.junit.jupiter; import edu.umd.cs.findbugs.annotations.NonNull; +import hudson.security.ACL; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -22,6 +23,9 @@ class JUnit5JenkinsConfiguredWithCodeRule extends JenkinsConfiguredWithCodeRule @Override public void recipe() throws Exception { + // so that test code has all the access to the system + ACL.as2(ACL.SYSTEM2); + final JenkinsRecipe recipe = this.testDescription.getAnnotation(JenkinsRecipe.class); if (recipe == null) { return; diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/BackwardCompatibilityTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/BackwardCompatibilityTest.java index c18cc610..1ea42cea 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/BackwardCompatibilityTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/BackwardCompatibilityTest.java @@ -1,29 +1,27 @@ package io.jenkins.plugins.casc; import static java.lang.String.format; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.model.Node; import hudson.util.VersionNumber; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.List; import jenkins.model.Jenkins; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Nicolas De Loof */ -public class BackwardCompatibilityTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class BackwardCompatibilityTest { @Test @ConfiguredWithCode("BackwardCompatibilityTest.yml") - public void should_accept_legacy_symbols_on_descriptors() { + void should_accept_legacy_symbols_on_descriptors(JenkinsConfiguredWithCodeRule j) { final List nodes = j.jenkins.getNodes(); System.out.println(nodes); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/CascJmhBenchmarkStateTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/CascJmhBenchmarkStateTest.java index 2a17052d..dd9467ab 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/CascJmhBenchmarkStateTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/CascJmhBenchmarkStateTest.java @@ -1,7 +1,7 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import hudson.Functions; import java.io.IOException; @@ -10,8 +10,8 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.TimeUnit; import jenkins.benchmark.jmh.BenchmarkFinder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.openjdk.jmh.results.format.ResultFormatType; import org.openjdk.jmh.runner.Runner; import org.openjdk.jmh.runner.options.ChainedOptionsBuilder; @@ -20,20 +20,20 @@ import org.openjdk.jmh.runner.options.OptionsBuilder; /** * Runs sample benchmarks from JUnit tests. */ -public class CascJmhBenchmarkStateTest { +class CascJmhBenchmarkStateTest { private static final String reportPath = "target/jmh-reports/jmh-benchmark-report.json"; - @Before - public void createDirectoryForBenchmarkReport() throws IOException { + @BeforeEach + void createDirectoryForBenchmarkReport() throws IOException { Path directory = Paths.get("target/jmh-reports/"); Files.createDirectories(directory); } @Test - public void testJmhBenchmarks() throws Exception { + void testJmhBenchmarks() throws Exception { assumeFalse( - "TODO Cannot run program C:\\openjdk-11\\bin\\java.exe: CreateProcess error=206, The filename or extension is too long", - Functions.isWindows() && System.getenv("CI") != null); + Functions.isWindows() && System.getenv("CI") != null, + "TODO Cannot run program C:\\openjdk-11\\bin\\java.exe: CreateProcess error=206, The filename or extension is too long"); // number of iterations is kept to a minimum just to verify that the benchmarks work without spending extra // time during builds. ChainedOptionsBuilder optionsBuilder = new OptionsBuilder() diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java index 8cd9f4a3..7bf62ab7 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/ConfigurationAsCodeTest.java @@ -10,14 +10,17 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.htmlunit.HttpMethod.POST; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import hudson.Functions; import hudson.util.FormValidation; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import io.jenkins.plugins.casc.model.Source; import io.jenkins.plugins.casc.yaml.YamlSource; @@ -36,89 +39,76 @@ import org.htmlunit.WebResponse; import org.htmlunit.html.HtmlForm; import org.htmlunit.html.HtmlInput; import org.htmlunit.html.HtmlPage; -import org.junit.Assume; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule.WebClient; -public class ConfigurationAsCodeTest { +@WithJenkinsConfiguredWithCode +class ConfigurationAsCodeTest { - @Rule - public TemporaryFolder tempFolder = new TemporaryFolder(); - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); + @TempDir + public File tempFolder; @Test - public void init_test_from_accepted_sources() throws Exception { + void init_test_from_accepted_sources(JenkinsConfiguredWithCodeRule j) throws Exception { ConfigurationAsCode casc = new ConfigurationAsCode(); - File exactFile = tempFolder.newFile("jenkins_1.yaml"); // expected + File exactFile = newFile(tempFolder, "jenkins_1.yaml"); // expected - tempFolder.newFile("jenkins_2.YAML"); // expected, alternate extension - tempFolder.newFile("jenkins_3.YML"); // expected, alternate extension - tempFolder.newFile("jenkins_4.yml"); // expected, alternate extension + newFile(tempFolder, "jenkins_2.YAML"); // expected, alternate extension + newFile(tempFolder, "jenkins_3.YML"); // expected, alternate extension + newFile(tempFolder, "jenkins_4.yml"); // expected, alternate extension // should be picked up Path target = Paths.get("jenkins.tmp"); - Path newLink = Paths.get(tempFolder.getRoot().getAbsolutePath(), "jenkins_5.yaml"); + Path newLink = Paths.get(tempFolder.getAbsolutePath(), "jenkins_5.yaml"); try { Files.createSymbolicLink(newLink, target); } catch (IOException e) { // often fails on windows due to non admin users not having symlink permission by default, see: // https://stackoverflow.com/questions/23217460/how-to-create-soft-symbolic-link-using-java-nio-files/24353758#24353758 - Assume.assumeFalse(Functions.isWindows()); + assumeFalse(Functions.isWindows()); throw e; } // should *NOT* be picked up - tempFolder.newFolder("folder.yaml"); + newFolder(tempFolder, "folder.yaml"); // Replicate a k8s ConfigMap mount : // lrwxrwxrwx 1 root root 19 Oct 15 16:43 jenkins_6.yaml -> ..data/jenkins_6.yaml // lrwxrwxrwx 1 root root 31 Oct 29 16:29 ..data -> ..2018_10_29_16_29_08.094515936 // drwxr-xr-x 2 root root 4.0K Oct 29 16:29 ..2018_10_29_16_29_08.094515936 - final File timestamp = tempFolder.newFolder("..2018_10_29_16_29_08.094515936"); + final File timestamp = newFolder(tempFolder, "..2018_10_29_16_29_08.094515936"); new File(timestamp, "jenkins_6.yaml").createNewFile(); - final Path data = Paths.get(tempFolder.getRoot().getAbsolutePath(), "..data"); + final Path data = Paths.get(tempFolder.getAbsolutePath(), "..data"); Files.createSymbolicLink(data, timestamp.toPath()); Files.createSymbolicLink( - Paths.get(tempFolder.getRoot().getAbsolutePath(), "jenkins_6.yaml"), data.resolve("jenkins_6.yaml")); + Paths.get(tempFolder.getAbsolutePath(), "jenkins_6.yaml"), data.resolve("jenkins_6.yaml")); // Create a symbolic linked folder with 1 configuration file - final File folderLinkTarget = tempFolder.newFolder("..2019_11_26_16_29_08.094515937"); + final File folderLinkTarget = newFolder(tempFolder, "..2019_11_26_16_29_08.094515937"); new File(folderLinkTarget, "jenkins_7.yaml").createNewFile(); - Files.createSymbolicLink( - Paths.get(tempFolder.getRoot().getAbsolutePath(), "linked_folder"), folderLinkTarget.toPath()); + Files.createSymbolicLink(Paths.get(tempFolder.getAbsolutePath(), "linked_folder"), folderLinkTarget.toPath()); assertThat(casc.configs(exactFile.getAbsolutePath()), hasSize(1)); - final List foo = casc.configs(tempFolder.getRoot().getAbsolutePath()); - assertThat( - "failed to find 7 configs in " - + Arrays.toString(tempFolder.getRoot().list()), - foo, - hasSize(7)); + final List foo = casc.configs(tempFolder.getAbsolutePath()); + assertThat("failed to find 7 configs in " + Arrays.toString(tempFolder.list()), foo, hasSize(7)); } @Test - public void test_ordered_config_loading() throws Exception { + void test_ordered_config_loading(JenkinsConfiguredWithCodeRule j) throws Exception { ConfigurationAsCode casc = new ConfigurationAsCode(); - tempFolder.newFile("0.yaml"); - tempFolder.newFile("1.yaml"); - tempFolder.newFile("a.yaml"); - tempFolder.newFile("z.yaml"); + newFile(tempFolder, "0.yaml"); + newFile(tempFolder, "1.yaml"); + newFile(tempFolder, "a.yaml"); + newFile(tempFolder, "z.yaml"); - final List foo = casc.configs(tempFolder.getRoot().getAbsolutePath()); - assertThat( - "failed to find 4 configs in " - + Arrays.toString(tempFolder.getRoot().list()), - foo, - hasSize(4)); + final List foo = casc.configs(tempFolder.getAbsolutePath()); + assertThat("failed to find 4 configs in " + Arrays.toString(tempFolder.list()), foo, hasSize(4)); assertTrue(foo.get(0).endsWith("0.yaml")); assertTrue(foo.get(1).endsWith("1.yaml")); assertTrue(foo.get(2).endsWith("a.yaml")); @@ -126,10 +116,10 @@ public class ConfigurationAsCodeTest { } @Test - public void test_loads_single_file_from_hidden_folder() throws Exception { + void test_loads_single_file_from_hidden_folder(JenkinsConfiguredWithCodeRule j) throws Exception { ConfigurationAsCode casc = ConfigurationAsCode.get(); - File hiddenFolder = tempFolder.newFolder(".nested"); + File hiddenFolder = newFolder(tempFolder, ".nested"); File singleFile = new File(hiddenFolder, "jenkins.yml"); try (InputStream configStream = getClass().getResourceAsStream("JenkinsConfigTest.yml")) { Files.copy(configStream, singleFile.toPath(), StandardCopyOption.REPLACE_EXISTING); @@ -145,25 +135,25 @@ public class ConfigurationAsCodeTest { @ConfiguredWithCode( value = {"merge1.yml", "merge3.yml"}, expected = ConfiguratorException.class) - public void test_loads_multi_files() { + void test_loads_multi_files(JenkinsConfiguredWithCodeRule j) { ConfigurationAsCode casc = ConfigurationAsCode.get(); List sources = casc.getSources(); assertNotNull(sources); - assertEquals(sources.size(), 2); + assertEquals(2, sources.size()); } - @Test(expected = ConfiguratorException.class) - public void shouldReportMissingFileOnNotFoundConfig() throws ConfiguratorException { + @Test + void shouldReportMissingFileOnNotFoundConfig() { ConfigurationAsCode casc = new ConfigurationAsCode(); - casc.configure("some"); + assertThrows(ConfiguratorException.class, () -> casc.configure("some")); } @Test @ConfiguredWithCode( value = {"merge1.yml", "merge3.yml"}, expected = ConfiguratorException.class) - public void shouldMergeYamlConfig() { + void shouldMergeYamlConfig(JenkinsConfiguredWithCodeRule j) { assertEquals("Configured by Configuration as Code plugin", j.jenkins.getSystemMessage()); assertEquals(0, j.jenkins.getNumExecutors()); assertNotNull(j.jenkins.getNode("agent1")); @@ -174,23 +164,23 @@ public class ConfigurationAsCodeTest { @ConfiguredWithCode( value = {"merge1.yml", "merge2.yml"}, expected = ConfiguratorException.class) - public void shouldReportConfigurationConflict() { + void shouldReportConfigurationConflict(JenkinsConfiguredWithCodeRule j) { // expected to throw Configurator Exception // nodes should be empty due to conflict assertThat(j.jenkins.getNodes(), is(empty())); } @Test - public void doCheckNewSource_should_trim_input() { + void doCheckNewSource_should_trim_input(JenkinsConfiguredWithCodeRule j) { ConfigurationAsCode casc = ConfigurationAsCode.get(); String configUri = getClass().getResource("merge3.yml").toExternalForm(); - assertEquals(casc.doCheckNewSource(" " + configUri + " ").kind, FormValidation.Kind.OK); + assertEquals(FormValidation.Kind.OK, casc.doCheckNewSource(" " + configUri + " ").kind); } @Test - public void doCheckNewSource_should_support_multiple_sources() { + void doCheckNewSource_should_support_multiple_sources(JenkinsConfiguredWithCodeRule j) { ConfigurationAsCode casc = ConfigurationAsCode.get(); String configUri = String.format( @@ -198,12 +188,12 @@ public class ConfigurationAsCodeTest { getClass().getResource("JenkinsConfigTest.yml").toExternalForm(), getClass().getResource("folder/jenkins2.yml").toExternalForm()); - assertEquals(casc.doCheckNewSource(configUri).kind, FormValidation.Kind.OK); + assertEquals(FormValidation.Kind.OK, casc.doCheckNewSource(configUri).kind); } @Test @Issue("Issue #653") - public void checkWith_should_pass_against_valid_input() throws Exception { + void checkWith_should_pass_against_valid_input(JenkinsConfiguredWithCodeRule j) throws Exception { String rawConf = getClass().getResource("JenkinsConfigTest.yml").toExternalForm(); YamlSource input = YamlSource.of(rawConf); Map actual = ConfigurationAsCode.get().checkWith(input); @@ -213,7 +203,8 @@ public class ConfigurationAsCodeTest { @Test @Issue("Issue #653") @ConfiguredWithCode("aNonEmpty.yml") - public void checkWith_should_pass_against_input_which_has_same_entries_with_initial_config() throws Exception { + void checkWith_should_pass_against_input_which_has_same_entries_with_initial_config(JenkinsConfiguredWithCodeRule j) + throws Exception { String rawConf = getClass().getResource("JenkinsConfigTest.yml").toExternalForm(); YamlSource input = YamlSource.of(rawConf); Map actual = ConfigurationAsCode.get().checkWith(input); @@ -221,7 +212,7 @@ public class ConfigurationAsCodeTest { } @Test - public void doReplace_should_trim_input() throws Exception { + void doReplace_should_trim_input(JenkinsConfiguredWithCodeRule j) throws Exception { HtmlPage page = j.createWebClient().goTo("configuration-as-code"); j.assertGoodStatus(page); @@ -236,7 +227,7 @@ public class ConfigurationAsCodeTest { } @Test - public void doReplace_should_support_multiple_sources() throws Exception { + void doReplace_should_support_multiple_sources(JenkinsConfiguredWithCodeRule j) throws Exception { HtmlPage page = j.createWebClient().goTo("configuration-as-code"); j.assertGoodStatus(page); @@ -256,7 +247,7 @@ public class ConfigurationAsCodeTest { @Test @ConfiguredWithCode("admin.yml") - public void doViewExport_should_require_authentication() throws Exception { + void doViewExport_should_require_authentication(JenkinsConfiguredWithCodeRule j) throws Exception { WebClient client = j.createWebClient(); WebRequest request = new WebRequest(client.createCrumbedUrl("configuration-as-code/viewExport"), POST); WebResponse response = client.loadWebResponse(request); @@ -269,7 +260,7 @@ public class ConfigurationAsCodeTest { @Test @Issue("Issue #739") - public void preferEnvOverGlobalConfigForConfigPath() throws Exception { + void preferEnvOverGlobalConfigForConfigPath(JenkinsConfiguredWithCodeRule j) throws Exception { String firstConfig = getClass().getResource("JenkinsConfigTest.yml").toExternalForm(); String secondConfig = getClass().getResource("merge3.yml").toExternalForm(); CasCGlobalConfig descriptor = (CasCGlobalConfig) j.jenkins.getDescriptor(CasCGlobalConfig.class); @@ -283,22 +274,23 @@ public class ConfigurationAsCodeTest { System.clearProperty(CASC_JENKINS_CONFIG_PROPERTY); } + // file names matter for order! @Test - @ConfiguredWithCode(value = {"aNonEmpty.yml", "empty.yml"}) // file names matter for order! - public void test_non_first_yaml_file_empty() { + @ConfiguredWithCode(value = {"aNonEmpty.yml", "empty.yml"}) + void test_non_first_yaml_file_empty(JenkinsConfiguredWithCodeRule j) { assertEquals("Configured by Configuration as Code plugin", j.jenkins.getSystemMessage()); } @Test @Issue("Issue #914") - public void isSupportedURI_should_not_throw_on_invalid_uri() { + void isSupportedURI_should_not_throw_on_invalid_uri() { // for example, a Windows path is not a valid URI assertThat(ConfigurationAsCode.isSupportedURI("C:\\jenkins\\casc"), is(false)); } @Test @ConfiguredWithCode("multi-line1.yml") - public void multiline_literal_stays_literal_in_export() throws Exception { + void multiline_literal_stays_literal_in_export(JenkinsConfiguredWithCodeRule j) throws Exception { assertEquals( "Welcome to our build server.\n\n" + "This Jenkins is 100% configured and managed 'as code'.\n", j.jenkins.getSystemMessage()); @@ -315,7 +307,7 @@ public class ConfigurationAsCodeTest { @Test @ConfiguredWithCode("multi-line2.yml") - public void string_to_literal_in_export() throws Exception { + void string_to_literal_in_export(JenkinsConfiguredWithCodeRule j) throws Exception { assertEquals( "Welcome to our build server.\n\n" + "This Jenkins is 100% configured and managed 'as code'.\n", j.jenkins.getSystemMessage()); @@ -331,7 +323,7 @@ public class ConfigurationAsCodeTest { } @Test - public void testHtmlDocStringRetrieval() throws Exception { + void testHtmlDocStringRetrieval(JenkinsConfiguredWithCodeRule j) throws Exception { String expectedDocString = "
\n" + " If checked, this will allow users who are not authenticated to access Jenkins\n in a read-only mode.\n" + "
\n"; @@ -341,8 +333,25 @@ public class ConfigurationAsCodeTest { } @Test - public void configurationCategory() { + void configurationCategory(JenkinsConfiguredWithCodeRule j) { ConfigurationAsCode configurationAsCode = ConfigurationAsCode.get(); assertThat(configurationAsCode.getCategoryName(), is("CONFIGURATION")); } + + private static File newFolder(File root, String... subDirs) throws IOException { + String subFolder = String.join("/", subDirs); + File result = new File(root, subFolder); + if (!result.mkdirs()) { + throw new IOException("Couldn't create folders " + result); + } + return result; + } + + private static File newFile(File root, String fileName) throws IOException { + File result = new File(root, fileName); + if (!result.createNewFile()) { + throw new IOException("Couldn't create file " + result); + } + return result; + } } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/SampleBenchmark.java b/test-harness/src/test/java/io/jenkins/plugins/casc/SampleBenchmark.java index c2722826..1f8543d9 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/SampleBenchmark.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/SampleBenchmark.java @@ -1,6 +1,6 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import edu.umd.cs.findbugs.annotations.NonNull; import io.jenkins.plugins.casc.misc.jmh.CascJmhBenchmarkState; diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationSanitisationTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationSanitisationTest.java index c7428438..65d08d80 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationSanitisationTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationSanitisationTest.java @@ -2,19 +2,17 @@ package io.jenkins.plugins.casc; import static io.jenkins.plugins.casc.SchemaGeneration.removeHtmlTags; import static io.jenkins.plugins.casc.SchemaGeneration.retrieveDocStringFromAttribute; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Test; -public class SchemaGenerationSanitisationTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class SchemaGenerationSanitisationTest { @Test - public void testRetrieveDocStringFromAttribute() { + void testRetrieveDocStringFromAttribute(JenkinsConfiguredWithCodeRule j) { String expectedDocString = "If checked, this will allow users who are not authenticated to access Jenkins\n in a read-only mode."; String actualDocString = retrieveDocStringFromAttribute( @@ -23,7 +21,7 @@ public class SchemaGenerationSanitisationTest { } @Test - public void testRemoveHtmlTagRegex() { + void testRemoveHtmlTagRegex(JenkinsConfiguredWithCodeRule j) { String htmlTagString = "
If checked, this will allow users who are not authenticated to access Jenkins in a read-only mode.
"; String expectedString = diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationTest.java index 2fef3b3a..b93d76ac 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/SchemaGenerationTest.java @@ -7,50 +7,48 @@ import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Test; -public class SchemaGenerationTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class SchemaGenerationTest { @Test - public void validSchemaShouldSucceed() throws Exception { + void validSchemaShouldSucceed(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat(validateSchema(convertYamlFileToJson(this, "validSchemaConfig.yml")), empty()); } @Test - public void invalidSchemaShouldNotSucceed() throws Exception { + void invalidSchemaShouldNotSucceed(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat( validateSchema(convertYamlFileToJson(this, "invalidSchemaConfig.yml")), contains("#/jenkins/numExecutors: expected type: Integer, found: String")); } @Test - public void rejectsInvalidBaseConfigurator() throws Exception { + void rejectsInvalidBaseConfigurator(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat( validateSchema(convertYamlFileToJson(this, "invalidBaseConfig.yml")), contains("#: extraneous key [invalidBaseConfigurator] is not permitted")); } @Test - public void validJenkinsBaseConfigurator() throws Exception { + void validJenkinsBaseConfigurator(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat(validateSchema(convertYamlFileToJson(this, "validJenkinsBaseConfig.yml")), empty()); } @Test - public void symbolResolutionForJenkinsBaseConfigurator() throws Exception { + void symbolResolutionForJenkinsBaseConfigurator(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat(validateSchema(convertYamlFileToJson(this, "validJenkinsBaseConfigWithSymbol.yml")), empty()); } @Test - public void validSelfConfigurator() throws Exception { + void validSelfConfigurator(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat(validateSchema(convertYamlFileToJson(this, "validSelfConfig.yml")), empty()); } @Test - public void attributesNotFlattenedToTopLevel() throws Exception { + void attributesNotFlattenedToTopLevel(JenkinsConfiguredWithCodeRule j) throws Exception { assertThat( validateSchema(convertYamlFileToJson(this, "attributesNotFlattenedToTop.yml")), contains("#/tool: extraneous key [acceptLicense] is not permitted")); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/Security1290Test.java b/test-harness/src/test/java/io/jenkins/plugins/casc/Security1290Test.java index 81e8a989..5c935a42 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/Security1290Test.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/Security1290Test.java @@ -1,26 +1,24 @@ package io.jenkins.plugins.casc; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; import jenkins.model.Jenkins; import org.htmlunit.HttpMethod; import org.htmlunit.WebRequest; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.JenkinsRule; import org.jvnet.hudson.test.MockAuthorizationStrategy; -public class Security1290Test { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class Security1290Test { @Test - public void configurationAsCodePagesPermissions() throws Exception { + void configurationAsCodePagesPermissions(JenkinsConfiguredWithCodeRule j) throws Exception { final String ADMIN = "admin"; final String USER = "user"; @@ -40,12 +38,16 @@ public class Security1290Test { JenkinsRule.WebClient userWc = j.createWebClient().withThrowExceptionOnFailingStatusCode(false); userWc.login(USER); - assertRightPermissionConfigurations("configuration-as-code/schema", adminWc, userWc); - assertRightPermissionConfigurations("configuration-as-code/reference", adminWc, userWc); + assertRightPermissionConfigurations(j, "configuration-as-code/schema", adminWc, userWc); + assertRightPermissionConfigurations(j, "configuration-as-code/reference", adminWc, userWc); } private void assertRightPermissionConfigurations( - String relativeUrl, JenkinsRule.WebClient adminWc, JenkinsRule.WebClient userWc) throws IOException { + JenkinsConfiguredWithCodeRule j, + String relativeUrl, + JenkinsRule.WebClient adminWc, + JenkinsRule.WebClient userWc) + throws IOException { WebRequest request = new WebRequest(new URL(j.getURL() + relativeUrl), HttpMethod.GET); assertEquals( diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/YamlReaderTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/YamlReaderTest.java index df8f92f1..fc3b083e 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/YamlReaderTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/YamlReaderTest.java @@ -3,9 +3,11 @@ package io.jenkins.plugins.casc; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.htmlunit.HttpMethod.POST; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.yaml.YamlSource; import io.jenkins.plugins.casc.yaml.YamlUtils; import java.io.IOException; @@ -16,21 +18,18 @@ import java.text.MessageFormat; import jenkins.model.Jenkins; import org.htmlunit.FailingHttpStatusCodeException; import org.htmlunit.WebRequest; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class YamlReaderTest { +@WithJenkinsConfiguredWithCode +class YamlReaderTest { - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); - - @Test(expected = IOException.class) - public void unknownReader() throws IOException { - YamlUtils.reader(new YamlSource<>(new StringBuilder())); + @Test + void unknownReader(JenkinsConfiguredWithCodeRule j) { + assertThrows(IOException.class, () -> YamlUtils.reader(new YamlSource<>(new StringBuilder()))); } @Test - public void folder() throws Exception { + void folder(JenkinsConfiguredWithCodeRule j) throws Exception { String p = Paths.get(getClass().getResource("./folder").toURI()).toFile().getAbsolutePath(); ConfigurationAsCode.get().configure(p); @@ -40,7 +39,7 @@ public class YamlReaderTest { } @Test - public void httpDoApply() throws Exception { + void httpDoApply(JenkinsConfiguredWithCodeRule j) throws Exception { j.jenkins.setCrumbIssuer(null); URL apiURL = new URL(MessageFormat.format( @@ -58,7 +57,7 @@ public class YamlReaderTest { } @Test - public void httpDoCheck() throws Exception { + void httpDoCheck(JenkinsConfiguredWithCodeRule j) throws Exception { j.jenkins.setCrumbIssuer(null); URL apiURL = new URL(MessageFormat.format( @@ -72,15 +71,15 @@ public class YamlReaderTest { assertThat(response, is(200)); } - @Test(expected = FailingHttpStatusCodeException.class) - public void httpDoCheckFailure() throws Exception { + @Test + void httpDoCheckFailure(JenkinsConfiguredWithCodeRule j) throws Exception { j.jenkins.setCrumbIssuer(null); - URL apiURL = new URL(MessageFormat.format( "{0}configuration-as-code/check", j.getURL().toString())); WebRequest request = new WebRequest(apiURL, POST); request.setCharset(StandardCharsets.UTF_8); request.setRequestBody("jenkins:\n" + " systemMessage: {}"); - j.createWebClient().getPage(request); + assertThrows( + FailingHttpStatusCodeException.class, () -> j.createWebClient().getPage(request)); } } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorCloudSupportTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorCloudSupportTest.java index 2c9e9e40..e4c3708e 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorCloudSupportTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorCloudSupportTest.java @@ -5,8 +5,8 @@ import static io.jenkins.plugins.casc.misc.Util.toYamlString; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.Extension; import hudson.model.Descriptor; @@ -20,25 +20,23 @@ 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.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import java.io.IOException; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.PretendSlave; -public class JenkinsConfiguratorCloudSupportTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class JenkinsConfiguratorCloudSupportTest { @Test @ConfiguredWithCode("JenkinsConfiguratorCloudSupportTest.yml") - public void should_have_nodes_configured() { - assertEquals("Base nodes not found", 2, j.jenkins.getNodes().size()); + void should_have_nodes_configured(JenkinsConfiguredWithCodeRule j) { + assertEquals(2, j.jenkins.getNodes().size(), "Base nodes not found"); } @Test - public void should_remove_normal_nodes_configured_after_reload() throws Exception { + void should_remove_normal_nodes_configured_after_reload(JenkinsConfiguredWithCodeRule j) throws Exception { final Node slave = new StaticPretendSlave(); j.jenkins.addNode(slave); @@ -46,11 +44,12 @@ public class JenkinsConfiguratorCloudSupportTest { .configure(this.getClass() .getResource("JenkinsConfiguratorCloudSupportTest.yml") .toString()); - assertEquals("Base nodes not found", 2, j.jenkins.getNodes().size()); + assertEquals(2, j.jenkins.getNodes().size(), "Base nodes not found"); } @Test - public void should_keep_cloud_no_instantiable_nodes_configured_after_reload() throws Exception { + void should_keep_cloud_no_instantiable_nodes_configured_after_reload(JenkinsConfiguredWithCodeRule j) + throws Exception { final Node slave = new Cloud1PretendSlave(); j.jenkins.addNode(slave); @@ -58,14 +57,14 @@ public class JenkinsConfiguratorCloudSupportTest { .configure(this.getClass() .getResource("JenkinsConfiguratorCloudSupportTest.yml") .toString()); - assertEquals("Cloud nodes not found", 3, j.jenkins.getNodes().size()); - assertNotNull("Slave 1", j.jenkins.getNode("agent1")); - assertNotNull("Slave 1", j.jenkins.getNode("agent2")); - assertNotNull("Slave cloud", j.jenkins.getNode("testCloud")); + assertEquals(3, j.jenkins.getNodes().size(), "Cloud nodes not found"); + assertNotNull(j.jenkins.getNode("agent1"), "Slave 1"); + assertNotNull(j.jenkins.getNode("agent2"), "Slave 1"); + assertNotNull(j.jenkins.getNode("testCloud"), "Slave cloud"); } @Test - public void should_keep_cloud_ephemeral_nodes_configured_after_reload() throws Exception { + void should_keep_cloud_ephemeral_nodes_configured_after_reload(JenkinsConfiguredWithCodeRule j) throws Exception { final Node slave = new Cloud2PretendSlave(); j.jenkins.addNode(slave); @@ -73,14 +72,15 @@ public class JenkinsConfiguratorCloudSupportTest { .configure(this.getClass() .getResource("JenkinsConfiguratorCloudSupportTest.yml") .toString()); - assertEquals("Cloud nodes not found", 3, j.jenkins.getNodes().size()); - assertNotNull("Slave 1", j.jenkins.getNode("agent1")); - assertNotNull("Slave 1", j.jenkins.getNode("agent2")); - assertNotNull("Slave cloud", j.jenkins.getNode("testCloud")); + assertEquals(3, j.jenkins.getNodes().size(), "Cloud nodes not found"); + assertNotNull(j.jenkins.getNode("agent1"), "Slave 1"); + assertNotNull(j.jenkins.getNode("agent2"), "Slave 1"); + assertNotNull(j.jenkins.getNode("testCloud"), "Slave cloud"); } @Test - public void should_keep_cloud_abstractCloudSlave_nodes_configured_after_reload() throws Exception { + void should_keep_cloud_abstractCloudSlave_nodes_configured_after_reload(JenkinsConfiguredWithCodeRule j) + throws Exception { final Node slave = new Cloud3PretendSlave(); j.jenkins.addNode(slave); @@ -88,15 +88,15 @@ public class JenkinsConfiguratorCloudSupportTest { .configure(this.getClass() .getResource("JenkinsConfiguratorCloudSupportTest.yml") .toString()); - assertEquals("Cloud nodes not found", 3, j.jenkins.getNodes().size()); - assertNotNull("Slave 1", j.jenkins.getNode("agent1")); - assertNotNull("Slave 1", j.jenkins.getNode("agent2")); - assertNotNull("Slave cloud", j.jenkins.getNode("testCloud")); + assertEquals(3, j.jenkins.getNodes().size(), "Cloud nodes not found"); + assertNotNull(j.jenkins.getNode("agent1"), "Slave 1"); + assertNotNull(j.jenkins.getNode("agent2"), "Slave 1"); + assertNotNull(j.jenkins.getNode("testCloud"), "Slave cloud"); } @Test @ConfiguredWithCode("JenkinsConfiguratorCloudSupportTest.yml") - public void should_export_only_static_nodes() throws Exception { + void should_export_only_static_nodes(JenkinsConfiguredWithCodeRule j) throws Exception { j.jenkins.addNode(new Cloud1PretendSlave()); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorTest.java index 55bfdd89..0338fb23 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/core/JenkinsConfiguratorTest.java @@ -3,10 +3,10 @@ package io.jenkins.plugins.casc.core; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; import edu.umd.cs.findbugs.annotations.NonNull; import hudson.EnvVars; @@ -22,14 +22,14 @@ import hudson.util.DescribableList; import io.jenkins.plugins.casc.ConfigurationAsCode; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.io.ByteArrayOutputStream; import java.io.File; import java.util.Objects; import jenkins.model.Jenkins; import org.apache.commons.io.FileUtils; import org.jenkinsci.Symbol; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.TestExtension; import org.kohsuke.stapler.DataBoundConstructor; @@ -37,24 +37,22 @@ import org.kohsuke.stapler.DataBoundConstructor; /** * @author Nicolas De Loof */ -public class JenkinsConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class JenkinsConfiguratorTest { @Test @ConfiguredWithCode("Primitives.yml") - public void jenkins_primitive_attributes() { + void jenkins_primitive_attributes(JenkinsConfiguredWithCodeRule j) { final Jenkins jenkins = Jenkins.get(); assertEquals(6666, jenkins.getSlaveAgentPort()); } @Test @ConfiguredWithCode("HeteroDescribable.yml") - public void jenkins_abstract_describable_attributes() { + void jenkins_abstract_describable_attributes(JenkinsConfiguredWithCodeRule j) { final Jenkins jenkins = Jenkins.get(); - assertTrue(jenkins.getSecurityRealm() instanceof HudsonPrivateSecurityRealm); - assertTrue(jenkins.getAuthorizationStrategy() instanceof FullControlOnceLoggedInAuthorizationStrategy); + assertInstanceOf(HudsonPrivateSecurityRealm.class, jenkins.getSecurityRealm()); + assertInstanceOf(FullControlOnceLoggedInAuthorizationStrategy.class, jenkins.getAuthorizationStrategy()); assertFalse(((FullControlOnceLoggedInAuthorizationStrategy) jenkins.getAuthorizationStrategy()) .isAllowAnonymousRead()); } @@ -62,7 +60,7 @@ public class JenkinsConfiguratorTest { @Test @Issue("Issue #173") @ConfiguredWithCode("SetEnvironmentVariable.yml") - public void shouldSetEnvironmentVariable() throws Exception { + void shouldSetEnvironmentVariable(JenkinsConfiguredWithCodeRule j) throws Exception { final DescribableList, NodePropertyDescriptor> properties = Jenkins.get().getNodeProperties(); EnvVars env = new EnvVars(); @@ -74,7 +72,7 @@ public class JenkinsConfiguratorTest { @Test @ConfiguredWithCode("ConfigureLabels.yml") - public void shouldExportLabelAtoms() throws Exception { + void shouldExportLabelAtoms(JenkinsConfiguredWithCodeRule j) throws Exception { Objects.requireNonNull(Jenkins.get().getLabelAtom("label1")) .getProperties() .add(new TestProperty(1)); @@ -93,7 +91,7 @@ public class JenkinsConfiguratorTest { @Test @ConfiguredWithCode("ConfigureLabels.yml") - public void shouldImportLabelAtoms() { + void shouldImportLabelAtoms(JenkinsConfiguredWithCodeRule j) { LabelAtom label1 = Jenkins.get().getLabelAtom("label1"); assertNotNull(label1); assertThat(label1.getProperties(), hasSize(2)); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/core/MavenConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/core/MavenConfiguratorTest.java index 4e3938f4..aa51b942 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/core/MavenConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/core/MavenConfiguratorTest.java @@ -1,37 +1,37 @@ package io.jenkins.plugins.casc.core; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + import hudson.tasks.Maven; import hudson.tools.InstallSourceProperty; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import jenkins.mvn.FilePathSettingsProvider; import jenkins.mvn.GlobalMavenConfig; import jenkins.mvn.SettingsProvider; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Nicolas De Loof */ -public class MavenConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class MavenConfiguratorTest { @Test @ConfiguredWithCode("MavenConfiguratorTest.yml") - public void should_configure_maven_tools_and_global_config() { + void should_configure_maven_tools_and_global_config(JenkinsConfiguredWithCodeRule j) { final Maven.DescriptorImpl descriptor = (Maven.DescriptorImpl) j.jenkins.getDescriptorOrDie(Maven.class); - Assert.assertEquals(1, descriptor.getInstallations().length); - Assert.assertEquals("/usr/share/maven", descriptor.getInstallations()[0].getHome()); + assertEquals(1, descriptor.getInstallations().length); + assertEquals("/usr/share/maven", descriptor.getInstallations()[0].getHome()); InstallSourceProperty installSourceProperty = descriptor.getInstallations()[0].getProperties().get(InstallSourceProperty.class); - Assert.assertEquals("3.5.0", installSourceProperty.installers.get(Maven.MavenInstaller.class).id); + assertEquals("3.5.0", installSourceProperty.installers.get(Maven.MavenInstaller.class).id); final SettingsProvider provider = GlobalMavenConfig.get().getSettingsProvider(); - Assert.assertTrue(provider instanceof FilePathSettingsProvider); - Assert.assertEquals("/usr/share/maven-settings.xml", ((FilePathSettingsProvider) provider).getPath()); + assertInstanceOf(FilePathSettingsProvider.class, provider); + assertEquals("/usr/share/maven-settings.xml", ((FilePathSettingsProvider) provider).getPath()); } } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/core/UnsecuredAuthorizationStrategyConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/core/UnsecuredAuthorizationStrategyConfiguratorTest.java index 08a34811..0bc68546 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/core/UnsecuredAuthorizationStrategyConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/core/UnsecuredAuthorizationStrategyConfiguratorTest.java @@ -1,23 +1,22 @@ package io.jenkins.plugins.casc.core; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertSame; import hudson.security.AuthorizationStrategy; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Test; /** * @author Kohsuke Kawaguchi */ -public class UnsecuredAuthorizationStrategyConfiguratorTest { - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class UnsecuredAuthorizationStrategyConfiguratorTest { @Test @ConfiguredWithCode("UnsecuredAuthorizationStrategyConfiguratorTest.yml") - public void unsecured() { + void unsecured(JenkinsConfiguredWithCodeRule j) { assertSame(AuthorizationStrategy.UNSECURED, j.jenkins.getAuthorizationStrategy()); } } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/core/UpdateCenterConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/core/UpdateCenterConfiguratorTest.java index 28f38559..4593686d 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/core/UpdateCenterConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/core/UpdateCenterConfiguratorTest.java @@ -1,7 +1,7 @@ package io.jenkins.plugins.casc.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import hudson.model.UpdateCenter; import hudson.model.UpdateSite; @@ -10,20 +10,18 @@ import io.jenkins.plugins.casc.Configurator; 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.junit.jupiter.WithJenkinsConfiguredWithCode; import io.jenkins.plugins.casc.model.CNode; import io.jenkins.plugins.casc.model.Mapping; import java.util.List; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class UpdateCenterConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class UpdateCenterConfiguratorTest { @Test @ConfiguredWithCode("UpdateCenter.yml") - public void shouldSetUpdateCenterSites() throws Exception { + void shouldSetUpdateCenterSites(JenkinsConfiguredWithCodeRule j) throws Exception { UpdateCenter updateCenter = j.jenkins.getUpdateCenter(); List sites = updateCenter.getSites(); assertEquals(2, sites.size()); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DataBoundConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DataBoundConfiguratorTest.java index c265fdfb..30a5ee0b 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DataBoundConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DataBoundConfiguratorTest.java @@ -5,13 +5,13 @@ import static io.jenkins.plugins.casc.misc.Util.assertNotInLog; import static io.jenkins.plugins.casc.misc.Util.getJenkinsRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import hudson.util.Secret; import io.jenkins.plugins.casc.ConfigurationAsCode; @@ -34,34 +34,34 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.PostConstruct; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.jvnet.hudson.test.Issue; import org.jvnet.hudson.test.JenkinsRule; -import org.jvnet.hudson.test.LoggerRule; +import org.jvnet.hudson.test.LogRecorder; +import org.jvnet.hudson.test.junit.jupiter.WithJenkins; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; /** * @author Nicolas De Loof */ -public class DataBoundConfiguratorTest { +@WithJenkins +class DataBoundConfiguratorTest { - @Rule - public JenkinsRule j = new JenkinsRule(); + private JenkinsRule j; - @Rule - public LoggerRule logging = new LoggerRule(); + private final LogRecorder logging = new LogRecorder(); - @Before - public void tearUp() { + @BeforeEach + void tearUp(JenkinsRule j) { + this.j = j; logging.record(Logger.getLogger(DataBoundConfigurator.class.getName()), Level.FINEST) .capture(2048); } @Test - public void configure_databound() throws Exception { + void configure_databound() throws Exception { Mapping config = new Mapping(); config.put("foo", "foo"); config.put("bar", "true"); @@ -78,7 +78,7 @@ public class DataBoundConfiguratorTest { } @Test - public void exportYaml() throws Exception { + void exportYaml() throws Exception { Foo foo = new Foo("foo", true, 42); foo.setZot("zot"); foo.setDbl(12.34); @@ -88,25 +88,25 @@ public class DataBoundConfiguratorTest { final ConfigurationContext context = new ConfigurationContext(registry); final CNode node = c.describe(foo, context); assertNotNull(node); - assertTrue(node instanceof Mapping); + assertInstanceOf(Mapping.class, node); Mapping map = (Mapping) node; - assertEquals(map.get("foo").toString(), "foo"); - assertEquals(map.get("bar").toString(), "true"); - assertEquals(map.get("qix").toString(), "42"); - assertEquals(map.get("zot").toString(), "zot"); - assertEquals(map.get("dbl").toString(), "12.34"); - assertEquals(map.get("flt").toString(), "1.0"); - assertEquals(Util.toYamlString(map.get("foo")).trim(), "\"foo\""); - assertEquals(Util.toYamlString(map.get("bar")).trim(), "true"); - assertEquals(Util.toYamlString(map.get("qix")).trim(), "42"); - assertEquals(Util.toYamlString(map.get("zot")).trim(), "\"zot\""); - assertEquals(Util.toYamlString(map.get("dbl")).trim(), "\"12.34\""); - assertEquals(Util.toYamlString(map.get("flt")).trim(), "\"1.0\""); + assertEquals("foo", map.get("foo").toString()); + assertEquals("true", map.get("bar").toString()); + assertEquals("42", map.get("qix").toString()); + assertEquals("zot", map.get("zot").toString()); + assertEquals("12.34", map.get("dbl").toString()); + assertEquals("1.0", map.get("flt").toString()); + assertEquals("\"foo\"", Util.toYamlString(map.get("foo")).trim()); + assertEquals("true", Util.toYamlString(map.get("bar")).trim()); + assertEquals("42", Util.toYamlString(map.get("qix")).trim()); + assertEquals("\"zot\"", Util.toYamlString(map.get("zot")).trim()); + assertEquals("\"12.34\"", Util.toYamlString(map.get("dbl")).trim()); + assertEquals("\"1.0\"", Util.toYamlString(map.get("flt")).trim()); assertFalse(map.containsKey("other")); } @Test - public void configureWithSets() throws Exception { + void configureWithSets() throws Exception { Mapping config = new Mapping(); Sequence sequence = new Sequence(); sequence.add(new Scalar("bar")); @@ -122,7 +122,7 @@ public class DataBoundConfiguratorTest { } @Test - public void configureWithEmptySet() throws Exception { + void configureWithEmptySet() throws Exception { Mapping config = new Mapping(); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); final Bar configured = @@ -132,7 +132,7 @@ public class DataBoundConfiguratorTest { } @Test - public void nonnullConstructorParameter() throws Exception { + void nonnullConstructorParameter() throws Exception { Mapping config = new Mapping(); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); final NonnullParameterConstructor configured = @@ -142,7 +142,7 @@ public class DataBoundConfiguratorTest { } @Test - public void classParametersAreNonnullByDefault() throws Exception { + void classParametersAreNonnullByDefault() throws Exception { Mapping config = new Mapping(); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); final ClassParametersAreNonnullByDefault configured = @@ -152,7 +152,7 @@ public class DataBoundConfiguratorTest { } @Test - public void packageParametersAreNonnullByDefault() { + void packageParametersAreNonnullByDefault() { Mapping config = new Mapping(); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); @@ -168,7 +168,7 @@ public class DataBoundConfiguratorTest { @Test @Issue("#1025") - public void packageParametersAreNonnullByDefaultButCanBeNullable() throws Exception { + void packageParametersAreNonnullByDefaultButCanBeNullable() throws Exception { Mapping config = new Mapping(); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); final PackageParametersNonNullCheckForNull configured = @@ -179,7 +179,7 @@ public class DataBoundConfiguratorTest { @Test @SuppressWarnings("unchecked") - public void exportWithSets() throws Exception { + void exportWithSets() throws Exception { HashSet set = new HashSet<>(); set.add("foo"); @@ -189,25 +189,26 @@ public class DataBoundConfiguratorTest { final ConfigurationContext context = new ConfigurationContext(registry); CNode node = c.describe(bar, context); assertNotNull(node); - assertTrue(node instanceof Mapping); + assertInstanceOf(Mapping.class, node); Mapping map = (Mapping) node; - assertEquals(map.get("strings").toString(), "[foo]"); - assertEquals(Util.toYamlString(map.get("strings")).trim(), "- \"foo\""); + assertEquals("[foo]", map.get("strings").toString()); + assertEquals("- \"foo\"", Util.toYamlString(map.get("strings")).trim()); assertFalse(map.containsKey("other")); // now with two elements set.add("bar"); node = c.describe(bar, context); assertNotNull(node); - assertTrue(node instanceof Mapping); + assertInstanceOf(Mapping.class, node); map = (Mapping) node; - assertEquals(map.get("strings").toString(), "[bar, foo]"); - assertEquals(Util.toYamlString(map.get("strings")).trim(), "- \"bar\"\n- \"foo\""); + assertEquals("[bar, foo]", map.get("strings").toString()); + assertEquals( + "- \"bar\"\n- \"foo\"", Util.toYamlString(map.get("strings")).trim()); } @Test @Issue("PR #838, Issue #222") - public void export_mapping_should_not_be_null() throws Exception { + void export_mapping_should_not_be_null() throws Exception { j.createFreeStyleProject("testJob1"); ConfigurationAsCode casc = ConfigurationAsCode.get(); casc.configure( @@ -231,28 +232,27 @@ public class DataBoundConfiguratorTest { } @Test - public void shouldThrowConfiguratorException() { + void shouldThrowConfiguratorException() { Mapping config = new Mapping(); config.put("foo", "foo"); config.put("bar", "abcd"); config.put("qix", "99"); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); - try { - registry.lookupOrFail(Foo.class).configure(config, new ConfigurationContext(registry)); - fail("above action is excepted to throw ConfiguratorException!"); - } catch (ConfiguratorException e) { - assertThat( - e.getMessage(), - is( - "foo: Failed to construct instance of class io.jenkins.plugins.casc.impl.configurators.DataBoundConfiguratorTest$Foo.\n" - + " Constructor: public io.jenkins.plugins.casc.impl.configurators.DataBoundConfiguratorTest$Foo(java.lang.String,boolean,int).\n" - + " Arguments: [java.lang.String, java.lang.Boolean, java.lang.Integer].\n" - + " Expected Parameters: foo java.lang.String, bar boolean, qix int")); - } + ConfiguratorException e = assertThrows( + ConfiguratorException.class, + () -> registry.lookupOrFail(Foo.class).configure(config, new ConfigurationContext(registry)), + "action is excepted to throw ConfiguratorException!"); + assertThat( + e.getMessage(), + is( + "foo: Failed to construct instance of class io.jenkins.plugins.casc.impl.configurators.DataBoundConfiguratorTest$Foo.\n" + + " Constructor: public io.jenkins.plugins.casc.impl.configurators.DataBoundConfiguratorTest$Foo(java.lang.String,boolean,int).\n" + + " Arguments: [java.lang.String, java.lang.Boolean, java.lang.Integer].\n" + + " Expected Parameters: foo java.lang.String, bar boolean, qix int")); } @Test - public void shouldNotLogSecrets() throws Exception { + void shouldNotLogSecrets() throws Exception { Mapping config = new Mapping(); config.put("secret", "mySecretValue"); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); @@ -263,7 +263,7 @@ public class DataBoundConfiguratorTest { @Test @Issue("SECURITY-1497") - public void shouldNotLogSecretsForUndefinedConstructors() throws Exception { + void shouldNotLogSecretsForUndefinedConstructors() throws Exception { Mapping config = new Mapping(); config.put("secret", "mySecretValue"); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); @@ -273,7 +273,7 @@ public class DataBoundConfiguratorTest { } @Test - public void shouldExportArray() throws Exception { + void shouldExportArray() throws Exception { ArrayConstructor obj = new ArrayConstructor(new Foo[] {new Foo("", false, 0)}); ConfiguratorRegistry registry = ConfiguratorRegistry.get(); @@ -283,9 +283,9 @@ public class DataBoundConfiguratorTest { CNode node = c.describe(obj, context); assertNotNull(node); - assertTrue(node instanceof Mapping); + assertInstanceOf(Mapping.class, node); Mapping map = (Mapping) node; - assertEquals(map.get("anArray").toString(), "[{qix=0, bar=false, foo=}]"); + assertEquals("[{qix=0, bar=false, foo=}]", map.get("anArray").toString()); } public static class Foo { diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DescriptorConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DescriptorConfiguratorTest.java index 236f4d1f..dcd0447b 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DescriptorConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DescriptorConfiguratorTest.java @@ -7,23 +7,21 @@ import edu.umd.cs.findbugs.annotations.NonNull; import hudson.Extension; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import jenkins.model.GlobalConfiguration; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; /** * @author Nicolas De Loof */ -public class DescriptorConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class DescriptorConfiguratorTest { @Test @ConfiguredWithCode("DescriptorConfiguratorTest_camelCase.yml") - public void configurator_shouldConfigureItselfWhenUsingCamelCase() { + void configurator_shouldConfigureItselfWhenUsingCamelCase(JenkinsConfiguredWithCodeRule j) { FooBar descriptor = (FooBar) j.jenkins.getDescriptorOrDie(FooBar.class); assertThat(descriptor.getFoo(), equalTo("foo")); assertThat(descriptor.getBar(), equalTo("bar")); @@ -31,7 +29,7 @@ public class DescriptorConfiguratorTest { @Test @ConfiguredWithCode("DescriptorConfiguratorTest_lowerCase.yml") - public void configurator_shouldConfigureItselfWhenUsingLoweCase() { + void configurator_shouldConfigureItselfWhenUsingLoweCase(JenkinsConfiguredWithCodeRule j) { FooBar descriptor = (FooBar) j.jenkins.getDescriptorOrDie(FooBar.class); assertThat(descriptor.getFoo(), equalTo("foo")); assertThat(descriptor.getBar(), equalTo("bar")); @@ -39,7 +37,7 @@ public class DescriptorConfiguratorTest { @Test @ConfiguredWithCode("DescriptorConfiguratorTest_camelCase.yml") - public void configurator_shouldResolveFloatAndDoubleValues() { + void configurator_shouldResolveFloatAndDoubleValues(JenkinsConfiguredWithCodeRule j) { FooBar descriptor = (FooBar) j.jenkins.getDescriptorOrDie(FooBar.class); assertThat(descriptor.getBaz(), equalTo(1.0)); assertThat(descriptor.getFlt(), equalTo(1000f)); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DuplicateKeyDescribableConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DuplicateKeyDescribableConfiguratorTest.java index 9b3d0259..dbb7dbba 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DuplicateKeyDescribableConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/DuplicateKeyDescribableConfiguratorTest.java @@ -9,20 +9,19 @@ import hudson.model.Descriptor; 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.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.Objects; import jenkins.model.GlobalConfiguration; import org.jenkinsci.Symbol; -import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.kohsuke.stapler.DataBoundConstructor; import org.kohsuke.stapler.DataBoundSetter; -public class DuplicateKeyDescribableConfiguratorTest { - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class DuplicateKeyDescribableConfiguratorTest { @Test - public void implementors_shouldNotThrowException() { + void implementors_shouldNotThrowException(JenkinsConfiguredWithCodeRule j) { ConfiguratorRegistry registry = ConfiguratorRegistry.get(); HeteroDescribableConfigurator configurator = Objects.requireNonNull((HeteroDescribableConfigurator) registry.lookup(FooBar.class)); @@ -32,7 +31,7 @@ public class DuplicateKeyDescribableConfiguratorTest { @Test @ConfiguredWithCode("DuplicateKeyDescribableConfigure.yml") - public void configure_shouldNotThrowException() { + void configure_shouldNotThrowException(JenkinsConfiguredWithCodeRule j) { FooBarGlobalConfiguration descriptor = (FooBarGlobalConfiguration) j.jenkins.getDescriptor(FooBarGlobalConfiguration.class); FooBarOne instance = (FooBarOne) Objects.requireNonNull(descriptor).fooBar; diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/MissingConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/MissingConfiguratorTest.java index 8f07c88f..3c5fbed5 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/MissingConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/MissingConfiguratorTest.java @@ -9,20 +9,18 @@ import hudson.model.User; import io.jenkins.plugins.casc.UnknownAttributesException; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Test; -public class MissingConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class MissingConfiguratorTest { @ConfiguredWithCode( value = "MissingConfiguratorTest.yml", expected = UnknownAttributesException.class, message = "No hudson.security.AuthorizationStrategy implementation found for globalMatrix") @Test - public void testThrowsSuggestion() { + void testThrowsSuggestion(JenkinsConfiguredWithCodeRule j) { // The conditions for this test can be false in PCT runs assumeThat(j.jenkins.getPlugin("matrix-auth"), nullValue()); // No config check needed, should fail with IllegalArgumentException diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/SelfConfiguratorTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/SelfConfiguratorTest.java index 80ea773c..604ce64f 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/SelfConfiguratorTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/impl/configurators/SelfConfiguratorTest.java @@ -7,26 +7,24 @@ import static org.hamcrest.Matchers.not; import io.jenkins.plugins.casc.ConfiguratorException; import io.jenkins.plugins.casc.misc.ConfiguredWithCode; import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; -import org.junit.Rule; -import org.junit.Test; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.jupiter.api.Test; /** * @author Nicolas De Loof */ -public class SelfConfiguratorTest { - - @Rule - public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule(); +@WithJenkinsConfiguredWithCode +class SelfConfiguratorTest { @Test @ConfiguredWithCode(value = "SelfConfiguratorTest.yml") - public void self_configure() { + void self_configure(JenkinsConfiguredWithCodeRule j) { assertThat(j.jenkins.getRawBuildsDir(), is("/tmp")); } @Test @ConfiguredWithCode(value = "SelfConfiguratorRestrictedTest.yml", expected = ConfiguratorException.class) - public void self_configure_restricted() { + void self_configure_restricted(JenkinsConfiguredWithCodeRule j) { // expected to throw Configurator Exception assertThat(j.jenkins.getRawBuildsDir(), is(not("/tmp"))); } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeMethodRuleTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeMethodRuleTest.java index f37de7e8..c8e40992 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeMethodRuleTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeMethodRuleTest.java @@ -9,12 +9,12 @@ import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; import java.util.Collections; import org.junit.jupiter.api.Test; -public class JenkinsConfiguredWithCodeMethodRuleTest { +class JenkinsConfiguredWithCodeMethodRuleTest { @Test @WithJenkinsConfiguredWithCode @ConfiguredWithCode("admin.yml") - public void user_created(JenkinsConfiguredWithCodeRule rule) { + void user_created(JenkinsConfiguredWithCodeRule rule) { assertNotNull(rule); User admin = User.get("admin", false, Collections.emptyMap()); assertNotNull(admin); diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRuleClassRuleTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRuleClassRuleTest.java index 8493c3fc..80c2287d 100644 --- a/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRuleClassRuleTest.java +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRuleClassRuleTest.java @@ -11,17 +11,17 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @WithJenkinsConfiguredWithCode -public class JenkinsConfiguredWithCodeRuleClassRuleTest { +class JenkinsConfiguredWithCodeRuleClassRuleTest { @ConfiguredWithCode("admin.yml") public static JenkinsConfiguredWithCodeRule j; @BeforeAll - public static void beforeAll() { + static void beforeAll() { assertNotNull(j); } @Test - public void user_created() { + void user_created() { User admin = User.get("admin", false, Collections.emptyMap()); assertNotNull(admin); } diff --git a/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRulePermissionTest.java b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRulePermissionTest.java new file mode 100644 index 00000000..dbd8ec4b --- /dev/null +++ b/test-harness/src/test/java/io/jenkins/plugins/casc/junit/jupiter/JenkinsConfiguredWithCodeRulePermissionTest.java @@ -0,0 +1,56 @@ +package io.jenkins.plugins.casc.junit.jupiter; + +import hudson.security.Permission; +import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule; +import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.jupiter.api.Assertions; +import org.jvnet.hudson.test.MockAuthorizationStrategy; + +/** + * Validates that JUnit4 and JUnit5 based {@link JenkinsConfiguredWithCodeRule} implementations have the same default authorization and permissions. + */ +@SuppressWarnings("deprecation") +public class JenkinsConfiguredWithCodeRulePermissionTest { + + @Rule + public JenkinsConfiguredWithCodeRule junit4rule = new JenkinsConfiguredWithCodeRule(); + + @org.junit.Test + public void junit4() { + MockAuthorizationStrategy strategy = new MockAuthorizationStrategy(); + junit4rule.getInstance().setAuthorizationStrategy(strategy); + + // basic permissions + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.READ)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.WRITE)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.CREATE)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.UPDATE)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.DELETE)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.CONFIGURE)); + + // admin permissions + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.FULL_CONTROL)); + Assert.assertTrue(junit4rule.getInstance().getACL().hasPermission(Permission.HUDSON_ADMINISTER)); + } + + @org.junit.jupiter.api.Test + @WithJenkinsConfiguredWithCode + void junit5(JenkinsConfiguredWithCodeRule junit5rule) { + MockAuthorizationStrategy strategy = new MockAuthorizationStrategy(); + junit5rule.getInstance().setAuthorizationStrategy(strategy); + + // basic permissions + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.READ)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.WRITE)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.CREATE)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.UPDATE)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.DELETE)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.CONFIGURE)); + + // admin permissions + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.FULL_CONTROL)); + Assertions.assertTrue(junit5rule.getInstance().getACL().hasPermission(Permission.HUDSON_ADMINISTER)); + } +}