DMC/scipro
7
0
Fork 0
Code Issues28 Pull Requests3 Actions Projects1 Releases Wiki Activity

Modified tests to accomodate refactoring changes.

Browse Source
This commit is contained in:
Robin Eklund 2011-08-05 17:51:11 +02:00
parent d15f25e509
commit c252513bb7
3 changed files with 67 additions and 8 deletions
src
main/resources/META-INF
base-repository.xml
test/java/se/su/dsv/scipro
security/auth
TestAuthRoutines.java
wicket
BaseWicketTest.java

60
src/main/resources/META-INF/base-repository.xml Normal file

@ -0,0 +1,60 @@
<!DOCTYPE Repository
PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
"http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="/jackrabbit" />
</FileSystem>
<Security appName="Jackrabbit">
<AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager" />
<LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
<param name="anonymousId" value="anonymous" />
</LoginModule>
</Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default" />
<DataStore class="org.apache.jackrabbit.core.data.FileDataStore">
<param name="path" value="${rep.home}/repository/datastore"/>
<param name="minRecordLength" value="100"/>
</DataStore>
<Workspace name="${wsp.name}">
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${wsp.home}" />
</FileSystem>
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="0"/>
<param name="minBlobSize" value="4096"/>
<param name="errorHandling" value=""/>
</PersistenceManager>
<SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
<param name="path" value="${wsp.home}/index" />
<param name="indexingConfiguration" value="${wsp.home}/index-config.xml"/>
<param name="textFilterClasses" value="
org.apache.jackrabbit.extractor.MsWordTextExtractor,
org.apache.jackrabbit.extractor.MsExcelTextExtractor,
org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,
org.apache.jackrabbit.extractor.PdfTextExtractor,
org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,
org.apache.jackrabbit.extractor.RTFTextExtractor,
org.apache.jackrabbit.extractor.XMLTextExtractor,
org.apache.jackrabbit.extractor.PngTextExtractor,
org.apache.jackrabbit.extractor.HTMLTextExtractor"/>
<param name="extractorPoolSize " value="2"/>
<param name="supportHighlighting" value="true"/>
</SearchIndex>
</Workspace>
<Versioning rootPath="${rep.home}/versions">
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/versions" />
</FileSystem>
<!-- <PersistenceManager class="org.apache.jackrabbit.core.persistence.xml.XMLPersistenceManager" />-->
<PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager">
<param name="blobFSBlockSize" value="0"/>
<param name="minBlobSize" value="4096"/>
<param name="errorHandling" value=""/>
</PersistenceManager>
</Versioning>
</Repository>

12
src/test/java/se/su/dsv/scipro/security/auth/TestAuthRoutines.java

@ -111,7 +111,7 @@ public class TestAuthRoutines {
ac.putBean("roleDao",mockedRoleDao);
ac.putBean("projectDao",Mockito.mock(ProjectDao.class));
ac.putBean("userSettingsDao",Mockito.mock(UserSettingsDao.class));
ac.putBean("userLookupFromUsername",fixedLookupFromIdentifier);
ac.putBean("userLookupFromUsername",fixedLookupFromUsername);
ac.putBean("userLookupFromIdentifier",fixedLookupFromIdentifier);
//Create tester
wt = new WicketTester(new SciProApplication(){
@ -161,7 +161,7 @@ public class TestAuthRoutines {
//At this point, an exception should be thrown
new ExternalAuthenticationRequestHelper(null);
}
@Test(expected=NullPointerException.class)
@Test
public void testSessionSignInAndSu(){
ExternalAuthenticationRequestHelper helper = new ExternalAuthenticationRequestHelper(new HttpServletRequestWrapper(wt.getServletRequest()){
@Override
@ -183,10 +183,9 @@ public class TestAuthRoutines {
user.setRoles(roles);
Assert.assertTrue(session.switchAuthenticatedUser("kalle-kula", "dsv.su.se"));
Assert.assertTrue(session.getUser().getIdentifier().equals(user.getIdentifier()));
//This should fail with an exception, there is no such user
session.switchAuthenticatedUser("somebody","somewhere.se");
Assert.assertFalse(session.switchAuthenticatedUser("somebody","somewhere.se"));
}
@Test(expected=NullPointerException.class)
@Test
public void testFailedAuthenticatedSignIn(){
ExternalAuthenticationRequestHelper helper = new ExternalAuthenticationRequestHelper(new HttpServletRequestWrapper(wt.getServletRequest()){
@Override
@ -194,8 +193,7 @@ public class TestAuthRoutines {
return "some-dude@ki.se";
}
});
//This should throw exceptions, not sure about this interface (throwing exceptions when authentication passes but no user can be located).
helper.signIn(session);
Assert.assertFalse(helper.signIn(session));
}
@Test
public void testFailedSwitchAuthentitedUser(){

3
src/test/java/se/su/dsv/scipro/wicket/BaseWicketTest.java

@ -8,7 +8,6 @@ import org.apache.wicket.Session;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.spring.test.ApplicationContextMock;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Before;
import org.junit.Ignore;
import org.mockito.Mock;
import org.mockito.Mockito;
@ -50,6 +49,7 @@ import se.su.dsv.scipro.data.dao.interfaces.WorkerDataDao;
import se.su.dsv.scipro.data.dataobjects.GeneralSystemSettings;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.json.DefaultUserLookupFromUsername;
import se.su.dsv.scipro.peer.data.dao.controllers.PeerPortalController;
import se.su.dsv.scipro.peer.data.dao.interfaces.PeerRequestDao;
import se.su.dsv.scipro.peer.data.dao.interfaces.PeerReviewDao;
@ -104,6 +104,7 @@ public abstract class BaseWicketTest {
@Mock ProjectPartnerDao projectPartnerDao;
@Mock WebNotificationDao webNotificationDao;
@Mock NotificationController notificationController;
@Mock DefaultUserLookupFromUsername userLookupFromUsername;
@Mock ApplicationSettings applicationSettings;