This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 51f15e7c8b8de95a7f35355d7fd48c4933acfc1f Author: Guillaume Nodet <[email protected]> AuthorDate: Fri Jan 24 14:07:22 2020 +0100 [CAMEL-14437] Merge the Strings class tests --- .../org/apache/camel/tooling/util/StringsTest.java | 20 ++++++++++ .../maven/packaging/model/StringHelperTest.java | 44 ---------------------- 2 files changed, 20 insertions(+), 44 deletions(-) diff --git a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java index 8fdb849..1583b8e 100644 --- a/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java +++ b/tooling/camel-tooling-util/src/test/java/org/apache/camel/tooling/util/StringsTest.java @@ -16,14 +16,34 @@ */ package org.apache.camel.tooling.util; +import java.util.stream.Stream; + import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import static org.apache.camel.tooling.util.Strings.asTitle; import static org.apache.camel.tooling.util.Strings.between; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.arguments; public class StringsTest { + static Stream<Arguments> getClassShortNameTypeVarations() { + return Stream.of(arguments("String", "String"), arguments("String", "java.lang.String"), arguments("List", "List<String>"), arguments("List", "java.util.List<String>"), + arguments("List", "List<java.lang.String>"), arguments("List", "java.util.List.List<org.apache.camel.Exchange>"), + arguments("List", "java.util.List<Map<String,Integer>>"), arguments("List", "java.util.List<Map<java.lang.String,Integer>>"), + arguments("List", "java.util.List<Map<String,java.lang.Integer>>"), arguments("List", "java.util.List<Map<java.lang.String,java.lang.Integer>>"), + arguments("List", "java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>")); + } + + @ParameterizedTest + @MethodSource("getClassShortNameTypeVarations") + public void getClassShortName(String expectedBaseClassName, String className) { + assertEquals(expectedBaseClassName, Strings.getClassShortName(className)); + } + @Test public void testBetween() { assertEquals("org.apache.camel.model.OnCompletionDefinition", between("java.util.List<org.apache.camel.model.OnCompletionDefinition>", "<", ">")); diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java deleted file mode 100644 index 97db8c1..0000000 --- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/model/StringHelperTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 org.apache.camel.maven.packaging.model; - -import java.util.stream.Stream; - -import org.apache.camel.tooling.util.Strings; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -import static org.junit.jupiter.params.provider.Arguments.arguments; - -public class StringHelperTest { - - static Stream<Arguments> getClassShortNameTypeVarations() { - return Stream.of(arguments("String", "String"), arguments("String", "java.lang.String"), arguments("List", "List<String>"), arguments("List", "java.util.List<String>"), - arguments("List", "List<java.lang.String>"), arguments("List", "java.util.List.List<org.apache.camel.Exchange>"), - arguments("List", "java.util.List<Map<String,Integer>>"), arguments("List", "java.util.List<Map<java.lang.String,Integer>>"), - arguments("List", "java.util.List<Map<String,java.lang.Integer>>"), arguments("List", "java.util.List<Map<java.lang.String,java.lang.Integer>>"), - arguments("List", "java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>")); - } - - @ParameterizedTest - @MethodSource("getClassShortNameTypeVarations") - public void getClassShortName(String expectedBaseClassName, String className) { - Assertions.assertEquals(expectedBaseClassName, Strings.getClassShortName(className)); - } -}
