diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/FormsSecurityConfig.java b/forms/src/main/java/org/devgateway/toolkit/forms/FormsSecurityConfig.java index 9b97fa58..8c372417 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/FormsSecurityConfig.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/FormsSecurityConfig.java @@ -24,6 +24,7 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices; import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices; +import org.springframework.security.web.context.SecurityContextHolderFilter; import static org.devgateway.toolkit.web.WebConstants.FORMS_BASE_PATH; @@ -45,7 +46,7 @@ public class FormsSecurityConfig extends WebSecurityConfig { * resources */ @Override - public void configure(final WebSecurity web) throws Exception { + public void configure(final WebSecurity web) { super.configure(web); web.ignoring().antMatchers("/img/**", "/css*/**", "/js*/**", "/assets*/**", "/favicon.ico", "/resources/**", "/resources/public/**"); @@ -87,8 +88,9 @@ public AbstractRememberMeServices rememberMeServices() { } @Override - protected void configure(final HttpSecurity http) throws Exception { - super.configure(http); + protected void configure(final HttpSecurity http, final SecurityContextHolderFilter securityContextHolderFilter) + throws Exception { + super.configure(http, securityContextHolderFilter); // we do not allow anyonymous token. When // enabled this basically means any guest diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/util/PageUtil.java b/forms/src/main/java/org/devgateway/toolkit/forms/util/PageUtil.java new file mode 100644 index 00000000..cc857d91 --- /dev/null +++ b/forms/src/main/java/org/devgateway/toolkit/forms/util/PageUtil.java @@ -0,0 +1,23 @@ +package org.devgateway.toolkit.forms.util; + +import org.apache.wicket.request.cycle.RequestCycle; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author Nadejda Mandrescu + */ +public final class PageUtil { + private PageUtil() { + } + + public static HttpServletRequest getHttpServletRequest() { + return (HttpServletRequest) RequestCycle.get().getRequest().getContainerRequest(); + } + + public static HttpServletResponse getHttpServletResponse() { + return (HttpServletResponse) RequestCycle.get().getResponse().getContainerResponse(); + } + +} diff --git a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/SSAuthenticatedWebSession.java b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/SSAuthenticatedWebSession.java index ba74b461..dcdf5ae6 100644 --- a/forms/src/main/java/org/devgateway/toolkit/forms/wicket/SSAuthenticatedWebSession.java +++ b/forms/src/main/java/org/devgateway/toolkit/forms/wicket/SSAuthenticatedWebSession.java @@ -21,6 +21,7 @@ import org.apache.wicket.request.Request; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.spring.injection.annot.SpringBean; +import org.devgateway.toolkit.forms.util.PageUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.access.hierarchicalroles.RoleHierarchy; @@ -31,6 +32,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.RememberMeServices; +import org.springframework.security.web.context.HttpSessionSecurityContextRepository; import java.util.Collection; @@ -56,6 +58,9 @@ public class SSAuthenticatedWebSession extends AuthenticatedWebSession { @SpringBean private AuthenticationManager authenticationManager; + @SpringBean + private HttpSessionSecurityContextRepository securityContextRepository; + @SpringBean private RoleHierarchy roleHierarchy; @@ -64,7 +69,7 @@ public class SSAuthenticatedWebSession extends AuthenticatedWebSession { /* * (non-Javadoc) - * + * * @see org.apache.wicket.Session#replaceSession() */ @Override @@ -99,6 +104,11 @@ public boolean authenticate(final String username, final String password) { Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, password)); SecurityContextHolder.getContext().setAuthentication(authentication); + + // (since Spring Security 5.7) explicitly save context, no longer done by security filter + securityContextRepository.saveContext(SecurityContextHolder.getContext(), PageUtil.getHttpServletRequest(), + PageUtil.getHttpServletResponse()); + // httpSession.setAttribute(HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, // SecurityContextHolder.getContext()); authenticated = authentication.isAuthenticated(); @@ -129,7 +139,7 @@ public Roles getRoles() { /** * Gets the Spring roles and dumps them into Wicket's {@link Roles} object, * only if the user is signed in - * + * * @see {@link #isSignedIn()} * @see #addRolesFromAuthentication(Roles, Authentication) * @param roles diff --git a/persistence-mongodb/pom.xml b/persistence-mongodb/pom.xml index f43df6ce..00a79555 100644 --- a/persistence-mongodb/pom.xml +++ b/persistence-mongodb/pom.xml @@ -62,11 +62,6 @@ test - - junit - junit - - org.springframework.boot spring-boot-starter-data-rest diff --git a/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java b/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java index 126a164e..34128c86 100644 --- a/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java +++ b/persistence-mongodb/src/test/java/org/devgateway/toolkit/persistence/mongo/AbstractMongoTest.java @@ -1,13 +1,13 @@ package org.devgateway.toolkit.persistence.mongo; import org.devgateway.toolkit.persistence.mongo.spring.MongoPersistenceApplication; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @ActiveProfiles("integration") @SpringBootTest(classes = { MongoPersistenceApplication.class }) @TestPropertySource("classpath:test.properties") diff --git a/persistence/pom.xml b/persistence/pom.xml index 2ae7bb6c..a1ceafcb 100644 --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -34,8 +34,10 @@ - junit - junit + org.junit.platform + junit-platform-suite + + 1.8.2 test diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/AbstractExcelSheetTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/AbstractExcelSheetTest.java index 096a5a8a..ecdaba7f 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/AbstractExcelSheetTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/AbstractExcelSheetTest.java @@ -5,8 +5,8 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -58,9 +58,9 @@ public void writeCell() throws Exception { excelSheet.writeCell("text", row, 2); excelSheet.writeCell(1, row, 3); - Assert.assertEquals(CellType.BLANK, row.getCell(0).getCellType()); - Assert.assertEquals("Yes", row.getCell(1).getStringCellValue()); - Assert.assertEquals(CellType.STRING, row.getCell(2).getCellType()); - Assert.assertEquals(CellType.NUMERIC, row.getCell(3).getCellType()); + Assertions.assertEquals(CellType.BLANK, row.getCell(0).getCellType()); + Assertions.assertEquals("Yes", row.getCell(1).getStringCellValue()); + Assertions.assertEquals(CellType.STRING, row.getCell(2).getCellType()); + Assertions.assertEquals(CellType.NUMERIC, row.getCell(3).getCellType()); } } diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldImportServiceTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldImportServiceTest.java index 04deab6c..69b8bae9 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldImportServiceTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldImportServiceTest.java @@ -3,8 +3,8 @@ import org.devgateway.toolkit.persistence.excel.annotation.ExcelImport; import org.devgateway.toolkit.persistence.excel.info.ClassFields; import org.devgateway.toolkit.persistence.excel.info.ClassFieldsDefault; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.ArrayList; @@ -45,13 +45,13 @@ public void getFieldType() throws Exception { final Iterator fields = classFields.getFields(); final Field firstField = fields.next(); // get first element - Assert.assertEquals("Check basic field type", FieldTypeImport.basic, ExcelFieldImportService.getFieldType(firstField)); + Assertions.assertEquals(FieldTypeImport.basic, ExcelFieldImportService.getFieldType(firstField), "Check basic field type"); final Field thirdField = fields.next(); // get second element - Assert.assertEquals("Check basic field type for Object", FieldTypeImport.object, ExcelFieldImportService.getFieldType(thirdField)); + Assertions.assertEquals(FieldTypeImport.object, ExcelFieldImportService.getFieldType(thirdField), "Check basic field type for Object"); final Field fourthField = fields.next(); // get third element - Assert.assertEquals("Check importByProp field type Object", FieldTypeImport.objectImportByProp, ExcelFieldImportService.getFieldType(fourthField)); + Assertions.assertEquals(FieldTypeImport.objectImportByProp, ExcelFieldImportService.getFieldType(fourthField), "Check importByProp field type Object"); } @Test @@ -66,6 +66,6 @@ public void getFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check get fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), "Check get fields"); } } diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldServiceTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldServiceTest.java index c679b073..d55b46c9 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldServiceTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFieldServiceTest.java @@ -3,8 +3,8 @@ import org.devgateway.toolkit.persistence.excel.annotation.ExcelExport; import org.devgateway.toolkit.persistence.excel.info.ClassFields; import org.devgateway.toolkit.persistence.excel.info.ClassFieldsDefault; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.data.domain.Persistable; import java.lang.reflect.Field; @@ -58,16 +58,16 @@ public void getFieldType() throws Exception { final Iterator fields = classFields.getFields(); final Field firstField = fields.next(); // get first element - Assert.assertEquals("Check basic field type", FieldType.basic, ExcelFieldService.getFieldType(firstField)); + Assertions.assertEquals(FieldType.basic, ExcelFieldService.getFieldType(firstField), "Check basic field type"); final Field secondField = fields.next(); // get second element - Assert.assertEquals("Check type class for a List", FieldType.basic, ExcelFieldService.getFieldType(secondField)); + Assertions.assertEquals(FieldType.basic, ExcelFieldService.getFieldType(secondField), "Check type class for a List"); final Field thirdField = fields.next(); // get third element - Assert.assertEquals("Check basic field type for Object", FieldType.basic, ExcelFieldService.getFieldType(thirdField)); + Assertions.assertEquals(FieldType.basic, ExcelFieldService.getFieldType(thirdField), "Check basic field type for Object"); final Field fourthField = fields.next(); // get fourth element - Assert.assertEquals("Check objectSeparateSheet field type Object", FieldType.objectSeparateSheet, ExcelFieldService.getFieldType(fourthField)); + Assertions.assertEquals(FieldType.objectSeparateSheet, ExcelFieldService.getFieldType(fourthField), "Check objectSeparateSheet field type Object"); } @Test @@ -76,11 +76,11 @@ public void getFieldClass() throws Exception { final Iterator fields = classFields.getFields(); final Field firstField = fields.next(); // get first element - Assert.assertEquals("Check basic field class", Long.class, ExcelFieldService.getFieldClass(firstField)); + Assertions.assertEquals(Long.class, ExcelFieldService.getFieldClass(firstField), "Check basic field class"); final Field secondField = fields.next(); // get second element - Assert.assertEquals("Check field class for a List", String.class, ExcelFieldService.getFieldClass(secondField)); + Assertions.assertEquals(String.class, ExcelFieldService.getFieldClass(secondField), "Check field class for a List"); } @Test @@ -95,16 +95,16 @@ public void getFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check get fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), "Check get fields"); } @Test public void getObjectID() throws Exception { final OtherClass otherClass = new OtherClass(); - Assert.assertEquals("Check object ID", Long.valueOf(-1), ExcelFieldService.getObjectID(otherClass)); + Assertions.assertEquals(Long.valueOf(-1), ExcelFieldService.getObjectID(otherClass), "Check object ID"); final TestClass testclass = new TestClass((long) 10); - Assert.assertEquals("Check object ID", Long.valueOf(10), ExcelFieldService.getObjectID(testclass)); + Assertions.assertEquals(Long.valueOf(10), ExcelFieldService.getObjectID(testclass), "Check object ID"); } @Test @@ -113,9 +113,9 @@ public void getFieldName() throws Exception { final Iterator fields = classFields.getFields(); final Field firstField = fields.next(); // get first element - Assert.assertEquals("Check field name", "valid", ExcelFieldService.getFieldName(null, firstField, null)); + Assertions.assertEquals("valid", ExcelFieldService.getFieldName(null, firstField, null), "Check field name"); final Field secondField = fields.next(); // get second element - Assert.assertEquals("Check field name", "money", ExcelFieldService.getFieldName(null, secondField, null)); + Assertions.assertEquals("money", ExcelFieldService.getFieldName(null, secondField, null), "Check field name"); } } diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileDefaultTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileDefaultTest.java index 922ad0ad..51daa90c 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileDefaultTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileDefaultTest.java @@ -3,8 +3,8 @@ import org.apache.poi.ss.usermodel.Workbook; import org.devgateway.toolkit.persistence.excel.annotation.ExcelExport; import org.devgateway.toolkit.persistence.excel.service.TranslateService; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Persistable; @@ -36,27 +36,27 @@ public void createWorkbook() throws Exception { // workbook.write(outputStream); // } - Assert.assertEquals("Number of sheets", 3, workbook.getNumberOfSheets()); + Assertions.assertEquals(3, workbook.getNumberOfSheets(), "Number of sheets"); - Assert.assertNotNull("buyer sheet", workbook.getSheet("testbuyer")); - Assert.assertNotNull("contract sheet", workbook.getSheet("testcontract")); - Assert.assertNotNull("document sheet", workbook.getSheet("testdocument")); + Assertions.assertNotNull(workbook.getSheet("testbuyer"), "buyer sheet"); + Assertions.assertNotNull(workbook.getSheet("testcontract"), "contract sheet"); + Assertions.assertNotNull(workbook.getSheet("testdocument"), "document sheet"); - Assert.assertEquals("buyer name", "buyer 1", - workbook.getSheet("testbuyer").getRow(1).getCell(0).toString()); - Assert.assertEquals("buyer classification", "TP-1 - alii aliquam", - workbook.getSheet("testbuyer").getRow(2).getCell(8).toString()); + Assertions.assertEquals("buyer 1", workbook.getSheet("testbuyer").getRow(1).getCell(0).toString(), + "buyer name"); + Assertions.assertEquals("TP-1 - alii aliquam", workbook.getSheet("testbuyer").getRow(2).getCell(8).toString(), + "buyer classification"); - Assert.assertEquals("contract parent", "testbuyer - 1", - workbook.getSheet("testcontract").getRow(1).getCell(0).toString()); - Assert.assertEquals("contract amount", 1000, - workbook.getSheet("testcontract").getRow(1).getCell(2).getNumericCellValue(), 0.0); + Assertions.assertEquals("testbuyer - 1", workbook.getSheet("testcontract").getRow(1).getCell(0).toString(), + "contract parent"); + Assertions.assertEquals(1000, workbook.getSheet("testcontract").getRow(1).getCell(2).getNumericCellValue(), 0.0, + "contract amount"); - Assert.assertEquals("document number of rows", 2, workbook.getSheet("testdocument").getLastRowNum()); + Assertions.assertEquals(2, workbook.getSheet("testdocument").getLastRowNum(), "document number of rows"); - Assert.assertEquals("buyer address flatten", "Street 1 | Street 2", - workbook.getSheet("testbuyer").getRow(1).getCell(4).toString()); + Assertions.assertEquals("Street 1 | Street 2", workbook.getSheet("testbuyer").getRow(1).getCell(4).toString(), + "buyer address flatten"); } private List createObjects() { diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileImportDefaultTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileImportDefaultTest.java index 34a82e45..f7b45d42 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileImportDefaultTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/ExcelFileImportDefaultTest.java @@ -4,9 +4,9 @@ import org.devgateway.toolkit.persistence.excel.info.ImportBean; import org.devgateway.toolkit.persistence.excel.test.TestAddressRepository; import org.devgateway.toolkit.persistence.excel.test.TestBuyer; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -35,7 +35,7 @@ * @since 21/03/2018 */ public class ExcelFileImportDefaultTest { - @BeforeClass + @BeforeAll public static void setErrorLogging() { LoggingSystem.get(ClassLoader.getSystemClassLoader()).setLogLevel(ROOT_LOGGER_NAME, LogLevel.WARN); } @@ -49,11 +49,11 @@ public void readWorkbook() throws Exception { final ImportResponse importResponse = excelFileImport.readWorkbook(); TestBuyer testBuyer = (TestBuyer) importResponse.getObjects().get(0); - Assert.assertEquals("check number of objects", 2, importResponse.getObjects().size()); - Assert.assertEquals("check buyer name", "buyer 1", testBuyer.getName()); - Assert.assertEquals("check organization name", "organization 1", testBuyer.getOrg().getName()); - Assert.assertEquals("check address", "Street 1", testBuyer.getOrg().getAddress().getStreet()); - Assert.assertEquals("check address", "Romania", testBuyer.getOrg().getAddress().getCountry()); + Assertions.assertEquals(2, importResponse.getObjects().size(), "check number of objects"); + Assertions.assertEquals("buyer 1", testBuyer.getName(), "check buyer name"); + Assertions.assertEquals("organization 1", testBuyer.getOrg().getName(), "check organization name"); + Assertions.assertEquals("Street 1", testBuyer.getOrg().getAddress().getStreet(), "check address"); + Assertions.assertEquals("Romania", testBuyer.getOrg().getAddress().getCountry(), "check address"); } /** diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsDefaultTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsDefaultTest.java index 6c39ef7c..fea278c7 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsDefaultTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsDefaultTest.java @@ -1,7 +1,7 @@ package org.devgateway.toolkit.persistence.excel.info; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.ArrayList; @@ -40,7 +40,7 @@ public void getFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), "Check declared fields"); } @Test @@ -56,6 +56,6 @@ public void getInheritedFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared & inherited fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), "Check declared & inherited fields"); } } diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelExportTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelExportTest.java index e7782005..9d068d4d 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelExportTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelExportTest.java @@ -1,8 +1,8 @@ package org.devgateway.toolkit.persistence.excel.info; import org.devgateway.toolkit.persistence.excel.annotation.ExcelExport; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.ArrayList; @@ -51,7 +51,8 @@ public void getFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared @ExcelExport fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), + "Check declared @ExcelExport fields"); } @Test @@ -69,7 +70,7 @@ public void getInheritedFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared & inherited @ExcelExport fields", - expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), + "Check declared & inherited @ExcelExport fields"); } } diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelImportTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelImportTest.java index 2326e9f6..55f1b11d 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelImportTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/info/ClassFieldsExcelImportTest.java @@ -1,8 +1,8 @@ package org.devgateway.toolkit.persistence.excel.info; import org.devgateway.toolkit.persistence.excel.annotation.ExcelImport; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; import java.util.ArrayList; @@ -52,7 +52,8 @@ public void getFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared @ExcelImport fields", expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), + "Check declared @ExcelImport fields"); } @Test @@ -70,7 +71,7 @@ public void getInheritedFields() throws Exception { actualFields.add(f.getName()); } - Assert.assertArrayEquals("Check declared & inherited @ExcelImport fields", - expectedFields, actualFields.toArray()); + Assertions.assertArrayEquals(expectedFields, actualFields.toArray(), + "Check declared & inherited @ExcelImport fields"); } -} \ No newline at end of file +} diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddress.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddress.java index ee5df478..8c4c4e8a 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddress.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddress.java @@ -3,7 +3,6 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.StandardToStringStyle; import org.devgateway.toolkit.persistence.excel.annotation.ExcelImport; -import org.junit.Test; public class TestAddress { private Long id; diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddressRepository.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddressRepository.java index 8a2f5939..0968a68f 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddressRepository.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/excel/test/TestAddressRepository.java @@ -112,6 +112,11 @@ public TestAddress getById(final Long aLong) { return null; } + @Override + public TestAddress getReferenceById(final Long aLong) { + return null; + } + @Override public List findAll(Example example, Sort sort) { return null; @@ -192,6 +197,11 @@ public boolean exists(Example example) { return false; } + @Override + public boolean exists(final Specification spec) { + return false; + } + @Override public R findBy(final Example example, final Function, R> queryFunction) { diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/test/AbstractPersistenceTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/test/AbstractPersistenceTest.java index 0748544c..fa376147 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/test/AbstractPersistenceTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/test/AbstractPersistenceTest.java @@ -1,17 +1,17 @@ package org.devgateway.toolkit.persistence.test; import org.devgateway.toolkit.persistence.spring.PersistenceApplication; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author mpostelnicu * */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @ActiveProfiles("integration") @SpringBootTest(classes = { PersistenceApplication.class }) @TestPropertySource("classpath:test.properties") diff --git a/persistence/src/test/java/org/devgateway/toolkit/persistence/test/IdSerializationTest.java b/persistence/src/test/java/org/devgateway/toolkit/persistence/test/IdSerializationTest.java index 3a5d2c67..cbe312c3 100644 --- a/persistence/src/test/java/org/devgateway/toolkit/persistence/test/IdSerializationTest.java +++ b/persistence/src/test/java/org/devgateway/toolkit/persistence/test/IdSerializationTest.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.devgateway.toolkit.persistence.dao.GenericPersistable; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.data.jpa.domain.AbstractPersistable; /** diff --git a/pom.xml b/pom.xml index 52d064d8..dd2866a5 100644 --- a/pom.xml +++ b/pom.xml @@ -24,11 +24,11 @@ UTF-8 17 4.7.1 - 2.6.3 + 2.7.4 10.14.2.0 4.0.1 3.1.2 - 3.0.0-M5 + 3.0.0-M7 3.0.0-M5 3.9.0 3.27.0-GA diff --git a/web/pom.xml b/web/pom.xml index 4d123570..51bdc0b5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -71,12 +71,6 @@ spring-boot-test - - junit - junit - test - - de.flapdoodle.embed de.flapdoodle.embed.mongo diff --git a/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java b/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java index 708e9269..eb585331 100644 --- a/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java +++ b/web/src/main/java/org/devgateway/toolkit/web/spring/WebSecurityConfig.java @@ -23,16 +23,18 @@ import org.springframework.security.access.hierarchicalroles.RoleHierarchy; import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.authentication.dao.DaoAuthenticationProvider; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.FilterInvocation; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.access.expression.DefaultWebSecurityExpressionHandler; import org.springframework.security.web.context.HttpSessionSecurityContextRepository; -import org.springframework.security.web.context.SecurityContextPersistenceFilter; +import org.springframework.security.web.context.SecurityContextHolderFilter; import org.springframework.security.web.firewall.HttpFirewall; import org.springframework.security.web.firewall.StrictHttpFirewall; @@ -49,7 +51,7 @@ // them overlayed, it must pick that one first) @PropertySource("classpath:allowedApiEndpoints.properties") @EnableWebSecurity -public class WebSecurityConfig extends WebSecurityConfigurerAdapter { +public class WebSecurityConfig { @Autowired protected CustomJPAUserDetailsService customJPAUserDetailsService; @@ -78,14 +80,19 @@ public HttpSessionSecurityContextRepository httpSessionSecurityContextRepository } @Bean - public SecurityContextPersistenceFilter securityContextPersistenceFilter() { - final SecurityContextPersistenceFilter securityContextPersistenceFilter = - new SecurityContextPersistenceFilter(httpSessionSecurityContextRepository()); - return securityContextPersistenceFilter; + public SecurityContextHolderFilter securityContextHolderFilter( + HttpSessionSecurityContextRepository securityContextRepository) { + SecurityContextHolderFilter securityContextHolderFilter = + new SecurityContextHolderFilter(securityContextRepository); + return securityContextHolderFilter; } - @Override - public void configure(final WebSecurity web) throws Exception { + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { + return this::configure; + } + + public void configure(final WebSecurity web) { web.httpFirewall(allowUrlEncodedSlashHttpFirewall()) .ignoring().antMatchers(allowedApiEndpoints).and() .ignoring().antMatchers( @@ -93,15 +100,22 @@ public void configure(final WebSecurity web) throws Exception { FORMS_BASE_PATH + "/forgotPassword/**"); } - @Override - protected void configure(final HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(final HttpSecurity http, + final SecurityContextHolderFilter securityContextHolderFilter) throws Exception { + this.configure(http, securityContextHolderFilter); + return http.build(); + } + + protected void configure(final HttpSecurity http, final SecurityContextHolderFilter securityContextHolderFilter) + throws Exception { http.authorizeRequests().expressionHandler(webExpressionHandler()) // inject role hierarchy .antMatchers(FORMS_BASE_PATH + "/monitoring/**").access("hasRole('ROLE_ADMIN')") .antMatchers(FORMS_BASE_PATH + "/**").authenticated().and() .formLogin().loginPage(FORMS_BASE_PATH + "/login").permitAll().and() .requestCache().and().logout().permitAll().and() .sessionManagement().and().csrf().disable(); - http.addFilter(securityContextPersistenceFilter()); + http.addFilter(securityContextHolderFilter); } /** @@ -128,13 +142,16 @@ RoleHierarchy roleHierarchy() { } @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) + throws Exception { + return authenticationConfiguration.getAuthenticationManager(); } - @Autowired - public void configureGlobal(final AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(customJPAUserDetailsService).passwordEncoder(passwordEncoder); + @Bean + public DaoAuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider(); + authenticationProvider.setUserDetailsService(customJPAUserDetailsService); + authenticationProvider.setPasswordEncoder(passwordEncoder); + return authenticationProvider; } } diff --git a/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java b/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java index cc9809b5..5ddf3884 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/AbstractSpringDataRestControllerTest.java @@ -1,5 +1,5 @@ /** - * + * */ package org.devgateway.toolkit.web; @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.StringUtils; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.rest.webmvc.PersistentEntityResourceAssembler; @@ -39,7 +39,7 @@ public abstract class AbstractSpringDataRestControllerTest extends AbstractWebTe private MockMvc mockMvc; /** - * http://stackoverflow.com/a/36960968 + * http://stackoverflow.com/a/36960968 * This is needed if you do * {@link PagedResourcesAssembler#toResource(org.springframework.data.domain.Page)} * in your controller @@ -56,7 +56,7 @@ private void mockHttpServletRequestForResouceAssemblerSupport() { RequestContextHolder.setRequestAttributes(servletRequestAttributes); } - @Before + @BeforeEach public void setUp() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context).build(); this.persistentEntityResourceAssembler = mock(PersistentEntityResourceAssembler.class); diff --git a/web/src/test/java/org/devgateway/toolkit/web/AbstractWebTest.java b/web/src/test/java/org/devgateway/toolkit/web/AbstractWebTest.java index 38f9bd90..7dcb9395 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/AbstractWebTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/AbstractWebTest.java @@ -1,14 +1,15 @@ package org.devgateway.toolkit.web; import org.devgateway.toolkit.web.spring.WebApplication; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) + +@ExtendWith(SpringExtension.class) @ActiveProfiles("integration") @SpringBootTest(classes = { WebApplication.class }, webEnvironment = WebEnvironment.RANDOM_PORT) @TestPropertySource("classpath:test.properties") diff --git a/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java b/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java index ec67fe2e..ffc7ec94 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/AsyncControllerLookupServiceTest.java @@ -1,5 +1,5 @@ /** - * + * */ package org.devgateway.toolkit.web; @@ -10,8 +10,8 @@ import org.devgateway.toolkit.web.rest.entity.Dummy; import org.devgateway.toolkit.web.spring.AsyncControllerLookupService; import org.devgateway.toolkit.web.spring.util.AsyncBeanParamControllerMethodCallable; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; /** @@ -45,8 +45,8 @@ public Dummy invokeControllerMethod(final String filter) { lookupService.waitTillDone(joe, wendy); - Assert.assertEquals("Hello, Joe!", joe.get().getContent()); - Assert.assertEquals("Hello, Wendy!", wendy.get().getContent()); + Assertions.assertEquals("Hello, Joe!", joe.get().getContent()); + Assertions.assertEquals("Hello, Wendy!", wendy.get().getContent()); } } diff --git a/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartDefaultTest.java b/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartDefaultTest.java index e2d8f7a6..14293a41 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartDefaultTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartDefaultTest.java @@ -7,8 +7,8 @@ import org.apache.poi.xssf.usermodel.charts.XSSFCategoryAxis; import org.apache.poi.xssf.usermodel.charts.XSSFChartAxis; import org.apache.poi.xssf.usermodel.charts.XSSFValueAxis; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.chart.CTAxDataSource; import org.openxmlformats.schemas.drawingml.x2006.chart.CTChart; import org.openxmlformats.schemas.drawingml.x2006.chart.CTLineChart; @@ -34,48 +34,48 @@ public void createWorkbook() throws Exception { final ExcelChart excelChart = new ExcelChartDefault("line chart", ChartType.line, CATEGORIES, VALUES); excelChart.configureSeriesTitle(Arrays.asList("foo", "bar")); final Workbook workbook = excelChart.createWorkbook(); - Assert.assertNotNull(workbook); + Assertions.assertNotNull(workbook); final Sheet sheet = workbook.getSheet(ChartType.line.toString()); - Assert.assertNotNull(sheet); + Assertions.assertNotNull(sheet); final XSSFDrawing drawing = (XSSFDrawing) sheet.getDrawingPatriarch(); final List charts = drawing.getCharts(); - Assert.assertEquals("number of charts", 1, charts.size()); + Assertions.assertEquals(1, charts.size(), "number of charts"); final XSSFChart chart = charts.get(0); - Assert.assertEquals("chart title", "line chart", chart.getTitleText().getString()); + Assertions.assertEquals("line chart", chart.getTitleText().getString(), "chart title"); final CTChart ctChart = chart.getCTChart(); - Assert.assertEquals("We should not have any area chart", 0, ctChart.getPlotArea().getAreaChartArray().length); - Assert.assertEquals("Check if we have 1 line chart", 1, ctChart.getPlotArea().getLineChartArray().length); - Assert.assertEquals("Check that we have a legend and that it's position is bottom", STLegendPos.B, - ctChart.getLegend().getLegendPos().getVal()); + Assertions.assertEquals(0, ctChart.getPlotArea().getAreaChartArray().length, "We should not have any area chart"); + Assertions.assertEquals(1, ctChart.getPlotArea().getLineChartArray().length, "Check if we have 1 line chart"); + Assertions.assertEquals(STLegendPos.B, ctChart.getLegend().getLegendPos().getVal(), + "Check that we have a legend and that it's position is bottom"); // check the actual chart data final CTLineChart ctLineChart = ctChart.getPlotArea().getLineChartArray()[0]; final CTLineSer[] ctLineSer = ctLineChart.getSerArray(); - Assert.assertEquals("Check number of CTLineSer", 2, ctLineSer.length); - Assert.assertEquals("check first series title", "foo", ctLineSer[0].getTx().getV()); - Assert.assertEquals("check second series title", "bar", ctLineSer[1].getTx().getV()); + Assertions.assertEquals(2, ctLineSer.length, "Check number of CTLineSer"); + Assertions.assertEquals("foo", ctLineSer[0].getTx().getV(), "check first series title"); + Assertions.assertEquals("bar", ctLineSer[1].getTx().getV(), "check second series title"); final CTAxDataSource cat1 = ctLineSer[0].getCat(); - Assert.assertEquals("check first category", "cat 1", cat1.getStrRef().getStrCache().getPtArray()[0].getV()); - Assert.assertEquals("check last category", "cat 5", cat1.getStrRef().getStrCache().getPtArray()[4].getV()); + Assertions.assertEquals("cat 1", cat1.getStrRef().getStrCache().getPtArray()[0].getV(), "check first category"); + Assertions.assertEquals("cat 5", cat1.getStrRef().getStrCache().getPtArray()[4].getV(), "check last category"); final CTAxDataSource cat2 = ctLineSer[1].getCat(); - Assert.assertEquals("check first category", "cat 1", cat2.getStrRef().getStrCache().getPtArray()[0].getV()); - Assert.assertEquals("check last category", "cat 5", cat2.getStrRef().getStrCache().getPtArray()[4].getV()); + Assertions.assertEquals("cat 1", cat2.getStrRef().getStrCache().getPtArray()[0].getV(), "check first category"); + Assertions.assertEquals("cat 5", cat2.getStrRef().getStrCache().getPtArray()[4].getV(), "check last category"); final CTNumDataSource val1 = ctLineSer[0].getVal(); - Assert.assertEquals("check first value", "5.0", val1.getNumRef().getNumCache().getPtArray()[0].getV()); - Assert.assertEquals("check last value", "6.0", val1.getNumRef().getNumCache().getPtArray()[4].getV()); + Assertions.assertEquals("5.0", val1.getNumRef().getNumCache().getPtArray()[0].getV(), "check first value"); + Assertions.assertEquals("6.0", val1.getNumRef().getNumCache().getPtArray()[4].getV(), "check last value"); final CTNumDataSource val2 = ctLineSer[1].getVal(); - Assert.assertEquals("check first value", "20.0", val2.getNumRef().getNumCache().getPtArray()[0].getV()); - Assert.assertEquals("check last value", "14.0", val2.getNumRef().getNumCache().getPtArray()[4].getV()); + Assertions.assertEquals("20.0", val2.getNumRef().getNumCache().getPtArray()[0].getV(), "check first value"); + Assertions.assertEquals("14.0", val2.getNumRef().getNumCache().getPtArray()[4].getV(), "check last value"); final List axis = chart.getAxis(); - Assert.assertEquals("number of axis", 2, axis.size()); - Assert.assertTrue("category axis", axis.get(0) instanceof XSSFCategoryAxis); - Assert.assertTrue("category axis", axis.get(1) instanceof XSSFValueAxis); + Assertions.assertEquals(2, axis.size(), "number of axis"); + Assertions.assertTrue(axis.get(0) instanceof XSSFCategoryAxis, "category axis"); + Assertions.assertTrue(axis.get(1) instanceof XSSFValueAxis, "category axis"); } } diff --git a/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartSheetDefaultTest.java b/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartSheetDefaultTest.java index 5d54a549..0e317f6d 100644 --- a/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartSheetDefaultTest.java +++ b/web/src/test/java/org/devgateway/toolkit/web/excelcharts/ExcelChartSheetDefaultTest.java @@ -1,15 +1,14 @@ package org.devgateway.toolkit.web.excelcharts; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Chart; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.charts.ChartDataSource; import org.apache.poi.xssf.usermodel.XSSFWorkbook; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -26,7 +25,7 @@ public class ExcelChartSheetDefaultTest { private Workbook workbook; - @Before + @BeforeEach public void setUp() { workbook = new XSSFWorkbook(); } @@ -41,10 +40,10 @@ public void writeCell() throws Exception { excelChartSheet.writeCell("text", row, 2); excelChartSheet.writeCell(1, row, 3); - Assert.assertEquals(CellType.BLANK, row.getCell(0).getCellTypeEnum()); - Assert.assertEquals("Yes", row.getCell(1).getStringCellValue()); - Assert.assertEquals(CellType.STRING, row.getCell(2).getCellTypeEnum()); - Assert.assertEquals(CellType.NUMERIC, row.getCell(3).getCellTypeEnum()); + Assertions.assertEquals(CellType.BLANK, row.getCell(0).getCellTypeEnum()); + Assertions.assertEquals("Yes", row.getCell(1).getStringCellValue()); + Assertions.assertEquals(CellType.STRING, row.getCell(2).getCellTypeEnum()); + Assertions.assertEquals(CellType.NUMERIC, row.getCell(3).getCellTypeEnum()); } @Test @@ -52,10 +51,10 @@ public void createRow() throws Exception { final ExcelChartSheet excelChartSheet = new ExcelChartSheetDefault(workbook, ChartType.area.toString()); Row row1 = excelChartSheet.createRow(); - Assert.assertNotNull("check row creation", row1); + Assertions.assertNotNull(row1, "check row creation"); Row row2 = excelChartSheet.createRow(2); - Assert.assertNotNull("check row creation", row2); + Assertions.assertNotNull(row2, "check row creation"); } @Test @@ -63,7 +62,7 @@ public void createChartAndLegend() throws Exception { final ExcelChartSheet excelChartSheet = new ExcelChartSheetDefault(workbook, ChartType.pie.toString()); Chart chart = excelChartSheet.createChartAndLegend(); - Assert.assertNotNull(chart); + Assertions.assertNotNull(chart); } @Test @@ -73,9 +72,9 @@ public void getCategoryChartDataSource() throws Exception { ChartDataSource categoryChartDataSource = excelChartSheet.getCategoryChartDataSource(); - Assert.assertEquals("check count of categories", 5, categoryChartDataSource.getPointCount()); - Assert.assertEquals("check first category", "cat 1", categoryChartDataSource.getPointAt(0)); - Assert.assertEquals("check last category", "cat 5", categoryChartDataSource.getPointAt(4)); + Assertions.assertEquals(5, categoryChartDataSource.getPointCount(), "check count of categories"); + Assertions.assertEquals("cat 1", categoryChartDataSource.getPointAt(0), "check first category"); + Assertions.assertEquals("cat 5", categoryChartDataSource.getPointAt(4), "check last category"); } @Test @@ -86,15 +85,15 @@ public void getValuesChartDataSource() throws Exception { List> valuesChartDataSource = excelChartSheet.getValuesChartDataSource(); - Assert.assertEquals("numbers of values data source", 2, valuesChartDataSource.size()); - Assert.assertEquals("check count of values", 5, valuesChartDataSource.get(0).getPointCount()); - Assert.assertEquals("check count of values", 5, valuesChartDataSource.get(1).getPointCount()); + Assertions.assertEquals(2, valuesChartDataSource.size(), "numbers of values data source"); + Assertions.assertEquals(5, valuesChartDataSource.get(0).getPointCount(), "check count of values"); + Assertions.assertEquals(5, valuesChartDataSource.get(1).getPointCount(), "check count of values"); - Assert.assertEquals("check first value", 5.0, valuesChartDataSource.get(0).getPointAt(0)); - Assert.assertEquals("check last value", 6.0, valuesChartDataSource.get(0).getPointAt(4)); + Assertions.assertEquals(5.0, valuesChartDataSource.get(0).getPointAt(0), "check first value"); + Assertions.assertEquals(6.0, valuesChartDataSource.get(0).getPointAt(4), "check last value"); - Assert.assertEquals("check first value", 20.0, valuesChartDataSource.get(1).getPointAt(0)); - Assert.assertEquals("check last value", 14.0, valuesChartDataSource.get(1).getPointAt(4)); + Assertions.assertEquals(20.0, valuesChartDataSource.get(1).getPointAt(0), "check first value"); + Assertions.assertEquals(14.0, valuesChartDataSource.get(1).getPointAt(4), "check last value"); } /**