You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/08 19:00:39 UTC
[3/5] git commit: Moves RecordingSshTool to core
Moves RecordingSshTool to core
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d591c813
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d591c813
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d591c813
Branch: refs/heads/master
Commit: d591c813f4139e8bd99bb6da9c12744dfa48019a
Parents: 73dcb1d
Author: Aled Sage <al...@gmail.com>
Authored: Fri Jul 4 21:17:13 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jul 8 15:00:29 2014 +0100
----------------------------------------------------------------------
.../util/internal/ssh/RecordingSshTool.java | 76 ++++++++++++++++++++
.../java/brooklyn/entity/java/JavaOptsTest.java | 71 +-----------------
2 files changed, 78 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d591c813/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java b/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
new file mode 100644
index 0000000..0aa2644
--- /dev/null
+++ b/core/src/test/java/brooklyn/util/internal/ssh/RecordingSshTool.java
@@ -0,0 +1,76 @@
+package brooklyn.util.internal.ssh;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+
+public class RecordingSshTool implements SshTool {
+
+ public static class ExecCmd {
+ public final Map<String,?> props;
+ public final String summaryForLogging;
+ public final List<String> commands;
+ public final Map<?,?> env;
+
+ ExecCmd(Map<String,?> props, String summaryForLogging, List<String> commands, Map env) {
+ this.props = props;
+ this.summaryForLogging = summaryForLogging;
+ this.commands = commands;
+ this.env = env;
+ }
+
+ @Override
+ public String toString() {
+ return "ExecCmd["+summaryForLogging+": "+commands+"; "+props+"; "+env+"]";
+ }
+ }
+
+ public static List<ExecCmd> execScriptCmds = Lists.newCopyOnWriteArrayList();
+
+ private boolean connected;
+
+ public RecordingSshTool(Map<?,?> props) {
+ }
+ @Override public void connect() {
+ connected = true;
+ }
+ @Override public void connect(int maxAttempts) {
+ connected = true;
+ }
+ @Override public void disconnect() {
+ connected = false;
+ }
+ @Override public boolean isConnected() {
+ return connected;
+ }
+ @Override public int execScript(Map<String, ?> props, List<String> commands, Map<String, ?> env) {
+ execScriptCmds.add(new ExecCmd(props, "", commands, env));
+ return 0;
+ }
+ @Override public int execScript(Map<String, ?> props, List<String> commands) {
+ return execScript(props, commands, ImmutableMap.<String,Object>of());
+ }
+ @Override public int execCommands(Map<String, ?> props, List<String> commands, Map<String, ?> env) {
+ execScriptCmds.add(new ExecCmd(props, "", commands, env));
+ return 0;
+ }
+ @Override public int execCommands(Map<String, ?> props, List<String> commands) {
+ return execCommands(props, commands, ImmutableMap.<String,Object>of());
+ }
+ @Override public int copyToServer(Map<String, ?> props, File localFile, String pathAndFileOnRemoteServer) {
+ return 0;
+ }
+ @Override public int copyToServer(Map<String, ?> props, InputStream contents, String pathAndFileOnRemoteServer) {
+ return 0;
+ }
+ @Override public int copyToServer(Map<String, ?> props, byte[] contents, String pathAndFileOnRemoteServer) {
+ return 0;
+ }
+ @Override public int copyFromServer(Map<String, ?> props, String pathAndFileOnRemoteServer, File local) {
+ return 0;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d591c813/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java
----------------------------------------------------------------------
diff --git a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java
index 62623fc..788b0dc 100644
--- a/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java
+++ b/software/base/src/test/java/brooklyn/entity/java/JavaOptsTest.java
@@ -2,8 +2,6 @@ package brooklyn.entity.java;
import static org.testng.Assert.fail;
-import java.io.File;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -26,13 +24,14 @@ import brooklyn.location.basic.SshMachineLocation;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;
+import brooklyn.util.internal.ssh.RecordingSshTool;
+import brooklyn.util.internal.ssh.RecordingSshTool.ExecCmd;
import brooklyn.util.internal.ssh.SshTool;
import brooklyn.util.jmx.jmxmp.JmxmpAgent;
import brooklyn.util.text.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
import com.google.common.collect.MapDifference.ValueDifference;
import com.google.common.collect.Maps;
@@ -44,72 +43,6 @@ public class JavaOptsTest extends BrooklynAppUnitTestSupport {
private static final Logger log = LoggerFactory.getLogger(JavaOptsTest.class);
- private static class ExecCmd {
- Map<String,?> props;
- String summaryForLogging;
- List<String> commands;
- Map<?,?> env;
-
- ExecCmd(Map<String,?> props, String summaryForLogging, List<String> commands, Map env) {
- this.props = props;
- this.summaryForLogging = summaryForLogging;
- this.commands = commands;
- this.env = env;
- }
-
- @Override
- public String toString() {
- return "ExecCmd["+summaryForLogging+": "+commands+"; "+props+"; "+env+"]";
- }
- }
-
- public static class RecordingSshTool implements SshTool {
- static List<ExecCmd> execScriptCmds = Lists.newCopyOnWriteArrayList();
-
- private boolean connected;
-
- public RecordingSshTool(Map<?,?> props) {
- }
- @Override public void connect() {
- connected = true;
- }
- @Override public void connect(int maxAttempts) {
- connected = true;
- }
- @Override public void disconnect() {
- connected = false;
- }
- @Override public boolean isConnected() {
- return connected;
- }
- @Override public int execScript(Map<String, ?> props, List<String> commands, Map<String, ?> env) {
- execScriptCmds.add(new ExecCmd(props, "", commands, env));
- return 0;
- }
- @Override public int execScript(Map<String, ?> props, List<String> commands) {
- return execScript(props, commands, ImmutableMap.<String,Object>of());
- }
- @Override public int execCommands(Map<String, ?> props, List<String> commands, Map<String, ?> env) {
- execScriptCmds.add(new ExecCmd(props, "", commands, env));
- return 0;
- }
- @Override public int execCommands(Map<String, ?> props, List<String> commands) {
- return execCommands(props, commands, ImmutableMap.<String,Object>of());
- }
- @Override public int copyToServer(Map<String, ?> props, File localFile, String pathAndFileOnRemoteServer) {
- return 0;
- }
- @Override public int copyToServer(Map<String, ?> props, InputStream contents, String pathAndFileOnRemoteServer) {
- return 0;
- }
- @Override public int copyToServer(Map<String, ?> props, byte[] contents, String pathAndFileOnRemoteServer) {
- return 0;
- }
- @Override public int copyFromServer(Map<String, ?> props, String pathAndFileOnRemoteServer, File local) {
- return 0;
- }
- }
-
private SshMachineLocation loc;
@BeforeMethod(alwaysRun=true)