From 76d1c3a8c590141300401dd9480ef81fbbf81beb Mon Sep 17 00:00:00 2001
From: fedoreno <fedoreno>
Date: Thu, 10 Mar 2016 10:41:32 +0000
Subject: [PATCH] SSDM-3284: fixed NPE in test-update and marked
SearchCriteriaToStringBuilde as ignored
SVN: 35866
---
.../1/as/webapps/openbis-v3-api-test/html/test/test-update.js | 4 +++-
.../ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
index f2958840b10..e84b0547f98 100644
--- a/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
+++ b/js-test/servers/common/core-plugins/tests/1/as/webapps/openbis-v3-api-test/html/test/test-update.js
@@ -13,7 +13,9 @@ define([ 'jquery', 'underscore', 'openbis', 'test/common' ], function($, _, open
return fUpdate(facade, permIds[0]).then(function() {
c.ok("Entity was updated");
return fFind(facade, permIds[0]).then(function(entity) {
- fCheck(entity);
+ if (fCheck) {
+ fCheck(entity);
+ }
c.finish();
});
});
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
index e5e09a80cee..609345d058b 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/report/V3APIReport.java
@@ -58,7 +58,8 @@ public class V3APIReport
};
private static final String[] IGNORE_CLASSES = {
- "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptionsToStringBuilder"
+ "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.fetchoptions.FetchOptionsToStringBuilder",
+ "ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.SearchCriteriaToStringBuilder"
};
@Test
--
GitLab