DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests8 Actions Projects1 Releases Wiki Activity

Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop

Browse Source
This commit is contained in:
U-XeNote\Martin 2011-07-14 16:19:03 +02:00
commit d7483c78fd
7 changed files with 28 additions and 31 deletions

9
pom.xml

@ -21,7 +21,6 @@
</repository>
</repositories>
<dependencies>
<!-- WICKET DEPENDENCIES -->
<dependency>
@ -34,7 +33,13 @@
<artifactId>wicket-spring</artifactId>
<version>${wicket.version}</version>
</dependency>
<!-- Servlet API, needed for compilation. -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<scope>provided</scope>
</dependency>
<!-- LOGGING DEPENDENCIES - LOG4J -->
<dependency>
<groupId>org.slf4j</groupId>

8
src/main/resources/META-INF/persistence.xml

@ -198,15 +198,15 @@
<!-- Local mysql test database -->
<!--
<!--
<property name="hibernate.hbm2ddl.auto" value="create" />
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
<property name="hibernate.connection.driver_class" value="com.mysql.jdbc.Driver"></property>
<property name="hibernate.connection.url" value="jdbc:mysql://localhost/scipro"></property>
<property name="hibernate.connection.username" value="root"></property>
<property name="hibernate.connection.password" value="juju"></property>
<property name="hibernate.connection.username" value=""></property>
<property name="hibernate.connection.password" value=""></property>
<property name="hibernate.c3p0.idle_test_period" value="3600"></property>
-->
-->
</properties>
</persistence-unit>

2
src/test/java/se/su/dsv/scipro/dao/jpa/TestCommentThreadDaoJpa.java

@ -8,6 +8,7 @@ import java.util.TreeSet;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -32,6 +33,7 @@ import se.su.dsv.scipro.data.dataobjects.User;
* @author Johan Aschan - aschan@dsv.su.se
*
*/
@Ignore
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class TestCommentThreadDaoJpa {

3
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectPartnerDaoJPA.java

@ -1,6 +1,7 @@
package se.su.dsv.scipro.dao.jpa;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@ -16,7 +17,7 @@ import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.ProjectPartner;
import se.su.dsv.scipro.data.dataobjects.User;
@Ignore
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class TestProjectPartnerDaoJPA {

24
src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectScheduleDaoJPA.java

@ -1,27 +1,6 @@
package se.su.dsv.scipro.dao.jpa;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.annotation.Rollback;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.annotation.Transactional;
import se.su.dsv.scipro.data.dao.interfaces.EventDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectScheduleDao;
import se.su.dsv.scipro.data.dataobjects.Event;
import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.ProjectSchedule;
import org.junit.Ignore;
/**
* @author Dan Kjellman <dan-kjel@dsv.su.se>
@ -29,6 +8,7 @@ import se.su.dsv.scipro.data.dataobjects.ProjectSchedule;
*/
//@RunWith(SpringJUnit4ClassRunner.class)
//@ContextConfiguration
@Ignore
public class TestProjectScheduleDaoJPA {

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

@ -9,6 +9,7 @@ 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;
import org.mockito.MockitoAnnotations;
@ -36,6 +37,7 @@ import se.su.dsv.scipro.data.dao.interfaces.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectClassSettingsDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectEventDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectPartnerDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectScheduleDao;
import se.su.dsv.scipro.data.dao.interfaces.RoleDao;
import se.su.dsv.scipro.data.dao.interfaces.ScheduleTemplateDao;
@ -59,6 +61,7 @@ import se.su.dsv.scipro.repository.util.RepositoryManager;
* @author Martin Peters - mpeters@dsv.su.se
*
*/
@Ignore
public class BaseWicketTest {
protected WicketTester tester;
@ -95,9 +98,11 @@ public class BaseWicketTest {
@Mock ProjectClassSettingsDao projectClassSettingsDao;
@Mock GroupEventDao groupEventDao;
@Mock HandInActivityDao handInActivityDao;
@Mock ScheduleTemplateDao scheduleTemplateDao;
@Mock ScheduleTemplateDao scheduleTemplateDao;
@Mock ProjectPartnerDao projectPartnerDao;
@Mock ApplicationSettings applicationSettings;
@Mock RepositoryManager repositoryManager;
@Mock StringResourceDao stringResourceDao;

4
src/test/java/se/su/dsv/scipro/wicket/TestWicketPages.java

@ -172,12 +172,16 @@ public class TestWicketPages extends BaseWicketTest {
@Test
public void testAdminProjectPartnerPage() {
MockSciProSession.currentSession.setLoggedInAsSysAdmin();
tester.startPage(AdminProjectPartnerPage.class);
tester.assertRenderedPage(AdminProjectPartnerPage.class);
}
@Test
public void testProjectPartnerPage() {
tester.startPage(ProjectPartnerPage.class);
tester.assertRenderedPage(ProjectPartnerPage.class);
}
@Test