changed to production database

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

@@ -84,7 +84,7 @@
 			<property name="hibernate.hbm2ddl.auto" value="update" />
 			
 			<!-- 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,7 +198,7 @@
 			
 			
 			<!-- 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>			
@@ -206,6 +206,7 @@
 			<property name="hibernate.connection.username" value="root"></property>
 			<property name="hibernate.connection.password" value="juju"></property>
 			<property name="hibernate.c3p0.idle_test_period" value="3600"></property>
+			-->
 		</properties>
 	</persistence-unit>
 

src/test/java/se/su/dsv/scipro/dao/jpa/TestProjectPartnerDaoJPA-context.xml

@@ -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>

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

@@ -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()); 
+	}
+	
+
+	
+
+}