KYLIN-1664 Revert the incorrect change.
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b00661d9 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b00661d9 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b00661d9 Branch: refs/heads/sync Commit: b00661d9b6888a28c63deec1b6b76109b6454e7b Parents: 3116abf Author: tttMelody <245915...@qq.com> Authored: Mon Jan 15 15:05:27 2018 +0800 Committer: Li Yang <liy...@apache.org> Committed: Fri Jan 26 18:54:01 2018 +0800 ---------------------------------------------------------------------- .../kylin/rest/service/AdminServiceTest.java | 35 +++++++++++++------- 1 file changed, 23 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b00661d9/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java ---------------------------------------------------------------------- diff --git a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java index 3ee14e0..ce46536 100644 --- a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java +++ b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java @@ -46,17 +46,28 @@ public class AdminServiceTest extends ServiceTestBase { String path = Thread.currentThread().getContextClassLoader().getResource("kylin.properties").getPath(); KylinConfig.setKylinConfigThreadLocal(KylinConfig.createInstanceFromUri(path)); - String publicConfig = adminService.getPublicConfig(); - - Assert.assertFalse(publicConfig.contains("kylin.metadata.data-model-manager-impl")); - Assert.assertFalse(publicConfig.contains("kylin.dictionary.use-forest-trie")); - Assert.assertFalse(publicConfig.contains("kylin.cube.segment-advisor")); - Assert.assertFalse(publicConfig.contains("kylin.job.use-remote-cli")); - Assert.assertFalse(publicConfig.contains("kylin.job.scheduler.provider")); - Assert.assertFalse(publicConfig.contains("kylin.engine.mr.job-jar")); - Assert.assertFalse(publicConfig.contains("kylin.engine.spark.sanity-check-enabled")); - Assert.assertFalse(publicConfig.contains("kylin.storage.provider")); - Assert.assertFalse(publicConfig.contains("kylin.query.convert-create-table-to-with")); - Assert.assertFalse(publicConfig.contains("kylin.server.init-tasks")); + String expected = "kylin.web.link-streaming-guide=http://kylin.apache.org/\n"; + + "kylin.web.contact-mail=\n" + + "kylin.query.cache-enabled=true\n" + + "kylin.web.link-diagnostic=\n" + + "kylin.web.help.length=4\n" + + "kylin.web.timezone=GMT+8\n" + + "kylin.server.external-acl-provider=\n" + + "kylin.storage.default=2\n" + + "kylin.web.help=\n" + + "kylin.web.export-allow-other=true\n" + + "kylin.web.link-hadoop=\n" + + "kylin.web.hide-measures=RAW\n" + + "kylin.htrace.show-gui-trace-toggle=false\n" + + "kylin.web.export-allow-admin=true\n" + + "kylin.env=QA\n" + + "kylin.web.hive-limit=20\n" + + "kylin.engine.default=2\n" + + "kylin.web.help.3=onboard|Cube Design Tutorial|\n" + + "kylin.web.help.2=tableau|Tableau Guide|\n" + + "kylin.web.help.1=odbc|ODBC Driver|\n" + + "kylin.web.help.0=start|Getting Started|\n" + + "kylin.security.profile=testing\n"; + Assert.assertEquals(expected, adminService.getPublicConfig()); } }
