Skip to content

Few more unit test fixes #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adoroszlai merged 4 commits into from
Feb 28, 2018
Merged

Few more unit test fixes #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3982b53
AMBARI-22854. Fix unit tests
adoroszlai Feb 27, 2018
3ad6958
AMBARI-22904. Fix (some) unit tests
adoroszlai Feb 27, 2018
f84d711
AMBARI-22244. Fix unit test
adoroszlai Feb 27, 2018
c771f62
AMBARI-22883. Fix +1 unit test
adoroszlai Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ public List<ServiceTestInvocation> getTestInvocations() throws Exception {

//getHosts
service = new TestHostService("clusterName", null);
m = service.getClass().getMethod("getHosts", String.class, HttpHeaders.class, UriInfo.class);
args = new Object[] {null, getHttpHeaders(), getUriInfo()};
m = service.getClass().getMethod("getHosts", String.class, HttpHeaders.class, UriInfo.class, String.class);
args = new Object[] {null, getHttpHeaders(), getUriInfo(), null};
listInvocations.add(new ServiceTestInvocation(Request.Type.GET, service, m, args, null));

//createHost
Expand Down
2 changes: 1 addition & 1 deletion ...ver/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6738,7 +6738,7 @@ public void testGetRepositories() throws Exception {
public void testGetStackServices() throws Exception {
StackServiceRequest request = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, null);
Set<StackServiceResponse> responses = controller.getStackServices(Collections.singleton(request));
Assert.assertEquals(12, responses.size());
Assert.assertEquals(13, responses.size());


StackServiceRequest requestWithParams = new StackServiceRequest(STACK_NAME, NEW_STACK_VERSION, SERVICE_NAME);
Expand Down
10 changes: 3 additions & 7 deletions ...src/test/java/org/apache/ambari/server/controller/internal/MpackResourceProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ public void testGetResourcesMpacks() throws Exception {
// replay
replay(m_dao);

ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type
);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, m_amc);

// create the request
Request request = PropertyHelper.getReadRequest();
Expand Down Expand Up @@ -182,8 +180,7 @@ public void testGetResourcesMpackId() throws Exception {
// replay
replay(m_dao,m_amc);

ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(
type);
ResourceProvider provider = AbstractControllerResourceProvider.getResourceProvider(type, m_amc);

// create the request
Request request = PropertyHelper.getReadRequest();
Expand Down Expand Up @@ -222,8 +219,7 @@ public void testCreateResources() throws Exception {
replay(m_amc,request);
// end expectations

MpackResourceProvider provider = (MpackResourceProvider) AbstractControllerResourceProvider.getResourceProvider(
Resource.Type.Mpack);
MpackResourceProvider provider = (MpackResourceProvider) AbstractControllerResourceProvider.getResourceProvider(Resource.Type.Mpack, m_amc);

AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
((ObservableResourceProvider)provider).addObserver(observer);
Expand Down
16 changes: 11 additions & 5 deletions ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.ambari.server.stack;

import static java.util.stream.Collectors.toCollection;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
Expand All @@ -39,6 +40,8 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;

import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.Role;
Expand Down Expand Up @@ -301,10 +304,11 @@ public void testStackVersionInheritance() {
assertNotNull(si);

//should include all stacks in hierarchy
assertEquals(18, services.size());
assertEquals(19, services.size());

HashSet<String> expectedServices = new HashSet<>();
Set<String> expectedServices = new TreeSet<>();
expectedServices.add("GANGLIA");
expectedServices.add("HADOOP_CLIENTS");
expectedServices.add("HBASE");
expectedServices.add("HCATALOG");
expectedServices.add("HDFS");
Expand All @@ -323,12 +327,13 @@ public void testStackVersionInheritance() {
expectedServices.add("SPARK3");
expectedServices.add("SYSTEMML");

assertEquals(expectedServices, services.stream().map(ServiceInfo::getName).collect(toCollection(TreeSet::new)));
ServiceInfo pigService = null;
for (ServiceInfo service : services) {
if (service.getName().equals("PIG")) {
pigService = service;
}
assertTrue(expectedServices.remove(service.getName()));
assertTrue(service.getName(), expectedServices.remove(service.getName()));
}
assertTrue(expectedServices.isEmpty());

Expand Down Expand Up @@ -524,7 +529,7 @@ public void testPackageInheritance() throws Exception{
public void testMonitoringServicePropertyInheritance() throws Exception{
StackInfo stack = stackManager.getStack("HDP", "2.0.8");
Collection<ServiceInfo> allServices = stack.getServices();
assertEquals(15, allServices.size());
assertEquals(16, allServices.size());

boolean monitoringServiceFound = false;

Expand All @@ -545,9 +550,10 @@ public void testServiceDeletion() {
StackInfo stack = stackManager.getStack("HDP", "2.0.6");
Collection<ServiceInfo> allServices = stack.getServices();

assertEquals(12, allServices.size());
assertEquals(13, allServices.size());
HashSet<String> expectedServices = new HashSet<>();
expectedServices.add("GANGLIA");
expectedServices.add("HADOOP_CLIENTS");
expectedServices.add("HBASE");
expectedServices.add("HCATALOG");
expectedServices.add("HDFS");
Expand Down
2 changes: 2 additions & 0 deletions ...i-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected void setUp() throws Exception {
List<ServiceComponentHost> serviceComponentHosts = new ArrayList<>();
ServiceComponentHost sch = EasyMock.createNiceMock(ServiceComponentHost.class);
expect(sch.getServiceName()).andReturn("HDFS").anyTimes();
expect(sch.getServiceType()).andReturn("HDFS").anyTimes();
expect(sch.getServiceComponentName()).andReturn("NAMENODE").anyTimes();
expect(sch.getHostName()).andReturn(HOSTNAME).anyTimes();
EasyMock.replay(sch);
Expand All @@ -111,6 +112,7 @@ protected void setUp() throws Exception {
// add HDFS/DN
sch = EasyMock.createNiceMock(ServiceComponentHost.class);
expect(sch.getServiceName()).andReturn("HDFS").anyTimes();
expect(sch.getServiceType()).andReturn("HDFS").anyTimes();
expect(sch.getServiceComponentName()).andReturn("DATANODE").anyTimes();
expect(sch.getHostName()).andReturn(HOSTNAME).anyTimes();
EasyMock.replay(sch);
Expand Down