Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
34675105
by Tony Chemit at 2018-07-29T16:15:13Z
2 changed files:
- pom.xml
- services-local/src/test/java/fr/ird/observe/services/local/service/actions/report/AbstractReportServiceLocalTest.java
Changes:
| ... | ... | @@ -153,7 +153,7 @@ |
| 153 | 153 |
<buildDate>${maven.build.timestamp}</buildDate>
|
| 154 | 154 |
|
| 155 | 155 |
<observeToolkitVersion>3.7.3</observeToolkitVersion>
|
| 156 |
- <!--<lib.version.java4all.jaxx>3.0-alpha-33-SNAPSHOT</lib.version.java4all.jaxx>-->
|
|
| 156 |
+ <lib.version.java4all.jaxx>3.0-alpha-34-SNAPSHOT</lib.version.java4all.jaxx>
|
|
| 157 | 157 |
<lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
|
| 158 | 158 |
<!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
|
| 159 | 159 |
<xworkVersion>2.3.34</xworkVersion>
|
| ... | ... | @@ -228,6 +228,14 @@ public abstract class AbstractReportServiceLocalTest extends ServiceLocalTestSup |
| 228 | 228 |
|
| 229 | 229 |
protected void assertResultRow(DataMatrix result, int rowId, Object... row) {
|
| 230 | 230 |
Object[] actualRow = result.getData()[rowId];
|
| 231 |
- Assert.assertArrayEquals(row, actualRow);
|
|
| 231 |
+ int index=0;
|
|
| 232 |
+ for (Object o : actualRow) {
|
|
| 233 |
+ if (o==null) {
|
|
| 234 |
+ Assert.assertEquals(row[index++], o);
|
|
| 235 |
+ }else {
|
|
| 236 |
+ Assert.assertArrayEquals(row[index++].toString().split("\\s*\\n\\s*"),o.toString().split("\\s*\\n\\s*"));
|
|
| 237 |
+ }
|
|
| 238 |
+ }
|
|
| 239 |
+ //Assert.assertArrayEquals(row, actualRow);
|
|
| 232 | 240 |
}
|
| 233 | 241 |
}
|