You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by js...@apache.org on 2013/03/19 21:20:28 UTC
svn commit: r1458497 [4/4] - in /incubator/ambari/trunk: ./
ambari-server/src/main/java/org/apache/ambari/server/actionmanager/
ambari-server/src/main/java/org/apache/ambari/server/api/handlers/
ambari-server/src/main/java/org/apache/ambari/server/api/...
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -28,18 +28,15 @@ import org.apache.ambari.server.controll
import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.easymock.EasyMock;
+import org.easymock.*;
import org.junit.Assert;
import org.junit.Test;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
@@ -82,7 +79,7 @@ public class ComponentResourceProviderTe
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -149,6 +146,9 @@ public class ComponentResourceProviderTe
AmbariManagementController managementController = createMock(AmbariManagementController.class);
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+ Map<String, String> mapRequestProps = new HashMap<String, String>();
+ mapRequestProps.put("context", "Called from a test");
+
Set<ServiceComponentResponse> nameResponse = new HashSet<ServiceComponentResponse>();
nameResponse.add(new ServiceComponentResponse(102L, "Cluster102", "Service", "Component", null, "1", "STARTED"));
@@ -157,7 +157,7 @@ public class ComponentResourceProviderTe
andReturn(nameResponse).once();
expect(managementController.updateComponents(
AbstractResourceProviderTest.Matcher.getComponentRequestSet(
- "Cluster102", "Service", "Component", null, "STARTED"))).andReturn(response).once();
+ "Cluster102", "Service", "Component", null, "STARTED"), eq(mapRequestProps))).andReturn(response).once();
// replay
replay(managementController, response);
@@ -173,7 +173,7 @@ public class ComponentResourceProviderTe
properties.put(ComponentResourceProvider.COMPONENT_STATE_PROPERTY_ID, "STARTED");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps);
// update the cluster named Cluster102
Predicate predicate = new PredicateBuilder().property(ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID).
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -71,7 +71,7 @@ public class ConfigurationResourceProvid
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -224,7 +224,7 @@ public class ConfigurationResourceProvid
Map<String, Object> properties = new LinkedHashMap<String, Object>();
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(
ConfigurationResourceProvider.CONFIGURATION_CONFIG_TAG_PROPERTY_ID).equals("Configuration100").toPredicate();
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -29,12 +29,7 @@ import org.apache.ambari.server.controll
import org.junit.Assert;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
@@ -68,7 +63,7 @@ public class FeedResourceProviderTest {
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
FeedResourceProvider provider = new FeedResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
@@ -109,7 +104,7 @@ public class FeedResourceProviderTest {
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
FeedResourceProvider provider = new FeedResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
@@ -155,7 +150,7 @@ public class FeedResourceProviderTest {
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
FeedResourceProvider provider = new FeedResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRFeed),
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -45,6 +45,7 @@ import org.apache.ambari.server.Role;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
@@ -88,7 +89,7 @@ public class HostComponentResourceProvid
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -236,6 +237,9 @@ public class HostComponentResourceProvid
AmbariManagementController managementController = createMock(AmbariManagementController.class);
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+ Map<String, String> mapRequestProps = new HashMap<String, String>();
+ mapRequestProps.put("context", "Called from a test");
+
Set<ServiceComponentHostResponse> nameResponse = new HashSet<ServiceComponentHostResponse>();
nameResponse.add(new ServiceComponentHostResponse(
"Cluster102", "Service100", "Component100", "Host100", null, null, "STARTED", "", "", ""));
@@ -245,7 +249,8 @@ public class HostComponentResourceProvid
EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(nameResponse).once();
expect(managementController.updateHostComponents(
AbstractResourceProviderTest.Matcher.getHostComponentRequestSet(
- "Cluster102", null, "Component100", "Host100", null, "STARTED"))).andReturn(response).once();
+ "Cluster102", null, "Component100", "Host100", null, "STARTED"),
+ eq(mapRequestProps))).andReturn(response).once();
// replay
replay(managementController, response);
@@ -261,7 +266,7 @@ public class HostComponentResourceProvid
properties.put(HostComponentResourceProvider.HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps);
// update the cluster named Cluster102
Predicate predicate = new PredicateBuilder().property(
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -80,7 +80,7 @@ public class HostResourceProviderTest {
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -184,7 +184,7 @@ public class HostResourceProviderTest {
properties.put(PropertyHelper.getPropertyId("Hosts.desired_config.properties", "x"), "y");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID).
equals("Cluster100").
@@ -236,7 +236,7 @@ public class HostResourceProviderTest {
properties.put(HostResourceProvider.HOST_RACK_INFO_PROPERTY_ID, "rack info");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(HostResourceProvider.HOST_CLUSTER_NAME_PROPERTY_ID).
equals("Cluster100").
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -59,7 +59,7 @@ public class InstanceResourceProviderTes
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
InstanceResourceProvider provider = new InstanceResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
@@ -104,7 +104,7 @@ public class InstanceResourceProviderTes
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
InstanceResourceProvider provider = new InstanceResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
@@ -145,7 +145,7 @@ public class InstanceResourceProviderTes
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
InstanceResourceProvider provider = new InstanceResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRInstance),
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/JMXHostProviderTest.java Tue Mar 19 20:20:27 2013
@@ -29,7 +29,6 @@ import org.apache.ambari.server.orm.InMe
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.State;
-import org.apache.ambari.server.state.cluster.ClusterImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -110,6 +109,9 @@ public class JMXHostProviderTest {
String componentName2 = "DATANODE";
String componentName3 = "HDFS_CLIENT";
+ Map<String, String> mapRequestProps = new HashMap<String, String>();
+ mapRequestProps.put("context", "Called from a test");
+
createServiceComponent(clusterName, serviceName, componentName1,
State.INIT);
createServiceComponent(clusterName, serviceName, componentName2,
@@ -152,7 +154,7 @@ public class JMXHostProviderTest {
configVersions.put("hdfs-site", "version1");
sReqs.add(new ServiceRequest(clusterName, serviceName, configVersions,
null));
- controller.updateServices(sReqs);
+ controller.updateServices(sReqs, mapRequestProps);
}
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -72,7 +72,7 @@ public class RequestResourceProviderTest
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
try {
provider.createResources(request);
@@ -145,7 +145,7 @@ public class RequestResourceProviderTest
Map<String, Object> properties = new LinkedHashMap<String, Object>();
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(RequestResourceProvider.REQUEST_ID_PROPERTY_ID).
equals("Request100").toPredicate();
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -28,7 +28,7 @@ import org.apache.ambari.server.controll
import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.easymock.EasyMock;
+import org.easymock.*;
import org.junit.Assert;
import org.junit.Test;
@@ -40,10 +40,14 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNull;
+import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.verify;
/**
@@ -83,7 +87,7 @@ public class ServiceResourceProviderTest
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -183,9 +187,14 @@ public class ServiceResourceProviderTest
AmbariManagementController managementController = createMock(AmbariManagementController.class);
RequestStatusResponse response = createNiceMock(RequestStatusResponse.class);
+ Capture<Set<ServiceRequest>> requestsCapture = new Capture<Set<ServiceRequest>>();
+
+ Map<String, String> mapRequestProps = new HashMap<String, String>();
+ mapRequestProps.put("context", "Called from a test");
// set expectations
- expect(managementController.updateServices(EasyMock.<Set<ServiceRequest>>anyObject())).andReturn(response).once();
+ expect(managementController.updateServices(capture(requestsCapture),
+ eq(mapRequestProps))).andReturn(response).once();
// replay
replay(managementController, response);
@@ -202,7 +211,7 @@ public class ServiceResourceProviderTest
properties.put(ServiceResourceProvider.SERVICE_SERVICE_STATE_PROPERTY_ID, "DEPLOYED");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, mapRequestProps);
// update the service named Service102
Predicate predicate = new PredicateBuilder().property(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").
@@ -211,6 +220,14 @@ public class ServiceResourceProviderTest
// verify
verify(managementController, response);
+
+ Set<ServiceRequest> setRequests = requestsCapture.getValue();
+ assertEquals(1, setRequests.size());
+ ServiceRequest sr = setRequests.iterator().next();
+ assertEquals("Cluster100", sr.getClusterName());
+ assertEquals("Service102", sr.getServiceName());
+ assertEquals("DEPLOYED", sr.getDesiredState());
+ assertNull(sr.getConfigVersions());
}
@Test
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -68,7 +68,7 @@ public class TargetClusterResourceProvid
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster),
@@ -112,7 +112,7 @@ public class TargetClusterResourceProvid
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster),
@@ -158,7 +158,7 @@ public class TargetClusterResourceProvid
propertySet.add(properties);
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, Collections.<String,String>emptyMap());
TargetClusterResourceProvider provider = new TargetClusterResourceProvider(service,
PropertyHelper.getPropertyIds(Resource.Type.DRTargetCluster),
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -74,7 +74,7 @@ public class TaskResourceProviderTest {
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
try {
provider.createResources(request);
@@ -149,7 +149,7 @@ public class TaskResourceProviderTest {
Map<String, Object> properties = new LinkedHashMap<String, Object>();
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(TaskResourceProvider.TASK_ID_PROPERTY_ID).equals("Task100").
toPredicate();
Modified: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java?rev=1458497&r1=1458496&r2=1458497&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java (original)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java Tue Mar 19 20:20:27 2013
@@ -77,7 +77,7 @@ public class UserResourceProviderTest {
propertySet.add(properties);
// create the request
- Request request = PropertyHelper.getCreateRequest(propertySet);
+ Request request = PropertyHelper.getCreateRequest(propertySet, null);
provider.createResources(request);
@@ -152,7 +152,7 @@ public class UserResourceProviderTest {
properties.put(UserResourceProvider.USER_PASSWORD_PROPERTY_ID, "password");
// create the request
- Request request = PropertyHelper.getUpdateRequest(properties);
+ Request request = PropertyHelper.getUpdateRequest(properties, null);
Predicate predicate = new PredicateBuilder().property(UserResourceProvider.USER_USERNAME_PROPERTY_ID).
equals("User100").toPredicate();
Added: incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/StageEntityTest.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/StageEntityTest.java?rev=1458497&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/StageEntityTest.java (added)
+++ incubator/ambari/trunk/ambari-server/src/test/java/org/apache/ambari/server/orm/entities/StageEntityTest.java Tue Mar 19 20:20:27 2013
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.orm.entities;
+
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ * StageEntity unit tests
+ */
+public class StageEntityTest {
+ @Test
+ public void testSetGetRequestContext() {
+ StageEntity entity = new StageEntity();
+ entity.setRequestContext("testSetGetRequestContext");
+ assertEquals("testSetGetRequestContext", entity.getRequestContext());
+ }
+}