Repository: ambari Updated Branches: refs/heads/trunk 60dc24021 -> 911deb744
AMBARI-18575. Fix for improving time taken by 'ExecutionScheduleManagerTest' and 'UpgradeCatalog221Test' java tests. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/911deb74 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/911deb74 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/911deb74 Branch: refs/heads/trunk Commit: 911deb744485aa0366aad168c98566cf6381d4cc Parents: 60dc240 Author: Swapan Shridhar <sshrid...@hortonworks.com> Authored: Tue Oct 11 16:09:00 2016 -0700 Committer: Swapan Shridhar <sshrid...@hortonworks.com> Committed: Wed Oct 12 13:08:48 2016 -0700 ---------------------------------------------------------------------- .../scheduler/ExecutionScheduleManagerTest.java | 90 ++++++++++---------- .../server/upgrade/UpgradeCatalog221Test.java | 42 +++++---- 2 files changed, 69 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/911deb74/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java index f2fe3b8..0179486 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java @@ -17,26 +17,16 @@ */ package org.apache.ambari.server.scheduler; -import static org.easymock.EasyMock.anyObject; -import static org.easymock.EasyMock.capture; -import static org.easymock.EasyMock.createMock; -import static org.easymock.EasyMock.createMockBuilder; -import static org.easymock.EasyMock.createNiceMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.expectLastCall; -import static org.easymock.EasyMock.replay; -import static org.easymock.EasyMock.verify; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; - -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.google.gson.Gson; +import com.google.inject.Binder; +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Module; +import com.google.inject.persist.PersistService; +import com.google.inject.persist.Transactional; +import com.google.inject.util.Modules; +import junit.framework.Assert; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionDBAccessor; import org.apache.ambari.server.actionmanager.HostRoleStatus; @@ -58,8 +48,8 @@ import org.apache.ambari.server.state.scheduler.RequestExecutionFactory; import org.apache.ambari.server.state.scheduler.Schedule; import org.easymock.Capture; import org.easymock.EasyMock; -import org.junit.After; -import org.junit.Before; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import org.quartz.CronTrigger; import org.quartz.JobDataMap; @@ -76,34 +66,42 @@ import org.quartz.impl.matchers.GroupMatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.Gson; -import com.google.inject.Binder; -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Module; -import com.google.inject.persist.PersistService; -import com.google.inject.persist.Transactional; -import com.google.inject.util.Modules; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import junit.framework.Assert; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.createMockBuilder; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThat; public class ExecutionScheduleManagerTest { - private Clusters clusters; - private Cluster cluster; - private String clusterName; - private Injector injector; - private AmbariMetaInfo metaInfo; - private ExecutionScheduleManager executionScheduleManager; - private RequestExecutionFactory requestExecutionFactory; - private ExecutionScheduler executionScheduler; - private Scheduler scheduler; + private static Clusters clusters; + private static Cluster cluster; + private static String clusterName; + private static Injector injector; + private static AmbariMetaInfo metaInfo; + private static ExecutionScheduleManager executionScheduleManager; + private static RequestExecutionFactory requestExecutionFactory; + private static ExecutionScheduler executionScheduler; + private static Scheduler scheduler; private static final Logger LOG = LoggerFactory.getLogger(ExecutionScheduleManagerTest.class); - @Before - public void setup() throws Exception { + @BeforeClass + public static void setup() throws Exception { InMemoryDefaultTestModule defaultTestModule = new InMemoryDefaultTestModule(); injector = Guice.createInjector(Modules.override(defaultTestModule) .with(new ExecutionSchedulerTestModule())); @@ -128,8 +126,8 @@ public class ExecutionScheduleManagerTest { executionScheduleManager.start(); } - @After - public void teardown() throws Exception { + @AfterClass + public static void teardown() throws Exception { executionScheduleManager.stop(); injector.getInstance(PersistService.class).stop(); } @@ -154,7 +152,7 @@ public class ExecutionScheduleManagerTest { } } - public class ExecutionSchedulerTestModule implements Module { + public static class ExecutionSchedulerTestModule implements Module { @Override public void configure(Binder binder) { binder.bind(ExecutionScheduler.class).to(TestExecutionScheduler.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/911deb74/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java index e754a41..4663c6c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java @@ -33,10 +33,10 @@ import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.actionmanager.ActionManager; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.controller.AmbariManagementController; -import org.apache.ambari.server.orm.DBAccessor; import org.apache.ambari.server.controller.AmbariManagementControllerImpl; import org.apache.ambari.server.controller.KerberosHelper; import org.apache.ambari.server.controller.MaintenanceStateHelper; +import org.apache.ambari.server.orm.DBAccessor; import org.apache.ambari.server.orm.GuiceJpaInitializer; import org.apache.ambari.server.orm.InMemoryDefaultTestModule; import org.apache.ambari.server.orm.dao.AlertDefinitionDAO; @@ -46,39 +46,47 @@ import org.apache.ambari.server.orm.entities.StackEntity; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.Config; -import org.apache.ambari.server.state.RepositoryInfo; import org.apache.ambari.server.state.StackId; -import org.apache.ambari.server.state.StackInfo; import org.apache.ambari.server.state.stack.OsFamily; import org.easymock.Capture; import org.easymock.EasyMock; import org.easymock.EasyMockSupport; -import org.junit.After; -import org.junit.Before; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; import javax.persistence.EntityManager; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.anyString; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createMockBuilder; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; public class UpgradeCatalog221Test { - private Injector injector; - private Provider<EntityManager> entityManagerProvider = createStrictMock(Provider.class); - private EntityManager entityManager = createNiceMock(EntityManager.class); - private UpgradeCatalogHelper upgradeCatalogHelper; - private StackEntity desiredStackEntity; - - @Before - public void init() { + private static Injector injector; + private static Provider<EntityManager> entityManagerProvider = createStrictMock(Provider.class); + private static EntityManager entityManager = createNiceMock(EntityManager.class); + private static UpgradeCatalogHelper upgradeCatalogHelper; + private static StackEntity desiredStackEntity; + + @BeforeClass + public static void init() { reset(entityManagerProvider); expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes(); replay(entityManagerProvider); @@ -93,8 +101,8 @@ public class UpgradeCatalog221Test { desiredStackEntity = stackDAO.find("HDP", "2.2.0"); } - @After - public void tearDown() { + @AfterClass + public static void tearDown() { injector.getInstance(PersistService.class).stop(); }
