Author: tchemit Date: 2012-11-16 18:40:45 +0100 (Fri, 16 Nov 2012) New Revision: 2686 Url: http://nuiton.org/repositories/revision/topia/2686 Log: fix deprecated test compilation Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -23,7 +23,7 @@ */ package org.nuiton.topia.persistence; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaDAOTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -26,11 +26,11 @@ package org.nuiton.topia.persistence; import com.google.common.collect.Lists; +import org.hamcrest.CoreMatchers; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.junit.matchers.JUnitMatchers; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaDatabase; import org.nuiton.topia.TopiaException; @@ -76,7 +76,7 @@ public void testCreateAndFindInTransaction() throws Exception { // appel 1 find all - Person person = createPerson("toto"); + createPerson("toto"); List<Person> allPerson = dao.findAll(); Assert.assertEquals(1, allPerson.size()); context.commitTransaction(); @@ -85,7 +85,7 @@ Person person2 = createPerson("titi"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person2)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person2)); context.rollbackTransaction(); @@ -93,7 +93,7 @@ Person person3 = createPerson("tata"); allPerson = dao.findAll(); Assert.assertEquals(2, allPerson.size()); - Assert.assertThat(allPerson, JUnitMatchers.hasItem(person3)); + Assert.assertThat(allPerson, CoreMatchers.hasItem(person3)); context.commitTransaction(); } @@ -171,7 +171,7 @@ List<Person> actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); @@ -181,7 +181,7 @@ actual = Lists.newArrayList(); for (Person person : dao) { - Assert.assertThat(excepted, JUnitMatchers.hasItem(person)); + Assert.assertThat(excepted, CoreMatchers.hasItem(person)); actual.add(person); } Assert.assertEquals(excepted.size(), actual.size()); Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:19 UTC (rev 2685) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topiatest/EnumTest.java 2012-11-16 17:40:45 UTC (rev 2686) @@ -24,7 +24,7 @@ */ package org.nuiton.topiatest; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.TopiaContext;