diff --git a/pom.xml b/pom.xml index 35f683f3..5b97f307 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,12 @@ 1.48 true + + org.assertj + assertj-core + 3.2.0 + test + diff --git a/src/test/java/org/springframework/shell2/DefaultParameterResolverTest.java b/src/test/java/org/springframework/shell2/DefaultParameterResolverTest.java index 9684d8ec..cb9401a3 100644 --- a/src/test/java/org/springframework/shell2/DefaultParameterResolverTest.java +++ b/src/test/java/org/springframework/shell2/DefaultParameterResolverTest.java @@ -1,18 +1,16 @@ package org.springframework.shell2; -import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; -import static org.springframework.util.ReflectionUtils.findMethod; - -import java.lang.reflect.Method; - import org.junit.Test; - import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.convert.support.DefaultConversionService; +import java.lang.reflect.Method; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.util.ReflectionUtils.findMethod; + /** * Unit tests for DefaultParameterResolver. * @@ -31,19 +29,19 @@ public class DefaultParameterResolverTest { assertThat(resolver.resolve( makeMethodParameter(method, 0), asList("--force --name --foo y".split(" ")) - ), is(true)); + )).isEqualTo(true); assertThat(resolver.resolve( makeMethodParameter(method, 1), asList("--force --name --foo y".split(" ")) - ), is("--foo")); + )).isEqualTo("--foo"); assertThat(resolver.resolve( makeMethodParameter(method, 2), asList("--force --name --foo y".split(" ")) - ), is("y")); + )).isEqualTo("y"); assertThat(resolver.resolve( makeMethodParameter(method, 3), asList("--force --name --foo y".split(" ")) - ), is("last")); + )).isEqualTo("last"); } diff --git a/src/test/java/org/springframework/shell2/jcommander/JCommanderParameterResolverTest.java b/src/test/java/org/springframework/shell2/jcommander/JCommanderParameterResolverTest.java index 3594cc52..7688d33e 100644 --- a/src/test/java/org/springframework/shell2/jcommander/JCommanderParameterResolverTest.java +++ b/src/test/java/org/springframework/shell2/jcommander/JCommanderParameterResolverTest.java @@ -1,45 +1,43 @@ package org.springframework.shell2.jcommander; -import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import org.junit.Test; +import org.springframework.core.MethodParameter; +import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; -import org.junit.Test; - -import org.springframework.core.MethodParameter; -import org.springframework.util.ReflectionUtils; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; /** * Created by ericbottard on 15/12/15. */ public class JCommanderParameterResolverTest { - public static final Method COMMAND_METHOD = ReflectionUtils.findMethod(MyLordCommands.class, "genesis", FieldCollins.class); + private static final Method COMMAND_METHOD = ReflectionUtils.findMethod(MyLordCommands.class, "genesis", FieldCollins.class); private JCommanderParameterResolver resolver = new JCommanderParameterResolver(); @Test public void testSupportsJCommanderPojos() throws Exception { - - assertThat(resolver.supports(new MethodParameter(COMMAND_METHOD, 0)), is(true)); + assertThat(resolver.supports(new MethodParameter(COMMAND_METHOD, 0))).isEqualTo(true); } @Test public void testDoesNotSupportsNonJCommanderPojos() throws Exception { Method method = ReflectionUtils.findMethod(MyLordCommands.class, "apocalypse", String.class); - assertThat(resolver.supports(new MethodParameter(method, 0)), is(false)); + assertThat(resolver.supports(new MethodParameter(method, 0))).isFalse(); } @Test public void testPojoValuesAreCorrectlySet() { MethodParameter methodParameter = new MethodParameter(COMMAND_METHOD, 0); + FieldCollins resolved = (FieldCollins) resolver.resolve(methodParameter, asList("--name foo -level 2 something-else yet-something-else".split(" "))); - assertThat(resolved.getName(), is("foo")); - assertThat(resolved.getLevel(), is(2)); - assertThat(resolved.getRest(), contains("something-else", "yet-something-else")); + + assertThat(resolved.getName()).isEqualTo("foo"); + assertThat(resolved.getLevel()).isEqualTo(2); + assertThat(resolved.getRest()).containsOnlyOnce("something-else", "yet-something-else"); } } diff --git a/src/test/java/org/springframework/shell2/legacy/LegacyMethodTargetResolverTest.java b/src/test/java/org/springframework/shell2/legacy/LegacyMethodTargetResolverTest.java index 6eb2270d..afedd76e 100644 --- a/src/test/java/org/springframework/shell2/legacy/LegacyMethodTargetResolverTest.java +++ b/src/test/java/org/springframework/shell2/legacy/LegacyMethodTargetResolverTest.java @@ -1,13 +1,8 @@ package org.springframework.shell2.legacy; -import static org.junit.Assert.assertThat; -import java.util.Map; - -import org.hamcrest.collection.IsMapContaining; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -17,6 +12,11 @@ import org.springframework.shell2.MethodTargetResolver; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.data.MapEntry.entry; + /** * Created by ericbottard on 09/12/15. */ @@ -37,7 +37,7 @@ public class LegacyMethodTargetResolverTest { public void findsMethodsAnnotatedWithCliCommand() throws Exception { Map targets = resolver.resolve(applicationContext); - assertThat(targets, IsMapContaining.hasEntry( + assertThat(targets).contains(entry( "register module", new MethodTarget(LegacyCommands.REGISTER_METHOD, legacyCommands, "Register a new module" ) )); diff --git a/src/test/java/org/springframework/shell2/legacy/LegacyParameterResolverTest.java b/src/test/java/org/springframework/shell2/legacy/LegacyParameterResolverTest.java index 8f239e3e..526c28ce 100644 --- a/src/test/java/org/springframework/shell2/legacy/LegacyParameterResolverTest.java +++ b/src/test/java/org/springframework/shell2/legacy/LegacyParameterResolverTest.java @@ -1,17 +1,9 @@ package org.springframework.shell2.legacy; -import static java.util.Arrays.asList; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - -import java.lang.reflect.Method; - -import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -25,6 +17,12 @@ import org.springframework.shell2.ParameterResolver; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import java.lang.reflect.Method; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.shell2.legacy.LegacyCommands.REGISTER_METHOD; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = LegacyParameterResolverTest.Config.class) public class LegacyParameterResolverTest { @@ -42,85 +40,76 @@ public class LegacyParameterResolverTest { @Test public void supportsParameterAnnotatedWithCliOption() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, NAME_OR_ANONYMOUS); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, NAME_OR_ANONYMOUS); - boolean supports = parameterResolver.supports(methodParameter); + boolean result = parameterResolver.supports(methodParameter); - assertThat(supports, is(true)); - } - - private MethodParameter buildMethodParameter(Method method, int index) { - MethodParameter methodParameter = new MethodParameter(method, index); - methodParameter.initParameterNameDiscovery(new DefaultParameterNameDiscoverer()); - return methodParameter; + assertThat(result).isTrue(); } @Test public void resolvesParameterAnnotatedWithCliOption() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, NAME_OR_ANONYMOUS); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, NAME_OR_ANONYMOUS); - Object result = parameterResolver.resolve(methodParameter, asList("--foo bar --name baz --qix bux".split(" "))); + Object result = resolve(methodParameter, "--foo bar --name baz --qix bux"); - assertThat(result, is("baz")); + assertThat(result).isEqualTo("baz"); } @Test public void resolvesAnonymousParameterAnnotatedWithCliOption() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, NAME_OR_ANONYMOUS); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, NAME_OR_ANONYMOUS); - Object result = parameterResolver.resolve(methodParameter, asList("--foo bar baz --qix bux".split(" "))); - assertThat(result, is("baz")); + Object result = resolve(methodParameter, "--foo bar baz --qix bux"); + assertThat(result).isEqualTo("baz"); // As first param - result = parameterResolver.resolve(methodParameter, asList("baz --foo bar --qix bux".split(" "))); - assertThat(result, is("baz")); + result = resolve(methodParameter, "baz --foo bar --qix bux"); + assertThat(result).isEqualTo("baz"); } @Test public void usesLegacyConverters() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, TYPE); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, TYPE); - Object result = parameterResolver.resolve(methodParameter, asList("--foo bar --name baz --qix bux --type processor".split(" "))); + Object result = resolve(methodParameter, "--foo bar --name baz --qix bux --type processor"); - assertThat(result, Matchers.is(ArtifactType.processor)); + assertThat(result).isSameAs(ArtifactType.processor); } @Test public void testUnspecifiedDefaultValue() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, FORCE); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, FORCE); - Object result = parameterResolver.resolve(methodParameter, asList("--foo bar --name baz --qix bux".split(" "))); + Object result = resolve(methodParameter, "--foo bar --name baz --qix bux"); - assertThat(result, is(false)); + assertThat(result).isEqualTo(false); } @Test public void testSpecifiedDefaultValue() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, FORCE); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, FORCE); - assertThat(parameterResolver.resolve(methodParameter, asList("--force --foo bar --name baz --qix bux".split(" "))), is(true)); - assertThat(parameterResolver.resolve(methodParameter, asList("--foo bar --name baz --qix bux --force".split(" "))), is(true)); + assertThat(resolve(methodParameter, "--force --foo bar --name baz --qix bux")).isEqualTo(true); + assertThat(resolve(methodParameter, "--foo bar --name baz --qix bux --force")).isEqualTo(true); } @Test public void testParameterNotFound() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, COORDINATES); + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, COORDINATES); thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Could not find parameter values for [--coordinates, --coords] in [--force, --foo, bar, --name, baz, --qix, bux]"); - parameterResolver.resolve(methodParameter, asList("--force --foo bar --name baz --qix bux".split(" "))); + resolve(methodParameter, "--force --foo bar --name baz --qix bux"); } @Test - public void testParameterFoundTooManyTimes() throws Exception { - MethodParameter methodParameter = buildMethodParameter(LegacyCommands.REGISTER_METHOD, COORDINATES); + public void testParameterFoundWithSameNameTooManyTimes() throws Exception { + MethodParameter methodParameter = buildMethodParameter(REGISTER_METHOD, COORDINATES); thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Option --coordinates has already been set"); - // with the exact same name - parameterResolver.resolve(methodParameter, asList("--force --coordinates bar --coordinates baz --qix bux".split(" "))); - // or even with aliases - parameterResolver.resolve(methodParameter, asList("--force --coordinates bar --coords baz --qix bux".split(" "))); + resolve(methodParameter, "--force --coordinates bar --coordinates baz --qix bux"); } @Test @@ -129,9 +118,7 @@ public class LegacyParameterResolverTest { thrown.expect(IllegalStateException.class); thrown.expectMessage("No converter found for --v1 from '1' to type int"); - parameterResolver.resolve(methodParameter, asList("--v1 1 --v2 2".split(" "))); - - + resolve(methodParameter, "--v1 1 --v2 2"); } @Test @@ -140,7 +127,7 @@ public class LegacyParameterResolverTest { thrown.expect(IllegalStateException.class); thrown.expectMessage("No converter found for --v1 from '38' to type int"); - parameterResolver.resolve(methodParameter, asList("--v2 2".split(" "))); + resolve(methodParameter, "--v2 2"); } @Test @@ -149,7 +136,17 @@ public class LegacyParameterResolverTest { thrown.expect(IllegalStateException.class); thrown.expectMessage("No converter found for --v2 from '42' to type int"); - parameterResolver.resolve(methodParameter, asList("--v1 1 --v2".split(" "))); + resolve(methodParameter, "--v1 1 --v2"); + } + + private MethodParameter buildMethodParameter(Method method, int index) { + MethodParameter methodParameter = new MethodParameter(method, index); + methodParameter.initParameterNameDiscovery(new DefaultParameterNameDiscoverer()); + return methodParameter; + } + + private Object resolve(MethodParameter methodParameter, String command) { + return parameterResolver.resolve(methodParameter, asList(command.split(" "))); } @Configuration