Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Convert to assertj

Browse Source 
Fixes gh-3175
This commit is contained in:
Billy Korando
2015-12-19 09:29:21 -06:00
committed by Rob Winch
parent bb600a473e
commit 71d4ce96ad
153 changed files with 2472 additions and 2202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
samples/dms-xml/src/test/java/DmsIntegrationTests.java
View File

@@ -40,8 +40,8 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex
@Test
public void testBasePopulation() {
assertThat(Integer.class)).isEqualTo(9, (int) jdbcTemplate.queryForObject("select count(id) from DIRECTORY");
assertThat(Integer.class)).isEqualTo(90, (int) jdbcTemplate.queryForObject("select count(id) from FILE");
assertThat(jdbcTemplate.queryForObject("select count(id) from DIRECTORY", Integer.class)).isEqualTo(9);
assertThat((int) jdbcTemplate.queryForObject("select count(id) from FILE", Integer.class)).isEqualTo(90);
assertThat(documentDao.findElements(Directory.ROOT_DIRECTORY).length).isEqualTo(3);
}
@@ -104,8 +104,7 @@ public class DmsIntegrationTests extends AbstractTransactionalJUnit4SpringContex
}
if (shouldBeFiltered) {
assertNull("Found confidential directory when we should not have",
nonHomeConfidentialDir);
assertThat(nonHomeConfidentialDir).withFailMessage("Found confidential directory when we should not have").isNull();
}
else {
System.out.println("Inaccessible dir....: "

30
samples/dms-xml/src/test/java/SecureDmsIntegrationTests.java
View File

@@ -1,4 +1,4 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.*;
import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
@@ -14,24 +14,16 @@ import org.springframework.test.context.ContextConfiguration;
public class SecureDmsIntegrationTests extends DmsIntegrationTests {
@Test
public void testBasePopulation() {
assertEquals(9,
(int) jdbcTemplate.queryForObject("select count(id) from DIRECTORY", Integer.class));
assertEquals(90,
(int) jdbcTemplate.queryForObject("select count(id) from FILE", Integer.class));
assertEquals(4,
(int) jdbcTemplate.queryForObject("select count(id) from ACL_SID", Integer.class)); // 3
// users
// + 1
// role
assertEquals(2,
(int) jdbcTemplate.queryForObject("select count(id) from ACL_CLASS", Integer.class)); // Directory
// and
// File
assertEquals(100,
(int) jdbcTemplate.queryForObject("select count(id) from ACL_OBJECT_IDENTITY", Integer.class));
assertEquals(115,
(int) jdbcTemplate.queryForObject("select count(id) from ACL_ENTRY", Integer.class));
public void testBasePopulation() {
assertThat(jdbcTemplate.queryForObject("select count(id) from DIRECTORY", Integer.class)).isEqualTo(9);
assertThat(jdbcTemplate.queryForObject("select count(id) from FILE", Integer.class)).isEqualTo(90);
assertThat(jdbcTemplate.queryForObject("select count(id) from ACL_SID", Integer.class)).isEqualTo(4); // 3 users + 1 role
assertThat(jdbcTemplate.queryForObject("select count(id) from ACL_CLASS", Integer.class)).isEqualTo(2); // Directory
// and
// File
assertThat(jdbcTemplate.queryForObject("select count(id) from ACL_OBJECT_IDENTITY", Integer.class))
.isEqualTo(100);
assertThat(jdbcTemplate.queryForObject("select count(id) from ACL_ENTRY", Integer.class)).isEqualTo(115);
}
public void testMarissaRetrieval() {