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

This commit is contained in:
U-XeNote\Martin 2011-07-13 15:36:09 +02:00
commit 4e7b428cd4
13 changed files with 136 additions and 13 deletions
.gitignore
src
target/work/WicketMockServlet-filestore
2225/4400/e95749e4_308e_4698_a057_bb86050ac96e
2349/5733/fd6064a1_8b84_4446_82cc_69fd7167e7c6
4435/793/a137fc0e_994c_4fd1_94a7_801290d34f88
6408/4902/a7851e5b_30d6_4edf_a954_3f4f8c6690fb
7238/3517/7b8c41d4_a788_46e0_a576_ab3eb0b03be8

3
.gitignore vendored Normal file

@ -0,0 +1,3 @@
\.settings/
\.project
\.classpath

@ -10,7 +10,6 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.data.dao.interfaces.GeneralSystemSettingsDao;
import se.su.dsv.scipro.data.dataobjects.GeneralSystemSettings;
import se.su.dsv.scipro.data.dataobjects.ProjectPartner;
import se.su.dsv.scipro.project.panels.ProjectPartnerPanel;
import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles;

@ -15,15 +15,12 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.spring.injection.annot.SpringBean;

@ -83,8 +83,8 @@
<!-- DEVELOPMENT VARIABLE, REMOVE FOR PRODUCTION USE -->
<property name="hibernate.hbm2ddl.auto" value="update" />
<!-- Local mysql production settings database -->
<!-- production settings database -->
<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>
@ -96,7 +96,7 @@
<property name="hibernate.c3p0.timeout" value="1800"></property>
<property name="hibernate.c3p0.acquire_increment" value="2"></property>
<property name="hibernate.c3p0.idle_test_period" value="360"></property>
<!--
<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
<property name="hibernate.hbm2ddl.auto" value="update" />
@ -198,16 +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="root"></property>
<property name="hibernate.c3p0.idle_test_period" value="3600"></property>
-->
<property name="hibernate.connection.password" value="juju"></property>
<property name="hibernate.c3p0.idle_test_period" value="3600"></property>
-->
</properties>
</persistence-unit>

@ -82,7 +82,7 @@
-->
<property name="enableRemoteUserLookup" value="true"></property>
<!-- This property points to the location of the daisy json search -->
<property name="remoteLookupUrl" value="https://thesis.dsv.su.se/projectplan/json" />
<property name="remoteLookupUrl" value="https://thesis.dsv.su.se/match/json" />
</bean>
<!-- Defines the class used for lookup in username against a remote server NOW AUTOWIRED AND DEPRECATED, NOT MAINTAINED-->

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd"
default-autowire="byName">
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalEntityManagerFactoryBean">
<property name="persistenceUnitName" value="testPersistenceUnit" />
</bean>
<!--
enable the configuration of transactional behavior based on
annotations
-->
<tx:annotation-driven transaction-manager="transactionManager" />
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="projectPartnerDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectPartnerDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="projectClassDao" class="se.su.dsv.scipro.data.dao.jpa.ProjectClassDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
<bean id="userDao" class="se.su.dsv.scipro.data.dao.jpa.UserDaoJPAImp">
<property name="entityManagerFactory" ref="entityManagerFactory" />
</bean>
</beans>

@ -0,0 +1,76 @@
package se.su.dsv.scipro.dao.jpa;
import org.junit.Assert;
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.ProjectClassDao;
import se.su.dsv.scipro.data.dao.interfaces.ProjectPartnerDao;
import se.su.dsv.scipro.data.dao.interfaces.UserDao;
import se.su.dsv.scipro.data.dataobjects.ProjectClass;
import se.su.dsv.scipro.data.dataobjects.ProjectPartner;
import se.su.dsv.scipro.data.dataobjects.User;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class TestProjectPartnerDaoJPA {
private User user;
private ProjectPartner projectPartner;
private ProjectClass projectClass;
@Autowired
private UserDao userDao;
@Autowired
private ProjectClassDao projectClassDao;
@Autowired
private ProjectPartnerDao projectPartnerDao;
@Test
@Transactional
@Rollback
public void testCountProjectPartnerInSpan(){
user = new User();
user = userDao.save(user);
projectPartner = new ProjectPartner(user);
projectPartner.setInfoText("testtext");
projectClass = new ProjectClass("test", "moo", "bleh");
projectClass = projectClassDao.save(projectClass);
projectPartner.setProjectClass(projectClass);
projectPartner = projectPartnerDao.save(projectPartner);
Assert.assertEquals(1, projectPartnerDao.countProjectPartnerInSpan(projectClass, 2));
}
@Test
@Transactional
@Rollback
public void testProjectPartnerInSpan(){
user = new User();
user = userDao.save(user);
projectPartner = new ProjectPartner(user);
projectPartner.setInfoText("testtext");
projectClass = new ProjectClass("test2", "moo2", "bleh2");
projectClass = projectClassDao.save(projectClass);
projectPartner.setProjectClass(projectClass);
projectPartner = projectPartnerDao.save(projectPartner);
int count = projectPartnerDao.countProjectPartnerInSpan(projectClass, 2);
ProjectPartner temp = projectPartnerDao.getProjectPartnerInSpan(projectClass, 5, 0, count).get(0);
Assert.assertEquals("testtext", temp.getInfoText());
}
}

@ -6,6 +6,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import se.su.dsv.scipro.HomePage;
import se.su.dsv.scipro.admin.pages.AdminProjectPartnerPage;
import se.su.dsv.scipro.admin.pages.SystemMaintenancePage;
import se.su.dsv.scipro.data.dataobjects.GeneralSystemSettings;
import se.su.dsv.scipro.data.dataobjects.Project;
@ -16,6 +17,7 @@ import se.su.dsv.scipro.loginlogout.pages.LogoutPage;
import se.su.dsv.scipro.project.pages.FinalSeminarProjectListPage;
import se.su.dsv.scipro.project.pages.ProjectFilePage;
import se.su.dsv.scipro.project.pages.ProjectOppositionPage;
import se.su.dsv.scipro.project.pages.ProjectPartnerPage;
import se.su.dsv.scipro.project.pages.ProjectSchedulePlannerPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorFinalSeminarListingPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorProjectDetailsPage;
@ -166,4 +168,16 @@ public class TestWicketPages extends BaseWicketTest {
tester.assertRenderedPage(SystemMaintenancePage.class);
}
@Test
public void testAdminProjectPartnerPage() {
tester.startPage(AdminProjectPartnerPage.class);
}
@Test
public void testProjectPartnerPage() {
tester.startPage(ProjectPartnerPage.class);
}
}