Skip to content

Use Hamcrest matchers where possible #177

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.

Sign up for GitHub

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

Merged
daniel-beck merged 1 commit into from
Jul 24, 2025
Merged

Use Hamcrest matchers where possible #177

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/test/java/org/jenkinsci/plugins/matrixauth/inheritance/InheritanceMigrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;

import com.cloudbees.hudson.plugins.folder.Folder;
import com.cloudbees.hudson.plugins.folder.properties.AuthorizationMatrixProperty;
Expand Down Expand Up @@ -30,7 +31,7 @@ public void testInheritanceMigration() throws Exception {
{
Folder folder = (Folder) j.jenkins.getItemByFullName("folder");
Assert.assertNotNull(folder);
Assert.assertTrue(folder.getConfigFile().asString().contains("blocksInheritance"));
assertThat(folder.getConfigFile().asString(), containsString("blocksInheritance"));
AuthorizationMatrixProperty prop = (folder).getProperties().get(AuthorizationMatrixProperty.class);
Assert.assertTrue(prop.isBlocksInheritance());
Assert.assertTrue(prop.getInheritanceStrategy() instanceof NonInheritingStrategy);
Expand All @@ -40,11 +41,11 @@ public void testInheritanceMigration() throws Exception {
Assert.assertFalse(folder.getACL().hasPermission(User.get("alice").impersonate(), Item.READ));
Assert.assertFalse(folder.getACL().hasPermission(User.get("bob").impersonate(), Item.READ));
folder.save();
Assert.assertFalse(folder.getConfigFile().asString().contains("blocksInheritance"));
assertThat(folder.getConfigFile().asString(), not(containsString("blocksInheritance")));

folder = (Folder) j.jenkins.getItemByFullName("folder1");
Assert.assertNotNull(folder);
Assert.assertTrue(folder.getConfigFile().asString().contains("blocksInheritance"));
assertThat(folder.getConfigFile().asString(), containsString("blocksInheritance"));
prop = (folder).getProperties().get(AuthorizationMatrixProperty.class);
Assert.assertTrue(prop.isBlocksInheritance());
Assert.assertTrue(prop.getInheritanceStrategy() instanceof NonInheritingStrategy);
Expand All @@ -61,7 +62,7 @@ public void testInheritanceMigration() throws Exception {
Assert.assertFalse(prop.hasPermission("bob", Item.READ));
Assert.assertFalse(folder.getACL().hasPermission(User.get("bob").impersonate(), Item.READ));
folder.save();
Assert.assertFalse(folder.getConfigFile().asString().contains("blocksInheritance"));
assertThat(folder.getConfigFile().asString(), not(containsString("blocksInheritance")));
}

{
Expand All @@ -79,11 +80,11 @@ public void testInheritanceMigration() throws Exception {
User.get("admin").impersonate(),
Item.READ)); // change from before (JENKINS-24878/JENKINS-37904)
job.save();
Assert.assertFalse(job.getConfigFile().asString().contains("blocksInheritance"));
assertThat(job.getConfigFile().asString(), not(containsString("blocksInheritance")));

job = (Job<?, ?>) j.jenkins.getItemByFullName("job");
Assert.assertNotNull(job);
Assert.assertTrue(job.getConfigFile().asString().contains("blocksInheritance"));
assertThat(job.getConfigFile().asString(), containsString("blocksInheritance"));
prop = job.getProperty(hudson.security.AuthorizationMatrixProperty.class);
Assert.assertFalse(prop.isBlocksInheritance());
Assert.assertTrue(prop.getInheritanceStrategy() instanceof InheritParentStrategy);
Expand All @@ -92,7 +93,7 @@ public void testInheritanceMigration() throws Exception {
Assert.assertTrue(job.getACL().hasPermission(User.get("admin").impersonate(), Item.READ));
Assert.assertTrue(job.getACL().hasPermission(User.get("admin").impersonate(), Item.CONFIGURE));
job.save();
Assert.assertFalse(job.getConfigFile().asString().contains("blocksInheritance"));
assertThat(job.getConfigFile().asString(), not(containsString("blocksInheritance")));
}
}
}