Commit 01d94034a6782240d743a5c2ef61a112dd24f33e

Authored by rvangrev
1 parent 62ed607d

Merge branch 'master' of archives.plil.fr:GIS2A4-Java/spring-persistence

Conflicts:
	src/test/resources/application.properties
src/test/java/fr/plil/sio/persistence/jpa/RightServiceTest.java
@@ -2,6 +2,7 @@ package fr.plil.sio.persistence.jpa; @@ -2,6 +2,7 @@ package fr.plil.sio.persistence.jpa;
2 2
3 import fr.plil.sio.persistence.api.Right; 3 import fr.plil.sio.persistence.api.Right;
4 import fr.plil.sio.persistence.api.RightService; 4 import fr.plil.sio.persistence.api.RightService;
  5 +import javax.transaction.Transactional;
5 import org.junit.Test; 6 import org.junit.Test;
6 import org.junit.runner.RunWith; 7 import org.junit.runner.RunWith;
7 import org.springframework.beans.factory.annotation.Autowired; 8 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,7 @@ import static org.junit.Assert.*; @@ -12,6 +13,7 @@ import static org.junit.Assert.*;
12 13
13 @RunWith(SpringJUnit4ClassRunner.class) 14 @RunWith(SpringJUnit4ClassRunner.class)
14 @SpringBootTest 15 @SpringBootTest
  16 +@Transactional
15 public class RightServiceTest { 17 public class RightServiceTest {
16 18
17 @Autowired 19 @Autowired