Repository: ambari Updated Branches: refs/heads/branch-1.7.0 d22559192 -> f445174e1
AMBARI-7774 - AmbariManagementControllerTest Is Failing In branch-1.7.0 (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f445174e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f445174e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f445174e Branch: refs/heads/branch-1.7.0 Commit: f445174e18b8e5f86fd435a3d647fffe8274875c Parents: d225591 Author: Jonathan Hurley <[email protected]> Authored: Fri Oct 10 13:56:15 2014 -0400 Committer: Jonathan Hurley <[email protected]> Committed: Tue Oct 14 10:54:07 2014 -0400 ---------------------------------------------------------------------- .../AmbariManagementControllerTest.java | 131 ++++++++++++++----- 1 file changed, 101 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f445174e/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java index d26ca5b..bbf3807 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java @@ -18,19 +18,68 @@ package org.apache.ambari.server.controller; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.persist.PersistService; +import static org.easymock.EasyMock.capture; +import static org.easymock.EasyMock.createNiceMock; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Type; +import java.net.ConnectException; +import java.net.MalformedURLException; +import java.net.UnknownHostException; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + +import javax.persistence.EntityManager; + import junit.framework.Assert; -import org.apache.ambari.server.*; -import org.apache.ambari.server.actionmanager.*; + +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.ClusterNotFoundException; +import org.apache.ambari.server.DuplicateResourceException; +import org.apache.ambari.server.HostNotFoundException; +import org.apache.ambari.server.ObjectNotFoundException; +import org.apache.ambari.server.ParentObjectNotFoundException; +import org.apache.ambari.server.Role; +import org.apache.ambari.server.RoleCommand; +import org.apache.ambari.server.ServiceNotFoundException; +import org.apache.ambari.server.StackAccessException; +import org.apache.ambari.server.actionmanager.ActionDBAccessor; +import org.apache.ambari.server.actionmanager.ActionType; +import org.apache.ambari.server.actionmanager.ExecutionCommandWrapper; +import org.apache.ambari.server.actionmanager.HostRoleCommand; +import org.apache.ambari.server.actionmanager.HostRoleStatus; +import org.apache.ambari.server.actionmanager.Request; +import org.apache.ambari.server.actionmanager.Stage; +import org.apache.ambari.server.actionmanager.TargetHostType; import org.apache.ambari.server.agent.ExecutionCommand; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.controller.internal.*; +import org.apache.ambari.server.controller.internal.ComponentResourceProviderTest; +import org.apache.ambari.server.controller.internal.HostResourceProviderTest; +import org.apache.ambari.server.controller.internal.RequestOperationLevel; +import org.apache.ambari.server.controller.internal.RequestResourceFilter; +import org.apache.ambari.server.controller.internal.ServiceResourceProviderTest; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.customactions.ActionDefinition; import org.apache.ambari.server.metadata.ActionMetadata; @@ -43,31 +92,52 @@ import org.apache.ambari.server.security.authorization.Users; import org.apache.ambari.server.serveraction.ServerAction; import org.apache.ambari.server.serveraction.ServerActionManager; import org.apache.ambari.server.serveraction.ServerActionManagerImpl; -import org.apache.ambari.server.state.*; +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.ConfigFactory; +import org.apache.ambari.server.state.ConfigHelper; +import org.apache.ambari.server.state.ConfigImpl; +import org.apache.ambari.server.state.Host; +import org.apache.ambari.server.state.HostComponentAdminState; +import org.apache.ambari.server.state.HostState; +import org.apache.ambari.server.state.MaintenanceState; +import org.apache.ambari.server.state.RepositoryInfo; +import org.apache.ambari.server.state.Service; +import org.apache.ambari.server.state.ServiceComponent; +import org.apache.ambari.server.state.ServiceComponentFactory; +import org.apache.ambari.server.state.ServiceComponentHost; +import org.apache.ambari.server.state.ServiceComponentHostFactory; +import org.apache.ambari.server.state.ServiceFactory; +import org.apache.ambari.server.state.StackId; +import org.apache.ambari.server.state.StackInfo; +import org.apache.ambari.server.state.State; import org.apache.ambari.server.state.configgroup.ConfigGroup; import org.apache.ambari.server.state.configgroup.ConfigGroupFactory; -import org.apache.ambari.server.state.svccomphost.*; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpSucceededEvent; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartedEvent; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStopEvent; +import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStoppedEvent; import org.apache.ambari.server.utils.StageUtils; import org.apache.commons.collections.CollectionUtils; import org.easymock.Capture; -import org.junit.*; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; import org.junit.rules.ExpectedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.EntityManager; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.lang.reflect.Type; -import java.net.ConnectException; -import java.net.MalformedURLException; -import java.net.UnknownHostException; -import java.text.MessageFormat; -import java.util.*; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.persist.PersistService; public class AmbariManagementControllerTest { @@ -3059,7 +3129,7 @@ public class AmbariManagementControllerTest { Assert.assertNull(stage1.getExecutionCommandWrapper(host2, "DATANODE")); Assert.assertNotNull(stage3.getExecutionCommandWrapper(host1, "HBASE_SERVICE_CHECK")); Assert.assertNotNull(stage2.getExecutionCommandWrapper(host2, "HDFS_SERVICE_CHECK")); - + Type type = new TypeToken<Map<String, String>>() {}.getType(); @@ -6442,7 +6512,7 @@ public class AmbariManagementControllerTest { } } } - + Type type = new TypeToken<Map<String, String>>(){}.getType(); for (Stage stage : actionDB.getAllStages(requestId)){ Map<String, String> hostParamsStage = StageUtils.getGson().fromJson(stage.getHostParamsStage(), type); @@ -8159,10 +8229,10 @@ public class AmbariManagementControllerTest { @Test public void testUpdateRepoUrlController() throws Exception { + String badUrl = "http://hortonworks.com";; RepositoryInfo repo = ambariMetaInfo.getRepository(STACK_NAME, STACK_VERSION, OS_TYPE, REPO_ID); - RepositoryRequest request = new RepositoryRequest(STACK_NAME, STACK_VERSION, OS_TYPE, REPO_ID); - request.setBaseUrl("http://hortonworks.com";); + request.setBaseUrl(badUrl); Set<RepositoryRequest> requests = new HashSet<RepositoryRequest>(); requests.add(request); @@ -8170,9 +8240,10 @@ public class AmbariManagementControllerTest { // test bad url try { controller.updateRespositories(requests); + Assert.fail("Expected a bad URL to throw an exception"); } catch (Exception e) { assertNotNull(e); - Assert.assertTrue(e.getMessage().contains(FileNotFoundException.class.getName())); + Assert.assertTrue(e.getMessage().contains(badUrl)); } // test bad url, but allow to set anyway request.setVerifyBaseUrl(false);
