From 664f7e34005d83779371c6f0ebb31dd281012406 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Thu, 13 Mar 2014 13:31:04 -0700 Subject: [PATCH] More test fixes --- test/src/test/java/hudson/model/NodeTest.java | 3 +-- test/src/test/java/hudson/model/ProjectTest.java | 4 ++-- test/src/test/java/hudson/model/UserTest.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/src/test/java/hudson/model/NodeTest.java b/test/src/test/java/hudson/model/NodeTest.java index c24d45913d..7dd06ace79 100644 --- a/test/src/test/java/hudson/model/NodeTest.java +++ b/test/src/test/java/hudson/model/NodeTest.java @@ -209,8 +209,7 @@ public class NodeTest { j.jenkins.setCrumbIssuer(null); HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false); j.jenkins.setSecurityRealm(realm); - User user = User.get("John Smith"); - + User user = realm.createAccount("John Smith","abcdef"); SecurityContextHolder.getContext().setAuthentication(user.impersonate()); assertFalse("Current user should not have permission read.", node.hasPermission(Permission.READ)); auth.add(Computer.CONFIGURE, user.getId()); diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java index 3bd48e4972..8cabb8dffd 100644 --- a/test/src/test/java/hudson/model/ProjectTest.java +++ b/test/src/test/java/hudson/model/ProjectTest.java @@ -492,14 +492,14 @@ public class ProjectTest { @Test public void testDoCancelQueue() throws Exception{ - User user = User.get("John Smith", true, Collections.emptyMap()); FreeStyleProject project = j.createFreeStyleProject("project"); GlobalMatrixAuthorizationStrategy auth = new GlobalMatrixAuthorizationStrategy(); j.jenkins.setAuthorizationStrategy(auth); j.jenkins.setCrumbIssuer(null); HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false); j.jenkins.setSecurityRealm(realm); - SecurityContextHolder.getContext().setAuthentication(user.impersonate()); + User user = realm.createAccount("John Smith", "password"); + SecurityContextHolder.getContext().setAuthentication(user.impersonate()); try{ project.doCancelQueue(null, null); fail("User should not have permission to build project"); diff --git a/test/src/test/java/hudson/model/UserTest.java b/test/src/test/java/hudson/model/UserTest.java index a8f37057a4..3f91ecb473 100644 --- a/test/src/test/java/hudson/model/UserTest.java +++ b/test/src/test/java/hudson/model/UserTest.java @@ -404,8 +404,8 @@ public class UserTest { j.jenkins.setCrumbIssuer(null); HudsonPrivateSecurityRealm realm = new HudsonPrivateSecurityRealm(false); j.jenkins.setSecurityRealm(realm); - User user = User.get("John Smith"); - User user2 = User.get("John Smith2"); + User user = realm.createAccount("John Smith","password"); + User user2 = realm.createAccount("John Smith2","password"); user2.save(); SecurityContextHolder.getContext().setAuthentication(user.impersonate()); assertFalse("User should not be able delete because he does not have administer permission.", user2.canDelete()); -- GitLab