test fixar

git-svn-id: svn://svn.dsv.su.se/scipro/scipro/trunk@498 73ecded7-942e-4092-bab0-0e58ef0ee984

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

@@ -0,0 +1,41 @@
+<?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="ratableDao" class="se.su.dsv.scipro.data.dao.jpa.RatableDaoJPAImp">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+	
+	<bean id="userDao" class="se.su.dsv.scipro.data.dao.jpa.UserDaoJPAImp">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+	
+	<bean id="linkResourceDao" class="se.su.dsv.scipro.data.dao.jpa.LinkResourceDaoJPAImp">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+	
+	<bean id="ratingDao" class="se.su.dsv.scipro.data.dao.jpa.RatingDaoJPAImp">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+	
+
+
+</beans>

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

@@ -0,0 +1,79 @@
+package se.su.dsv.scipro.dao.jpa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.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.LinkResourceDao;
+import se.su.dsv.scipro.data.dao.interfaces.RatableDao;
+import se.su.dsv.scipro.data.dao.interfaces.RatingDao;
+import se.su.dsv.scipro.data.dao.interfaces.UserDao;
+import se.su.dsv.scipro.data.dataobjects.LinkResource;
+import se.su.dsv.scipro.data.dataobjects.Rating;
+import se.su.dsv.scipro.data.dataobjects.User;
+import se.su.dsv.scipro.data.enums.RatingValue;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class TestRatableDaoJPA {
+
+	@Autowired
+	private UserDao userDao;
+	
+	@Autowired
+	private LinkResourceDao linkDao;
+	
+	@Autowired
+	private RatingDao ratingDao;
+	
+	private User user;
+	
+	private LinkResource link;
+	
+	@Autowired
+	private RatableDao ratableDao;
+	
+	@Before
+	public void startTransaction(){
+		
+		user = new User();
+		user = userDao.save(user);
+		Rating rating = new Rating();
+		rating.setUser(user);
+		rating.setRatingValue(RatingValue.UP);
+		rating = ratingDao.save(rating);
+		Rating rating2 = new Rating();
+		rating2.setUser(user);
+		rating2.setRatingValue(RatingValue.DOWN);
+		rating2 = ratingDao.save(rating2);
+		
+		link = new LinkResource();
+		link.setCreator(user);
+		List<Rating> ratingList = new ArrayList<Rating>();
+		ratingList.add(rating);
+		ratingList.add(rating2);
+		link.setRatingList(ratingList);		
+		link = linkDao.save(link);
+		
+	}
+	
+
+	/**
+	 * Test method for {@link se.su.dsv.scipro.data.dao.jpa.EventDaoJPAImp#findAll()}.
+	 */
+	@Test
+	@Transactional
+	@Rollback
+	public void getRating() {
+		Assert.assertEquals(0, ratableDao.getRating(link));
+	}
+}

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

@@ -28,5 +28,9 @@
 		<property name="entityManagerFactory" ref="entityManagerFactory" />
 	</bean>
 	
+	<bean id="supervisorMessageBoardDao" class="se.su.dsv.scipro.data.dao.jpa.SupervisorMessageBoardDaoJPAImp">
+		<property name="entityManagerFactory" ref="entityManagerFactory" />
+	</bean>
+	
 
 </beans>

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

@@ -17,8 +17,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.transaction.annotation.Transactional;
 
 import se.su.dsv.scipro.data.dao.interfaces.SupervisorBoardMessageDao;
+import se.su.dsv.scipro.data.dao.interfaces.SupervisorMessageBoardDao;
 import se.su.dsv.scipro.data.dao.interfaces.UserDao;
 import se.su.dsv.scipro.data.dataobjects.SupervisorBoardMessage;
+import se.su.dsv.scipro.data.dataobjects.SupervisorMessageBoard;
 import se.su.dsv.scipro.data.dataobjects.User;
 
 /**
@@ -35,6 +37,9 @@ public class TestSupervisorBoardMessageDaoJPA {
 	@Autowired 
 	private SupervisorBoardMessageDao hiddenMessageDao;
 	
+	@Autowired 
+	private SupervisorMessageBoardDao supervisorMessageBoardDao;
+	
 	private User user, deletedUser;
 	private SupervisorBoardMessage hiddenMessage;
 	
@@ -56,7 +61,12 @@ public class TestSupervisorBoardMessageDaoJPA {
 		deletedUser.setDeleted(true);
 		deletedUser = userDao.save(deletedUser);
 		
+		SupervisorMessageBoard smbd = new SupervisorMessageBoard();
+		smbd = supervisorMessageBoardDao.save(smbd);
+		
+		
 		hiddenMessage = new SupervisorBoardMessage();
+		hiddenMessage.setSupervisorMessageBoard(smbd);
 		hiddenMessage.setFromUser(user);
 		hiddenMessage.setMessage("Test");
 		hiddenMessage = hiddenMessageDao.save(hiddenMessage);