From 330735902b213edcad6138676d8d8ed0925c4891 Mon Sep 17 00:00:00 2001 From: mpollack Date: Tue, 23 Jul 2013 15:10:56 -0400 Subject: [PATCH] SHL-103 Create simple way to test the execution of shell commands. Add missing files from previous commit --- .../commands/HelloWorldCommandTests.java | 37 +++++++++++++ .../shell/core/CommandResult.java | 55 +++++++++++++++++++ .../shell/commands/BuiltInCommandTests.java | 51 +++++++++++++++++ 3 files changed, 143 insertions(+) create mode 100644 samples/helloworld/src/test/java/org/springframework/shell/samples/hellworld/commands/HelloWorldCommandTests.java create mode 100644 src/main/java/org/springframework/shell/core/CommandResult.java create mode 100644 src/test/java/org/springframework/shell/commands/BuiltInCommandTests.java diff --git a/samples/helloworld/src/test/java/org/springframework/shell/samples/hellworld/commands/HelloWorldCommandTests.java b/samples/helloworld/src/test/java/org/springframework/shell/samples/hellworld/commands/HelloWorldCommandTests.java new file mode 100644 index 00000000..e80f9654 --- /dev/null +++ b/samples/helloworld/src/test/java/org/springframework/shell/samples/hellworld/commands/HelloWorldCommandTests.java @@ -0,0 +1,37 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed 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.springframework.shell.samples.hellworld.commands; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; +import org.springframework.shell.Bootstrap; +import org.springframework.shell.core.CommandResult; +import org.springframework.shell.core.JLineShellComponent; + +public class HelloWorldCommandTests { + + @Test + public void testSimple() { + Bootstrap bootstrap = new Bootstrap(); + + JLineShellComponent shell = bootstrap.getJLineShellComponent(); + + CommandResult cr = shell.executeCommand("hw simple --message hello"); + assertEquals(true, cr.isSuccess()); + assertEquals("Message = [hello] Location = [null]", cr.getResult()); + } +} diff --git a/src/main/java/org/springframework/shell/core/CommandResult.java b/src/main/java/org/springframework/shell/core/CommandResult.java new file mode 100644 index 00000000..b2002310 --- /dev/null +++ b/src/main/java/org/springframework/shell/core/CommandResult.java @@ -0,0 +1,55 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed 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.springframework.shell.core; + +public class CommandResult { + + private boolean success; + + private Object result; + + private Throwable exception; + + public CommandResult(boolean success) { + this.success = success; + } + public CommandResult(boolean success, Object result, Throwable exception) { + super(); + this.success = success; + this.result = result; + this.exception = exception; + } + + public boolean isSuccess() { + return success; + } + + public Object getResult() { + return result; + } + + public Throwable getException() { + return exception; + } + + @Override + public String toString() { + return "CommandResult [success=" + success + ", result=" + result + + ", exception=" + exception + "]"; + } + + +} diff --git a/src/test/java/org/springframework/shell/commands/BuiltInCommandTests.java b/src/test/java/org/springframework/shell/commands/BuiltInCommandTests.java new file mode 100644 index 00000000..9cc46395 --- /dev/null +++ b/src/test/java/org/springframework/shell/commands/BuiltInCommandTests.java @@ -0,0 +1,51 @@ +/* + * Copyright 2013 the original author or authors. + * + * Licensed 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.springframework.shell.commands; + +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Date; +import java.util.Locale; +import java.util.concurrent.TimeUnit; + +import org.hamcrest.MatcherAssert; +import org.junit.Test; +import org.springframework.shell.Bootstrap; +import org.springframework.shell.core.CommandResult; +import org.springframework.shell.core.JLineShellComponent; + +import uk.co.it.modular.hamcrest.date.DateMatchers; + +public class BuiltInCommandTests { + + @Test + public void dateTest() throws ParseException { + Bootstrap bootstrap = new Bootstrap(); + + JLineShellComponent shell = bootstrap.getJLineShellComponent(); + + CommandResult cr = shell.executeCommand("date"); + + DateFormat df = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL,Locale.US); + Date result = df.parse(cr.getResult().toString()); + Date now = new Date(); + MatcherAssert.assertThat(now, DateMatchers.within(5, TimeUnit.SECONDS, result)); + + } + + + +}