You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/11/11 18:21:40 UTC
[13/21] incubator-brooklyn git commit: Moved class javadoc to
interface
Moved class javadoc to interface
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/adbf0ef1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/adbf0ef1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/adbf0ef1
Branch: refs/heads/master
Commit: adbf0ef12e93f55d455b59e096fb81a6389602e0
Parents: 4ce5c1c
Author: Mark McKenna <m4...@gmail.com>
Authored: Wed Nov 11 11:32:38 2015 +0000
Committer: Mark McKenna <m4...@gmail.com>
Committed: Wed Nov 11 11:32:38 2015 +0000
----------------------------------------------------------------------
.../brooklyn/test/framework/ParallelTestCase.java | 3 ++-
.../test/framework/ParallelTestCaseImpl.java | 15 +++++----------
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adbf0ef1/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
----------------------------------------------------------------------
diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
index b5dc1ea..47de3b6 100644
--- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
+++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCase.java
@@ -5,7 +5,8 @@ import org.apache.brooklyn.api.entity.ImplementedBy;
import org.apache.brooklyn.core.entity.trait.Startable;
/**
- *
+ * This implementation will start all child entities in parallel.
+ *
* @author Chris Burke
*/
@ImplementedBy(value = ParallelTestCaseImpl.class)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adbf0ef1/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
----------------------------------------------------------------------
diff --git a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
index 67e972a..2a00a63 100644
--- a/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
+++ b/usage/test-framework/src/main/java/org/apache/brooklyn/test/framework/ParallelTestCaseImpl.java
@@ -1,8 +1,5 @@
package org.apache.brooklyn.test.framework;
-import java.util.Collection;
-import java.util.concurrent.ExecutionException;
-
import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.mgmt.Task;
import org.apache.brooklyn.api.mgmt.TaskAdaptable;
@@ -15,11 +12,9 @@ import org.apache.brooklyn.util.exceptions.Exceptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * This implementation will start all child entities in parallel.
- *
- * @author Chris Burke
- */
+import java.util.Collection;
+import java.util.concurrent.ExecutionException;
+
public class ParallelTestCaseImpl extends AbstractEntity implements ParallelTestCase {
private static final Logger logger = LoggerFactory.getLogger(ParallelTestCaseImpl.class);
@@ -102,9 +97,9 @@ public class ParallelTestCaseImpl extends AbstractEntity implements ParallelTest
/**
* Submits the task to the ExecutionManager and then waits until the task has completed.
- *
+ *
* @param taskAdaptable the TaskAdaptable to submit for execution.
- * @throws ExecutionException if the task threw an exception
+ * @throws ExecutionException if the task threw an exception
* @throws InterruptedException if the current thread was interrupted while waiting
*/
private void submitTaskAndWait(final TaskAdaptable<?> taskAdaptable)