This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit af95aa9aa783bb4e7604e39135569fc8d1cfe8ce Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Tue Apr 16 13:21:01 2024 +0200 (chores) camel-core: extract independent code snippets from large code blocks in tests --- .../aggregator/AlbertoAggregatorTest.java | 21 +++++--- .../component/ArgumentSubstitutionParserTest.java | 58 ++++++++++++---------- .../java/org/apache/camel/main/MainVaultTest.java | 25 ++++++---- .../java/org/apache/camel/xml/in/ParserTest.java | 25 ++++++---- 4 files changed, 75 insertions(+), 54 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java index 870613e6c4a..470817b0ae7 100644 --- a/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java @@ -43,6 +43,18 @@ public class AlbertoAggregatorTest extends ContextTestSupport { String allNames = "Harpo Marx,Fiodor Karamazov,Chico Marx,Ivan Karamazov,Groucho Marx,Alexei Karamazov,Dimitri Karamazov"; + final Map<String, List<String>> allBrothers = getAllBrothers(); + + MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); + resultEndpoint.expectedMessageCount(1); + resultEndpoint.expectedBodiesReceived(allBrothers); + + template.sendBody("direct:start", allNames); + + assertMockEndpointsSatisfied(); + } + + private static Map<String, List<String>> getAllBrothers() { List<String> marxBrothers = new ArrayList<>(); marxBrothers.add("Harpo"); marxBrothers.add("Chico"); @@ -57,14 +69,7 @@ public class AlbertoAggregatorTest extends ContextTestSupport { Map<String, List<String>> allBrothers = new HashMap<>(); allBrothers.put("Marx", marxBrothers); allBrothers.put("Karamazov", karamazovBrothers); - - MockEndpoint resultEndpoint = getMockEndpoint("mock:result"); - resultEndpoint.expectedMessageCount(1); - resultEndpoint.expectedBodiesReceived(allBrothers); - - template.sendBody("direct:start", allNames); - - assertMockEndpointsSatisfied(); + return allBrothers; } @Override diff --git a/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java b/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java index bc6708bb7c5..483fe540b60 100644 --- a/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/support/component/ArgumentSubstitutionParserTest.java @@ -39,6 +39,37 @@ public class ArgumentSubstitutionParserTest { adapters[2] = new Substitution(".+", "(.+)", "java.util.List", "$1List"); adapters[3] = new Substitution(".+", "(.+)", ".*?(\\w++)\\[\\]", "$1Array", true); + final ApiMethodParser<TestProxy> parser = + getTestProxyApiMethodParser(adapters); + + final List<ApiMethodParser.ApiMethodModel> methodModels = parser.parse(); + assertEquals(9, methodModels.size()); + + final ApiMethodParser.ApiMethodModel sayHi1 = methodModels.get(8); + assertEquals(PERSON, sayHi1.getArguments().get(0).getName()); + assertEquals("SAY_HI_1", sayHi1.getUniqueName()); + + final ApiMethodParser.ApiMethodModel greetMe = methodModels.get(4); + assertEquals(PERSON, greetMe.getArguments().get(0).getName()); + + final ApiMethodParser.ApiMethodModel greetUs = methodModels.get(6); + assertEquals("astronaut1", greetUs.getArguments().get(0).getName()); + assertEquals("astronaut2", greetUs.getArguments().get(1).getName()); + + final ApiMethodParser.ApiMethodModel greetAll = methodModels.get(0); + assertEquals("personList", greetAll.getArguments().get(0).getName()); + + final ApiMethodParser.ApiMethodModel greetAll1 = methodModels.get(1); + assertEquals("personMap", greetAll1.getArguments().get(0).getName()); + + final ApiMethodParser.ApiMethodModel greetAll2 = methodModels.get(2); + assertEquals("stringArray", greetAll2.getArguments().get(0).getName()); + + final ApiMethodParser.ApiMethodModel greetInnerChild = methodModels.get(3); + assertEquals("child", greetInnerChild.getArguments().get(0).getName()); + } + + private static ApiMethodParser<TestProxy> getTestProxyApiMethodParser(Substitution[] adapters) { final ApiMethodParser<TestProxy> parser = new ArgumentSubstitutionParser<>(TestProxy.class, adapters); final ArrayList<String> signatures = new ArrayList<>(); @@ -88,32 +119,7 @@ public class ArgumentSubstitutionParserTest { args); parser.setSignatures(signatures); - - final List<ApiMethodParser.ApiMethodModel> methodModels = parser.parse(); - assertEquals(9, methodModels.size()); - - final ApiMethodParser.ApiMethodModel sayHi1 = methodModels.get(8); - assertEquals(PERSON, sayHi1.getArguments().get(0).getName()); - assertEquals("SAY_HI_1", sayHi1.getUniqueName()); - - final ApiMethodParser.ApiMethodModel greetMe = methodModels.get(4); - assertEquals(PERSON, greetMe.getArguments().get(0).getName()); - - final ApiMethodParser.ApiMethodModel greetUs = methodModels.get(6); - assertEquals("astronaut1", greetUs.getArguments().get(0).getName()); - assertEquals("astronaut2", greetUs.getArguments().get(1).getName()); - - final ApiMethodParser.ApiMethodModel greetAll = methodModels.get(0); - assertEquals("personList", greetAll.getArguments().get(0).getName()); - - final ApiMethodParser.ApiMethodModel greetAll1 = methodModels.get(1); - assertEquals("personMap", greetAll1.getArguments().get(0).getName()); - - final ApiMethodParser.ApiMethodModel greetAll2 = methodModels.get(2); - assertEquals("stringArray", greetAll2.getArguments().get(0).getName()); - - final ApiMethodParser.ApiMethodModel greetInnerChild = methodModels.get(3); - assertEquals("child", greetInnerChild.getArguments().get(0).getName()); + return parser; } } diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java index c6f817c0918..4856b986f68 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainVaultTest.java @@ -55,16 +55,7 @@ public class MainVaultTest { @Test public void testMainProfileAws() throws Exception { - Main main = new Main(); - - main.addInitialProperty("camel.vault.aws.accessKey", "myKey"); - main.addInitialProperty("camel.vault.aws.secretKey", "mySecret"); - main.addInitialProperty("camel.vault.aws.region", "myRegion"); - main.addInitialProperty("camel.vault.aws.defaultCredentialsProvider", "false"); - main.addInitialProperty("camel.vault.aws.profileCredentialsProvider", "true"); - main.addInitialProperty("camel.vault.aws.profileName", "jack"); - - main.start(); + final Main main = getMain(); CamelContext context = main.getCamelContext(); assertNotNull(context); @@ -82,6 +73,20 @@ public class MainVaultTest { main.stop(); } + private static Main getMain() { + Main main = new Main(); + + main.addInitialProperty("camel.vault.aws.accessKey", "myKey"); + main.addInitialProperty("camel.vault.aws.secretKey", "mySecret"); + main.addInitialProperty("camel.vault.aws.region", "myRegion"); + main.addInitialProperty("camel.vault.aws.defaultCredentialsProvider", "false"); + main.addInitialProperty("camel.vault.aws.profileCredentialsProvider", "true"); + main.addInitialProperty("camel.vault.aws.profileName", "jack"); + + main.start(); + return main; + } + @Test public void testMainAwsFluent() throws Exception { Main main = new Main(); diff --git a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java index 4f75720b63b..a04990748af 100644 --- a/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java +++ b/core/camel-xml-io/src/test/java/org/apache/camel/xml/in/ParserTest.java @@ -31,16 +31,7 @@ public class ParserTest { @Test public void justParse() throws XmlPullParserException, IOException { - String xml = """ - <?xml version='1.0'?> - <c:root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:c="uri:camel" xmlns="uri:camel-beans"> - <c:e1 a="value-1" b:a="value-2" xmlns:c="uri:cxf" xmlns:b="uri:b" /> - <watch-out-for-entities> </watch-out-for-entities> - </c:root> - """; - BaseParser p = new BaseParser(new StringReader(xml)); - MXParser xpp = p.parser; - xpp.defineEntityReplacementText("nbsp", "—"); + final MXParser xpp = getMxParser(); int eventType = xpp.getEventType(); while (eventType != MXParser.END_DOCUMENT) { xpp.getStartLineNumber(); @@ -127,6 +118,20 @@ public class ParserTest { } } + private static MXParser getMxParser() throws IOException, XmlPullParserException { + String xml = """ + <?xml version='1.0'?> + <c:root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:c="uri:camel" xmlns="uri:camel-beans"> + <c:e1 a="value-1" b:a="value-2" xmlns:c="uri:cxf" xmlns:b="uri:b" /> + <watch-out-for-entities> </watch-out-for-entities> + </c:root> + """; + BaseParser p = new BaseParser(new StringReader(xml)); + MXParser xpp = p.parser; + xpp.defineEntityReplacementText("nbsp", "—"); + return xpp; + } + @Test public void parseTheEdge() throws XmlPullParserException, IOException { StringBuilder sb = new StringBuilder();
