nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1239: All tests now working with Assertj instead of junit Assertion. (#1346)

This commit is contained in:
tge20 2020-12-03 12:53:29 +01:00 committed by GitHub
parent 70a3ade7f2
commit 8c6beb6e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 170 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -49,7 +49,7 @@
<!-- spring dependencies --> <!-- spring dependencies -->
<version.javax.annotation-api>1.3.2</version.javax.annotation-api> <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
<version.spring.core>2.0.0.RELEASE</version.spring.core> <version.spring.core>2.0.0.RELEASE</version.spring.core>
<version.spring.boot>2.3.5.RELEASE</version.spring.boot> <version.spring.boot>2.4.0</version.spring.boot>
<version.spring.mybatis>2.0.6</version.spring.mybatis> <version.spring.mybatis>2.0.6</version.spring.mybatis>
<!-- wildfly dependencies --> <!-- wildfly dependencies -->

7
rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/TestSchemaNameCustomizable.java
View File

@ -8,7 +8,7 @@ import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Locale; import java.util.Locale;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.junit.Assume; import org.assertj.core.api.Assumptions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -44,7 +44,8 @@ class TestSchemaNameCustomizable {
@Test @Test
void checkCustomSchemaNameIsDefined_Postgres() throws SQLException { void checkCustomSchemaNameIsDefined_Postgres() throws SQLException {
resetDb(); resetDb();
Assume.assumeTrue("Test only executed with Postgres database", isPostgres); Assumptions.assumeThat(isPostgres).isTrue();
;
try (Connection connection = dataSource.getConnection()) { try (Connection connection = dataSource.getConnection()) {
try (PreparedStatement preparedStatement = try (PreparedStatement preparedStatement =
@ -66,7 +67,7 @@ class TestSchemaNameCustomizable {
@Test @Test
void checkCustomSchemaNameIsDefined_OtherDb() throws SQLException { void checkCustomSchemaNameIsDefined_OtherDb() throws SQLException {
resetDb(); resetDb();
Assume.assumeFalse("Test only executed if NOT Postgres", isPostgres); Assumptions.assumeThat(isPostgres).isTrue();
try (Connection connection = dataSource.getConnection()) { try (Connection connection = dataSource.getConnection()) {
try (PreparedStatement preparedStatement = try (PreparedStatement preparedStatement =

4
rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/ClassificationControllerRestDocumentation.java
View File

@ -1,7 +1,7 @@
package pro.taskana.doc.api; package pro.taskana.doc.api;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
@ -333,7 +333,7 @@ class ClassificationControllerRestDocumentation extends BaseRestDocumentation {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("Authorization", TEAMLEAD_1_CREDENTIALS); con.setRequestProperty("Authorization", TEAMLEAD_1_CREDENTIALS);
assertEquals(200, con.getResponseCode()); assertThat(con.getResponseCode()).isEqualTo(200);
BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8)); BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8));
String inputLine; String inputLine;

4
rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/TaskCommentControllerRestDocumentation.java
View File

@ -1,7 +1,7 @@
package pro.taskana.doc.api; package pro.taskana.doc.api;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
@ -132,7 +132,7 @@ class TaskCommentControllerRestDocumentation extends BaseRestDocumentation {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("Authorization", ADMIN_CREDENTIALS); con.setRequestProperty("Authorization", ADMIN_CREDENTIALS);
assertEquals(200, con.getResponseCode()); assertThat(con.getResponseCode()).isEqualTo(200);
BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8)); BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8));
String inputLine; String inputLine;

4
rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/TaskControllerRestDocumentation.java
View File

@ -1,7 +1,7 @@
package pro.taskana.doc.api; package pro.taskana.doc.api;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals; import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
@ -514,7 +514,7 @@ class TaskControllerRestDocumentation extends BaseRestDocumentation {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("Authorization", ADMIN_CREDENTIALS); con.setRequestProperty("Authorization", ADMIN_CREDENTIALS);
assertEquals(200, con.getResponseCode()); assertThat(con.getResponseCode()).isEqualTo(200);
BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8)); BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), UTF_8));
String inputLine; String inputLine;

4
rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/WorkbasketControllerRestDocumentation.java
View File

@ -1,8 +1,8 @@
package pro.taskana.doc.api; package pro.taskana.doc.api;
import static java.nio.charset.StandardCharsets.UTF_8; import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields;
import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
@ -466,7 +466,7 @@ class WorkbasketControllerRestDocumentation extends BaseRestDocumentation {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("Authorization", ADMIN_CREDENTIALS); con.setRequestProperty("Authorization", ADMIN_CREDENTIALS);
assertEquals(200, con.getResponseCode()); assertThat(con.getResponseCode()).isEqualTo(200);
String modifiedWorkbasket; String modifiedWorkbasket;
try (BufferedReader in = try (BufferedReader in =

285
rest/taskana-rest-spring/src/test/java/pro/taskana/monitor/rest/models/ReportRepresentationModelTest.java
View File

@ -1,9 +1,6 @@
package pro.taskana.monitor.rest.models; package pro.taskana.monitor.rest.models;
import static junit.framework.TestCase.assertTrue; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -60,24 +57,24 @@ class ReportRepresentationModelTest {
// meta // meta
ReportRepresentationModel.MetaInformation meta = resource.getMeta(); ReportRepresentationModel.MetaInformation meta = resource.getMeta();
assertEquals("WorkbasketReport", meta.getName()); assertThat(meta.getName()).isEqualTo("WorkbasketReport");
assertEquals("2019-01-02T00:00:00Z", meta.getDate()); assertThat(meta.getDate()).isEqualTo("2019-01-02T00:00:00Z");
assertArrayEquals(new String[] {"WORKBASKET"}, meta.getRowDesc()); assertThat(meta.getRowDesc()).isEqualTo(new String[] {"WORKBASKET"});
assertArrayEquals( assertThat(meta.getHeader())
headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray(), meta.getHeader()); .isEqualTo(headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray());
assertEquals("Total", meta.getTotalDesc()); assertThat(meta.getTotalDesc()).isEqualTo("Total");
// rows // rows
assertTrue(resource.getRows().isEmpty()); assertThat(resource.getRows()).isEmpty();
// sumRow // sumRow
assertEquals(1, resource.getSumRow().size()); assertThat(resource.getSumRow()).hasSize(1);
ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0); ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0);
assertArrayEquals(new String[] {"Total"}, sumRow.getDesc()); assertThat(sumRow.getDesc()).isEqualTo(new String[] {"Total"});
assertTrue(sumRow.isDisplay()); assertThat(sumRow.isDisplay()).isTrue();
assertEquals(0, sumRow.getDepth()); assertThat(sumRow.getDepth()).isZero();
assertEquals(0, sumRow.getTotal()); assertThat(sumRow.getTotal()).isZero();
assertArrayEquals(new int[] {0, 0, 0, 0, 0}, sumRow.getCells()); assertThat(sumRow.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 0});
} }
@Test @Test
@ -96,32 +93,32 @@ class ReportRepresentationModelTest {
// meta // meta
ReportRepresentationModel.MetaInformation meta = resource.getMeta(); ReportRepresentationModel.MetaInformation meta = resource.getMeta();
assertEquals("ClassificationReport", meta.getName()); assertThat(meta.getName()).isEqualTo("ClassificationReport");
assertEquals("2019-01-02T00:00:00Z", meta.getDate()); assertThat(meta.getDate()).isEqualTo("2019-01-02T00:00:00Z");
assertArrayEquals(new String[] {"CLASSIFICATION"}, meta.getRowDesc()); assertThat(meta.getRowDesc()).isEqualTo(new String[] {"CLASSIFICATION"});
assertArrayEquals( assertThat(meta.getHeader())
headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray(), meta.getHeader()); .isEqualTo(headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray());
assertEquals("Total", meta.getTotalDesc()); assertThat(meta.getTotalDesc()).isEqualTo("Total");
// rows // rows
List<ReportRepresentationModel.RowResource> rows = resource.getRows(); List<ReportRepresentationModel.RowResource> rows = resource.getRows();
assertEquals(1, rows.size()); assertThat(rows.size()).isEqualTo(1);
ReportRepresentationModel.RowResource row = rows.get(0); ReportRepresentationModel.RowResource row = rows.get(0);
assertArrayEquals(new String[] {"key"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key"});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
// sumRow // sumRow
assertEquals(1, resource.getSumRow().size()); assertThat(resource.getSumRow().size()).isEqualTo(1);
ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0); ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0);
assertArrayEquals(new String[] {"Total"}, sumRow.getDesc()); assertThat(sumRow.getDesc()).isEqualTo(new String[] {"Total"});
assertTrue(sumRow.isDisplay()); assertThat(sumRow.isDisplay()).isTrue();
assertEquals(0, sumRow.getDepth()); assertThat(sumRow.getDepth()).isZero();
assertEquals(2, sumRow.getTotal()); assertThat(sumRow.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, sumRow.getCells()); assertThat(sumRow.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
} }
@Test @Test
@ -142,39 +139,39 @@ class ReportRepresentationModelTest {
// meta // meta
ReportRepresentationModel.MetaInformation meta = resource.getMeta(); ReportRepresentationModel.MetaInformation meta = resource.getMeta();
assertEquals("ClassificationReport", meta.getName()); assertThat(meta.getName()).isEqualTo("ClassificationReport");
assertEquals("2019-01-02T00:00:00Z", meta.getDate()); assertThat(meta.getDate()).isEqualTo("2019-01-02T00:00:00Z");
assertArrayEquals(new String[] {"CLASSIFICATION"}, meta.getRowDesc()); assertThat(meta.getRowDesc()).isEqualTo(new String[] {"CLASSIFICATION"});
assertArrayEquals( assertThat(meta.getHeader())
headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray(), meta.getHeader()); .isEqualTo(headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray());
assertEquals("Total", meta.getTotalDesc()); assertThat(meta.getTotalDesc()).isEqualTo("Total");
// rows // rows
List<ReportRepresentationModel.RowResource> rows = resource.getRows(); List<ReportRepresentationModel.RowResource> rows = resource.getRows();
assertEquals(2, rows.size()); assertThat(rows.size()).isEqualTo(2);
ReportRepresentationModel.RowResource row = rows.get(0); ReportRepresentationModel.RowResource row = rows.get(0);
assertArrayEquals(new String[] {"key"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key"});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = rows.get(1); row = rows.get(1);
assertArrayEquals(new String[] {"key2"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key2"});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
// sumRow // sumRow
assertEquals(1, resource.getSumRow().size()); assertThat(resource.getSumRow()).hasSize(1);
ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0); ReportRepresentationModel.RowResource sumRow = resource.getSumRow().get(0);
assertArrayEquals(new String[] {"Total"}, sumRow.getDesc()); assertThat(sumRow.getDesc()).isEqualTo(new String[] {"Total"});
assertEquals(0, sumRow.getDepth()); assertThat(sumRow.getDepth()).isZero();
assertTrue(sumRow.isDisplay()); assertThat(sumRow.isDisplay()).isTrue();
assertEquals(4, sumRow.getTotal()); assertThat(sumRow.getTotal()).isEqualTo(4);
assertArrayEquals(new int[] {0, 0, 0, 0, 4}, sumRow.getCells()); assertThat(sumRow.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 4});
} }
@Test @Test
@ -197,62 +194,62 @@ class ReportRepresentationModelTest {
// meta // meta
ReportRepresentationModel.MetaInformation meta = resource.getMeta(); ReportRepresentationModel.MetaInformation meta = resource.getMeta();
assertEquals("DetailedClassificationReport", meta.getName()); assertThat(meta.getName()).isEqualTo("DetailedClassificationReport");
assertEquals("2019-01-02T00:00:00Z", meta.getDate()); assertThat(meta.getDate()).isEqualTo("2019-01-02T00:00:00Z");
assertArrayEquals(new String[] {"TASK CLASSIFICATION", "ATTACHMENT"}, meta.getRowDesc()); assertThat(meta.getRowDesc()).isEqualTo(new String[] {"TASK CLASSIFICATION", "ATTACHMENT"});
assertArrayEquals( assertThat(meta.getHeader())
headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray(), meta.getHeader()); .isEqualTo(headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray());
assertEquals("Total", meta.getTotalDesc()); assertThat(meta.getTotalDesc()).isEqualTo("Total");
// rows // rows
List<ReportRepresentationModel.RowResource> rows = resource.getRows(); List<ReportRepresentationModel.RowResource> rows = resource.getRows();
assertEquals(1 + 2, rows.size()); assertThat(rows).hasSize(1 + 2);
ReportRepresentationModel.RowResource row = rows.get(0); ReportRepresentationModel.RowResource row = rows.get(0);
assertArrayEquals(new String[] {"key", null}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", null});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(4, row.getTotal()); assertThat(row.getTotal()).isEqualTo(4);
assertArrayEquals(new int[] {0, 0, 0, 0, 4}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 4});
row = rows.get(1); row = rows.get(1);
assertArrayEquals(new String[] {"key", "attachment"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", "attachment"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = rows.get(2); row = rows.get(2);
assertArrayEquals(new String[] {"key", "N/A"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", "N/A"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
// sumRow // sumRow
List<ReportRepresentationModel.RowResource> sumRow = resource.getSumRow(); List<ReportRepresentationModel.RowResource> sumRow = resource.getSumRow();
assertEquals(1 + 2, sumRow.size()); assertThat(sumRow).hasSize(1 + 2);
row = sumRow.get(0); row = sumRow.get(0);
assertArrayEquals(new String[] {"Total", null}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", null});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(4, row.getTotal()); assertThat(row.getTotal()).isEqualTo(4);
assertArrayEquals(new int[] {0, 0, 0, 0, 4}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 4});
row = sumRow.get(1); row = sumRow.get(1);
assertArrayEquals(new String[] {"Total", "attachment"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", "attachment"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = sumRow.get(2); row = sumRow.get(2);
assertArrayEquals(new String[] {"Total", "N/A"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", "N/A"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
} }
@Test @Test
@ -277,76 +274,76 @@ class ReportRepresentationModelTest {
// meta // meta
ReportRepresentationModel.MetaInformation meta = resource.getMeta(); ReportRepresentationModel.MetaInformation meta = resource.getMeta();
assertEquals("DetailedClassificationReport", meta.getName()); assertThat(meta.getName()).isEqualTo("DetailedClassificationReport");
assertEquals("2019-01-02T00:00:00Z", meta.getDate()); assertThat(meta.getDate()).isEqualTo("2019-01-02T00:00:00Z");
assertArrayEquals(new String[] {"TASK CLASSIFICATION", "ATTACHMENT"}, meta.getRowDesc()); assertThat(meta.getRowDesc()).isEqualTo(new String[] {"TASK CLASSIFICATION", "ATTACHMENT"});
assertArrayEquals( assertThat(meta.getHeader())
headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray(), meta.getHeader()); .isEqualTo(headers.stream().map(TimeIntervalColumnHeader::getDisplayName).toArray());
assertEquals("Total", meta.getTotalDesc()); assertThat(meta.getTotalDesc()).isEqualTo("Total");
// rows // rows
List<ReportRepresentationModel.RowResource> rows = resource.getRows(); List<ReportRepresentationModel.RowResource> rows = resource.getRows();
assertEquals((1 + 2) + (1 + 1), rows.size()); assertThat(rows).hasSize((1 + 2) + (1 + 1));
ReportRepresentationModel.RowResource row = rows.get(0); ReportRepresentationModel.RowResource row = rows.get(0);
assertArrayEquals(new String[] {"key", null}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", null});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(4, row.getTotal()); assertThat(row.getTotal()).isEqualTo(4);
assertArrayEquals(new int[] {0, 0, 0, 0, 4}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 4});
row = rows.get(1); row = rows.get(1);
assertArrayEquals(new String[] {"key", "attachment"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", "attachment"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = rows.get(2); row = rows.get(2);
assertArrayEquals(new String[] {"key", "N/A"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key", "N/A"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = rows.get(3); row = rows.get(3);
assertArrayEquals(new String[] {"key2", null}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key2", null});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = rows.get(4); row = rows.get(4);
assertArrayEquals(new String[] {"key2", "N/A"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"key2", "N/A"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
// sumRow // sumRow
List<ReportRepresentationModel.RowResource> sumRow = resource.getSumRow(); List<ReportRepresentationModel.RowResource> sumRow = resource.getSumRow();
assertEquals(1 + 2, sumRow.size()); assertThat(sumRow).hasSize(1 + 2);
row = sumRow.get(0); row = sumRow.get(0);
assertArrayEquals(new String[] {"Total", null}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", null});
assertEquals(0, row.getDepth()); assertThat(row.getDepth()).isZero();
assertTrue(row.isDisplay()); assertThat(row.isDisplay()).isTrue();
assertEquals(6, row.getTotal()); assertThat(row.getTotal()).isEqualTo(6);
assertArrayEquals(new int[] {0, 0, 0, 0, 6}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 6});
row = sumRow.get(1); row = sumRow.get(1);
assertArrayEquals(new String[] {"Total", "attachment"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", "attachment"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(2, row.getTotal()); assertThat(row.getTotal()).isEqualTo(2);
assertArrayEquals(new int[] {0, 0, 0, 0, 2}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 2});
row = sumRow.get(2); row = sumRow.get(2);
assertArrayEquals(new String[] {"Total", "N/A"}, row.getDesc()); assertThat(row.getDesc()).isEqualTo(new String[] {"Total", "N/A"});
assertEquals(1, row.getDepth()); assertThat(row.getDepth()).isEqualTo(1);
assertFalse(row.isDisplay()); assertThat(row.isDisplay()).isFalse();
assertEquals(4, row.getTotal()); assertThat(row.getTotal()).isEqualTo(4);
assertArrayEquals(new int[] {0, 0, 0, 0, 4}, row.getCells()); assertThat(row.getCells()).isEqualTo(new int[] {0, 0, 0, 0, 4});
} }
} }

2
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java
View File

@ -28,7 +28,7 @@ import pro.taskana.common.test.rest.TaskanaSpringBootTest;
import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel; import pro.taskana.workbasket.rest.models.WorkbasketAccessItemRepresentationModel;
/** Test WorkbasketAccessItemController. */ /** Test WorkbasketAccessItemController. */
@TestMethodOrder(MethodOrderer.Alphanumeric.class) @TestMethodOrder(MethodOrderer.MethodName.class)
@TaskanaSpringBootTest @TaskanaSpringBootTest
class WorkbasketAccessItemControllerIntTest { class WorkbasketAccessItemControllerIntTest {

31
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/assembler/WorkbasketSummaryRepresentationModelAssemblerTest.java
View File

@ -6,7 +6,6 @@ import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_2;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3; import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_3;
import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4; import static pro.taskana.workbasket.api.WorkbasketCustomField.CUSTOM_4;
import org.junit.Assert;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -113,21 +112,21 @@ class WorkbasketSummaryRepresentationModelAssemblerTest {
WorkbasketSummary summary, WorkbasketSummaryRepresentationModel repModel) { WorkbasketSummary summary, WorkbasketSummaryRepresentationModel repModel) {
assertThat(summary).hasNoNullFieldsOrProperties(); assertThat(summary).hasNoNullFieldsOrProperties();
assertThat(repModel).hasNoNullFieldsOrProperties(); assertThat(repModel).hasNoNullFieldsOrProperties();
Assert.assertEquals(summary.getDescription(), repModel.getDescription()); assertThat(summary.getDescription()).isEqualTo(repModel.getDescription());
Assert.assertEquals(summary.getDomain(), repModel.getDomain()); assertThat(summary.getDomain()).isEqualTo(repModel.getDomain());
Assert.assertEquals(summary.getId(), repModel.getWorkbasketId()); assertThat(summary.getId()).isEqualTo(repModel.getWorkbasketId());
Assert.assertEquals(summary.getKey(), repModel.getKey()); assertThat(summary.getKey()).isEqualTo(repModel.getKey());
Assert.assertEquals(summary.getName(), repModel.getName()); assertThat(summary.getName()).isEqualTo(repModel.getName());
Assert.assertEquals(summary.getCustomAttribute(CUSTOM_1), repModel.getCustom1()); assertThat(summary.getCustomAttribute(CUSTOM_1)).isEqualTo(repModel.getCustom1());
Assert.assertEquals(summary.getCustomAttribute(CUSTOM_2), repModel.getCustom2()); assertThat(summary.getCustomAttribute(CUSTOM_2)).isEqualTo(repModel.getCustom2());
Assert.assertEquals(summary.getCustomAttribute(CUSTOM_3), repModel.getCustom3()); assertThat(summary.getCustomAttribute(CUSTOM_3)).isEqualTo(repModel.getCustom3());
Assert.assertEquals(summary.getCustomAttribute(CUSTOM_4), repModel.getCustom4()); assertThat(summary.getCustomAttribute(CUSTOM_4)).isEqualTo(repModel.getCustom4());
Assert.assertEquals(summary.getOrgLevel1(), repModel.getOrgLevel1()); assertThat(summary.getOrgLevel1()).isEqualTo(repModel.getOrgLevel1());
Assert.assertEquals(summary.getOrgLevel2(), repModel.getOrgLevel2()); assertThat(summary.getOrgLevel2()).isEqualTo(repModel.getOrgLevel2());
Assert.assertEquals(summary.getOrgLevel3(), repModel.getOrgLevel3()); assertThat(summary.getOrgLevel3()).isEqualTo(repModel.getOrgLevel3());
Assert.assertEquals(summary.getOrgLevel4(), repModel.getOrgLevel4()); assertThat(summary.getOrgLevel4()).isEqualTo(repModel.getOrgLevel4());
Assert.assertEquals(summary.getOwner(), repModel.getOwner()); assertThat(summary.getOwner()).isEqualTo(repModel.getOwner());
Assert.assertEquals(summary.getType(), repModel.getType()); assertThat(summary.getType()).isEqualTo(repModel.getType());
} }
private void testLinks(WorkbasketSummaryRepresentationModel repModel) {} private void testLinks(WorkbasketSummaryRepresentationModel repModel) {}