Repository: metron Updated Branches: refs/heads/master 73dc16e7a -> f2a5e5695
METRON-1113 UpdateControllerIntegrationTest fails with 500 error (merrimanr) closes apache/metron#701 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/f2a5e569 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/f2a5e569 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/f2a5e569 Branch: refs/heads/master Commit: f2a5e5695c3a90b1406a0ee37fdc2fb7944177ca Parents: 73dc16e Author: merrimanr <merrim...@gmail.com> Authored: Thu Aug 17 09:21:55 2017 -0500 Committer: merrimanr <merrim...@apache.org> Committed: Thu Aug 17 09:21:55 2017 -0500 ---------------------------------------------------------------------- .../java/org/apache/metron/rest/config/TestConfig.java | 11 +++++------ .../rest/controller/SearchControllerIntegrationTest.java | 6 ------ .../rest/controller/UpdateControllerIntegrationTest.java | 7 ------- 3 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/f2a5e569/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestConfig.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestConfig.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestConfig.java index 9c75f2f..e9bb510 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestConfig.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/config/TestConfig.java @@ -22,13 +22,12 @@ import kafka.utils.ZKStringSerializer$; import kafka.utils.ZkUtils; import org.I0Itec.zkclient.ZkClient; import org.apache.commons.io.IOUtils; -import org.apache.curator.CuratorZookeeperClient; import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; -import org.apache.metron.TestConstants; import org.apache.metron.common.configuration.ConfigurationsUtils; +import org.apache.metron.hbase.mock.MockHBaseTableProvider; import org.apache.metron.integration.ComponentRunner; import org.apache.metron.integration.UnableToStartException; import org.apache.metron.integration.components.KafkaComponent; @@ -36,7 +35,6 @@ import org.apache.metron.integration.components.ZKServerComponent; import org.apache.metron.rest.mock.MockStormCLIClientWrapper; import org.apache.metron.rest.mock.MockStormRestTemplate; import org.apache.metron.rest.service.impl.StormCLIWrapper; -import org.apache.zookeeper.KeeperException; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; @@ -47,19 +45,20 @@ import org.springframework.web.client.RestTemplate; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; -import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import java.util.concurrent.atomic.AtomicBoolean; -import static org.apache.metron.common.configuration.ConfigurationsUtils.getClient; import static org.apache.metron.rest.MetronRestConstants.TEST_PROFILE; @Configuration @Profile(TEST_PROFILE) public class TestConfig { + static { + MockHBaseTableProvider.addToCache("updates", "t"); + } + @Bean public Properties zkProperties() { return new Properties(); http://git-wip-us.apache.org/repos/asf/metron/blob/f2a5e569/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java index 1c5310b..e75c356 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/SearchControllerIntegrationTest.java @@ -17,7 +17,6 @@ */ package org.apache.metron.rest.controller; -import org.apache.metron.hbase.mock.MockHBaseTableProvider; import org.apache.metron.indexing.dao.InMemoryDao; import org.apache.metron.indexing.dao.SearchIntegrationTest; import org.apache.metron.indexing.dao.search.FieldType; @@ -70,11 +69,6 @@ public class SearchControllerIntegrationTest extends DaoControllerTest { private String user = "user"; private String password = "password"; - @BeforeClass - public static void setupHbase() { - MockHBaseTableProvider.addToCache("updates", "t"); - } - @Before public void setup() throws Exception { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).apply(springSecurity()).build(); http://git-wip-us.apache.org/repos/asf/metron/blob/f2a5e569/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java index 0d7fde7..8955980 100644 --- a/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java +++ b/metron-interface/metron-rest/src/test/java/org/apache/metron/rest/controller/UpdateControllerIntegrationTest.java @@ -26,7 +26,6 @@ import org.apache.metron.hbase.mock.MockHBaseTableProvider; import org.apache.metron.rest.service.UpdateService; import org.junit.Assert; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -112,12 +111,6 @@ public class UpdateControllerIntegrationTest extends DaoControllerTest { @Multiline public static String replace; - - @BeforeClass - public static void setupHbase() { - MockHBaseTableProvider.addToCache(TABLE, CF); - } - @Before public void setup() throws Exception { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).apply(springSecurity()).build();
