cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 7e75f33
Date Thu, 12 Feb 2015 14:47:36 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master ec1c3894f -> 7e75f339b


license and format


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7e75f339
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7e75f339
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7e75f339

Branch: refs/heads/master
Commit: 7e75f339bcfdd6352f81a04219d3b8029f35634e
Parents: ec1c389
Author: Daan Hoogland <daan@onecht.net>
Authored: Thu Feb 12 14:47:12 2015 +0000
Committer: Daan Hoogland <daan@onecht.net>
Committed: Thu Feb 12 14:47:12 2015 +0000

----------------------------------------------------------------------
 .../agent/manager/DirectAgentAttacheTest.java   | 62 ++++++++++++--------
 1 file changed, 39 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7e75f339/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java
b/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java
index 663450a..2ee2b46 100644
--- a/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java
+++ b/engine/orchestration/test/com/cloud/agent/manager/DirectAgentAttacheTest.java
@@ -1,3 +1,19 @@
+// 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 com.cloud.agent.manager;
 
 import org.junit.Before;
@@ -12,27 +28,27 @@ import com.cloud.resource.ServerResource;
 
 @RunWith(MockitoJUnitRunner.class)
 public class DirectAgentAttacheTest {
-	@Mock
-	private AgentManagerImpl _agentMgr;
-
-	@Mock
-	private ServerResource _resource;
-
-	long _id = 0L;
-
-	@Before
-	public void setup() {
-		directAgentAttache = new DirectAgentAttache(_agentMgr, _id, "myDirectAgentAttache", _resource,
false);
-		
-		MockitoAnnotations.initMocks(directAgentAttache);
-	}
-	private DirectAgentAttache directAgentAttache;
-
-	@Test
-	public void testPingTask() throws Exception {
-		DirectAgentAttache.PingTask pt = directAgentAttache.new PingTask();
-		Mockito.doReturn(2).when(_agentMgr).getDirectAgentThreadCap();
-		pt.runInContext();
-		Mockito.verify(_resource, Mockito.times(1)).getCurrentStatus(_id);
-	}
+    @Mock
+    private AgentManagerImpl _agentMgr;
+
+    @Mock
+    private ServerResource _resource;
+
+    long _id = 0L;
+
+    @Before
+    public void setup() {
+        directAgentAttache = new DirectAgentAttache(_agentMgr, _id, "myDirectAgentAttache",
_resource, false);
+
+        MockitoAnnotations.initMocks(directAgentAttache);
+    }
+    private DirectAgentAttache directAgentAttache;
+
+    @Test
+    public void testPingTask() throws Exception {
+        DirectAgentAttache.PingTask pt = directAgentAttache.new PingTask();
+        Mockito.doReturn(2).when(_agentMgr).getDirectAgentThreadCap();
+        pt.runInContext();
+        Mockito.verify(_resource, Mockito.times(1)).getCurrentStatus(_id);
+    }
 }


Mime
View raw message