From 2b23a1d0486d47dd1dfd35054429896a0da02500 Mon Sep 17 00:00:00 2001 From: Benjamin Gamard Date: Tue, 27 Feb 2018 20:17:09 +0100 Subject: [PATCH] #180: fix tests --- .../src/main/resources/db/update/dbupdate-017-0.sql | 2 +- .../main/webapp/src/partial/docs/settings.inbox.html | 2 +- .../java/com/sismics/docs/rest/TestAppResource.java | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs-core/src/main/resources/db/update/dbupdate-017-0.sql b/docs-core/src/main/resources/db/update/dbupdate-017-0.sql index 06b83121..967925bf 100644 --- a/docs-core/src/main/resources/db/update/dbupdate-017-0.sql +++ b/docs-core/src/main/resources/db/update/dbupdate-017-0.sql @@ -1,6 +1,6 @@ insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_ENABLED', 'false'); insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_HOSTNAME', ''); -insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_PORT', ''); +insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_PORT', '993'); insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_USERNAME', ''); insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_PASSWORD', ''); insert into T_CONFIG(CFG_ID_C, CFG_VALUE_C) values('INBOX_TAG', ''); diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.inbox.html b/docs-web/src/main/webapp/src/partial/docs/settings.inbox.html index 3117e59a..75e01924 100644 --- a/docs-web/src/main/webapp/src/partial/docs/settings.inbox.html +++ b/docs-web/src/main/webapp/src/partial/docs/settings.inbox.html @@ -71,6 +71,6 @@ -
{{ testResult.count >= 0 ? 'settings.inbox.test_success' : 'settings.inbox.test_fail' | translate: { count: testResult.count } }}
\ No newline at end of file diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestAppResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestAppResource.java index 8688aae8..c25a3649 100644 --- a/docs-web/src/test/java/com/sismics/docs/rest/TestAppResource.java +++ b/docs-web/src/test/java/com/sismics/docs/rest/TestAppResource.java @@ -244,11 +244,11 @@ public class TestAppResource extends BaseJerseyTest { .cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken) .get(JsonObject.class); Assert.assertFalse(json.getBoolean("enabled")); - Assert.assertTrue(json.isNull("hostname")); - Assert.assertTrue(json.isNull("port")); - Assert.assertTrue(json.isNull("username")); - Assert.assertTrue(json.isNull("password")); - Assert.assertTrue(json.isNull("tag")); + Assert.assertEquals("", json.getString("hostname")); + Assert.assertEquals(993, json.getJsonNumber("port").intValue()); + Assert.assertEquals("", json.getString("username")); + Assert.assertEquals("", json.getString("password")); + Assert.assertEquals("", json.getString("tag")); JsonObject lastSync = json.getJsonObject("last_sync"); Assert.assertTrue(lastSync.isNull("date")); Assert.assertTrue(lastSync.isNull("error"));