Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 34675105 by Tony Chemit at 2018-07-29T16:15:13Z Make jaxx works again on windows :( - Closes #696 - - - - - 2 changed files: - pom.xml - services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java Changes: ===================================== pom.xml ===================================== @@ -153,7 +153,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>3.7.3</observeToolkitVersion> - <!--<lib.version.java4all.jaxx>3.0-alpha-33-SNAPSHOT</lib.version.java4all.jaxx>--> + <lib.version.java4all.jaxx>3.0-alpha-34-SNAPSHOT</lib.version.java4all.jaxx> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> <xworkVersion>2.3.34</xworkVersion> ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java ===================================== @@ -228,6 +228,14 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup protected void assertResultRow(DataMatrix result, int rowId, Object... row) { Object[] actualRow = result.getData()[rowId]; - Assert.assertArrayEquals(row, actualRow); + int index=0; + for (Object o : actualRow) { + if (o==null) { + Assert.assertEquals(row[index++], o); + }else { + Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"),o.toString().split("\\s*\\n\\s*")); + } + } + //Assert.assertArrayEquals(row, actualRow); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/346751051f38117b164b5fd1097f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/346751051f38117b164b5fd1097f... You're receiving this email because of your account on gitlab.com.