Skip to content

Commit 65acb14

Browse files
author
Daniel Lipp
committed
use Mockito instead of Easymock
1 parent 5091226 commit 65acb14

1 file changed

Lines changed: 57 additions & 53 deletions

File tree

magnolia-core/src/test/java/info/magnolia/cms/security/MgnlUserManagerTest.java

Lines changed: 57 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@
3333
*/
3434
package info.magnolia.cms.security;
3535

36-
import static org.easymock.EasyMock.expect;
37-
import static org.junit.Assert.assertEquals;
38-
import static org.junit.Assert.assertNotNull;
39-
import static org.junit.Assert.fail;
36+
import static org.junit.Assert.*;
37+
import static org.mockito.Mockito.*;
38+
4039
import info.magnolia.cms.core.ItemType;
4140

4241
import javax.jcr.Node;
@@ -48,12 +47,11 @@
4847
import javax.jcr.query.QueryManager;
4948
import javax.jcr.query.QueryResult;
5049

51-
import org.easymock.IMocksControl;
52-
import org.easymock.classextension.EasyMock;
50+
import info.magnolia.cms.core.MgnlNodeType;
5351
import org.junit.Test;
5452

5553
/**
56-
* @version $Id$
54+
* Tests for MgnlUserManager.
5755
*/
5856
public class MgnlUserManagerTest {
5957

@@ -104,62 +102,68 @@ public void testUsernameCantBeBlank() {
104102
}
105103
}
106104

105+
107106
@Test
108107
public void testFindPrincipalNode() throws RepositoryException {
109-
IMocksControl control = EasyMock.createControl();
110-
Session session = control.createMock(Session.class);
111-
Workspace workspace = control.createMock(Workspace.class);
112-
QueryManager qm = control.createMock(QueryManager.class);
113-
Query query = control.createMock(Query.class);
114-
QueryResult result = control.createMock(QueryResult.class);
115-
NodeIterator nodeIterator = control.createMock(NodeIterator.class);
116-
Node node = control.createMock(Node.class);
117-
118-
expect(session.getWorkspace()).andReturn(workspace);
119-
expect(workspace.getQueryManager()).andReturn(qm);
120-
expect(qm.createQuery("select * from [mgnl:user] where name() = 'test'", Query.JCR_SQL2)).andReturn(query);
121-
expect(query.execute()).andReturn(result);
122-
expect(result.getNodes()).andReturn(nodeIterator);
123-
expect(nodeIterator.hasNext()).andReturn(true).times(1);
124-
expect(nodeIterator.hasNext()).andReturn(false);
125-
expect(nodeIterator.nextNode()).andReturn(node);
126-
expect(node.isNodeType(ItemType.USER.getSystemName())).andReturn(true);
127-
128-
control.replay();
108+
// GIVEN
109+
final Session session = mock(Session.class);
110+
final Workspace workspace = mock(Workspace.class);
111+
final QueryManager qm = mock(QueryManager.class);
112+
final Query query = mock(Query.class);
113+
final QueryResult result = mock(QueryResult.class);
114+
final NodeIterator nodeIterator = mock(NodeIterator.class);
115+
final Node node = mock(Node.class);
116+
117+
when(session.getWorkspace()).thenReturn(workspace);
118+
when(workspace.getQueryManager()).thenReturn(qm);
119+
when(qm.createQuery("select * from [mgnl:user] where name() = 'test'", Query.JCR_SQL2)).thenReturn(query);
120+
when(query.execute()).thenReturn(result);
121+
when(result.getNodes()).thenReturn(nodeIterator);
122+
when(nodeIterator.hasNext()).thenReturn(true).thenReturn(false);
123+
when(nodeIterator.nextNode()).thenReturn(node);
124+
when(node.isNodeType(MgnlNodeType.USER)).thenReturn(true);
125+
129126
MgnlUserManager um = new MgnlUserManager();
130127
// Realm "all"
131128
um.setRealmName(Realm.REALM_ALL.getName());
132-
Node principal = um.findPrincipalNode("test", session);
129+
130+
// WHEN
131+
final Node principal = um.findPrincipalNode("test", session);
132+
133+
// THEN
133134
assertNotNull(principal);
134-
control.verify();
135-
136-
control = EasyMock.createControl();
137-
session = control.createMock(Session.class);
138-
workspace = control.createMock(Workspace.class);
139-
qm = control.createMock(QueryManager.class);
140-
query = control.createMock(Query.class);
141-
result = control.createMock(QueryResult.class);
142-
nodeIterator = control.createMock(NodeIterator.class);
143-
node = control.createMock(Node.class);
144-
145-
expect(session.getWorkspace()).andReturn(workspace);
146-
expect(workspace.getQueryManager()).andReturn(qm);
147-
expect(
135+
}
136+
137+
@Test
138+
public void testFindPrincipalNodeWithOtherRealm() throws RepositoryException {
139+
// GIVEN
140+
final Session session = mock(Session.class);
141+
final Workspace workspace = mock(Workspace.class);
142+
final QueryManager qm = mock(QueryManager.class);
143+
final Query query = mock(Query.class);
144+
final QueryResult result = mock(QueryResult.class);
145+
final NodeIterator nodeIterator = mock(NodeIterator.class);
146+
final Node node = mock(Node.class);
147+
148+
when(session.getWorkspace()).thenReturn(workspace);
149+
when(workspace.getQueryManager()).thenReturn(qm);
150+
when(
148151
qm.createQuery("select * from [mgnl:user] where name() = 'test' and isdescendantnode(['/otherRealm'])",
149-
Query.JCR_SQL2)).andReturn(query);
150-
expect(query.execute()).andReturn(result);
151-
expect(result.getNodes()).andReturn(nodeIterator);
152-
expect(nodeIterator.hasNext()).andReturn(true).times(1);
153-
expect(nodeIterator.hasNext()).andReturn(false);
154-
expect(nodeIterator.nextNode()).andReturn(node);
155-
expect(node.isNodeType(ItemType.USER.getSystemName())).andReturn(true);
152+
Query.JCR_SQL2)).thenReturn(query);
153+
when(query.execute()).thenReturn(result);
154+
when(result.getNodes()).thenReturn(nodeIterator);
155+
when(nodeIterator.hasNext()).thenReturn(true).thenReturn(false);
156+
when(nodeIterator.nextNode()).thenReturn(node);
157+
when(node.isNodeType(ItemType.USER.getSystemName())).thenReturn(true);
156158

157-
control.replay();
158-
um = new MgnlUserManager();
159+
final MgnlUserManager um = new MgnlUserManager();
159160

160161
um.setRealmName("otherRealm");
161-
principal = um.findPrincipalNode("test", session);
162+
163+
// WHEN
164+
final Node principal = um.findPrincipalNode("test", session);
165+
166+
// THEN
162167
assertNotNull(principal);
163-
control.verify();
164168
}
165169
}

0 commit comments

Comments
 (0)