-
Notifications
You must be signed in to change notification settings - Fork 77
Migrate tests to JUnit5 #162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
strangelookingnerd
wants to merge
2
commits into
jenkinsci:master
Choose a base branch
from
strangelookingnerd:migrate_to_junit5
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 0 additions & 105 deletions
105
src/test/java/org/jenkinsci/plugins/docker/commons/CasCTest.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
119 changes: 119 additions & 0 deletions
119
src/test/java/org/jenkinsci/plugins/docker/commons/JCasCTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| package org.jenkinsci.plugins.docker.commons; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.beans.HasPropertyWithValue.hasProperty; | ||
| import static org.hamcrest.collection.ArrayMatching.arrayContaining; | ||
| import static org.hamcrest.collection.IsArrayWithSize.arrayWithSize; | ||
| import static org.hamcrest.collection.IsIterableContainingInOrder.contains; | ||
| import static org.hamcrest.core.AllOf.allOf; | ||
| import static org.hamcrest.core.IsEqual.equalTo; | ||
| import static org.hamcrest.core.IsInstanceOf.instanceOf; | ||
| import static org.hamcrest.core.IsNull.nullValue; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
|
|
||
| import com.cloudbees.plugins.credentials.CredentialsMatchers; | ||
| import com.cloudbees.plugins.credentials.CredentialsProvider; | ||
| import com.cloudbees.plugins.credentials.common.IdCredentials; | ||
| import hudson.security.ACL; | ||
| import hudson.tools.InstallSourceProperty; | ||
| import hudson.tools.ToolProperty; | ||
| import hudson.tools.ToolPropertyDescriptor; | ||
| import hudson.util.DescribableList; | ||
| import hudson.util.Secret; | ||
| import io.jenkins.plugins.casc.misc.junit.jupiter.AbstractRoundTripTest; | ||
| import java.util.Collections; | ||
| import org.jenkinsci.plugins.docker.commons.credentials.DockerServerCredentials; | ||
| import org.jenkinsci.plugins.docker.commons.credentials.DockerServerDomainRequirement; | ||
| import org.jenkinsci.plugins.docker.commons.tools.DockerTool; | ||
| import org.jenkinsci.plugins.docker.commons.tools.DockerToolInstaller; | ||
| import org.junit.jupiter.api.Nested; | ||
| import org.jvnet.hudson.test.JenkinsRule; | ||
| import org.jvnet.hudson.test.junit.jupiter.WithJenkins; | ||
|
|
||
| class JCasCTest { | ||
|
|
||
| @Nested | ||
| @WithJenkins | ||
| class Bare extends AbstractRoundTripTest { | ||
|
|
||
| @Override | ||
| protected void assertConfiguredAsExpected(JenkinsRule j, String configContent) { | ||
| JCasCTest.assertConfiguredAsExpected(j); | ||
| } | ||
|
|
||
| @Override | ||
| protected String configResource() { | ||
| return "casc_bare.yaml"; | ||
| } | ||
|
|
||
| @Override | ||
| protected String stringInLogExpected() { | ||
| return DockerServerCredentials.class.getName(); | ||
| } | ||
| } | ||
|
|
||
| @Nested | ||
| @WithJenkins | ||
| class Symbols extends AbstractRoundTripTest { | ||
|
|
||
| @Override | ||
| protected void assertConfiguredAsExpected(JenkinsRule j, String configContent) { | ||
| JCasCTest.assertConfiguredAsExpected(j); | ||
| } | ||
|
|
||
| @Override | ||
| protected String configResource() { | ||
| return "casc_symbols.yaml"; | ||
| } | ||
|
|
||
| @Override | ||
| protected String stringInLogExpected() { | ||
| return DockerServerCredentials.class.getName(); | ||
| } | ||
| } | ||
|
|
||
| private static void assertConfiguredAsExpected(JenkinsRule j) { | ||
| // The credentials | ||
| final IdCredentials cred = CredentialsMatchers.firstOrNull( | ||
| CredentialsProvider.lookupCredentialsInItemGroup( | ||
| IdCredentials.class, | ||
| j.jenkins, | ||
| ACL.SYSTEM2, | ||
| Collections.singletonList(new DockerServerDomainRequirement())), | ||
| CredentialsMatchers.withId("dockerx509")); | ||
| assertNotNull(cred); | ||
| assertThat(cred, instanceOf(DockerServerCredentials.class)); | ||
| DockerServerCredentials dCreds = (DockerServerCredentials) cred; | ||
| assertEquals("THE CLIENT", dCreds.getClientCertificate()); | ||
| assertEquals("THE SERVER", dCreds.getServerCaCertificate()); | ||
| assertEquals("Be wewy wewy cuwiet", Secret.toString(dCreds.getClientKeySecret())); | ||
| assertEquals("Docker X.509", dCreds.getDescription()); | ||
|
|
||
| // The ToolInstaller | ||
| final DockerTool[] installations = | ||
| j.jenkins.getDescriptorByType(DockerTool.DescriptorImpl.class).getInstallations(); | ||
| assertNotNull(installations); | ||
| assertThat(installations, arrayWithSize(2)); | ||
| assertThat( | ||
| installations, | ||
| arrayContaining( | ||
| allOf(hasProperty("name", equalTo("docker-latest")), hasProperty("home", nullValue())), | ||
| allOf( | ||
| hasProperty("name", equalTo("docker-native")), | ||
| hasProperty("home", equalTo("/etc/docket/docker"))))); | ||
| final DescribableList<ToolProperty<?>, ToolPropertyDescriptor> properties = installations[0].getProperties(); | ||
| assertThat(properties, contains(instanceOf(InstallSourceProperty.class))); | ||
| final InstallSourceProperty property = (InstallSourceProperty) properties.get(0); | ||
| assertThat( | ||
| property.installers, | ||
| contains(allOf(instanceOf(DockerToolInstaller.class), hasProperty("version", equalTo("latest"))))); | ||
|
|
||
| /* | ||
| * DockerRegistryEndpoint is not directly used in this plugin in any global config sense, | ||
| * So it is better tested in the plugins that uses it for example docker workflow plugin: | ||
| * https://github.com/jenkinsci/docker-workflow-plugin/blob/2ba1ac97b75a3f188e243333b31ef06d55b9221a/src/main/java/org/jenkinsci/plugins/docker/workflow/declarative/GlobalConfig.java | ||
| */ | ||
|
|
||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why the rename?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mhh, I think it was mainly to satisfy my inner Monk. It's the "official" naming, isn't it? Most similar implementations in other plugins are named the same way.