diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml index 5e57ce28b612..1a9562c58f07 100644 --- a/its/core-it-suite/pom.xml +++ b/its/core-it-suite/pom.xml @@ -100,7 +100,7 @@ under the License. org.junit.jupiter - junit-jupiter + junit-jupiter-api diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/pom.xml index 732a0a7edcce..b01e57c751c4 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/pom.xml +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/pom.xml @@ -22,16 +22,15 @@ under the License. - - - - - - + + org.apache.maven.its.plugins + maven-it-plugins + 2.1-SNAPSHOT + ../../pom.xml + org.apache.maven.its.plugins maven-it-plugin-class-loader - 2.1-SNAPSHOT maven-plugin Maven IT Plugin :: Class Loader @@ -58,8 +57,7 @@ under the License. org.junit.jupiter - junit-jupiter - 5.13.4 + junit-jupiter-api test diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java index f30a94a8cf69..0c2b6dee3895 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java @@ -1,3 +1,21 @@ +/* + * 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.maven.plugin.coreit; /* @@ -34,107 +52,98 @@ * @author Benjamin Bentmann * */ -public class ExpressionUtilTest -{ +public class ExpressionUtilTest { @Test - public void testEvaluate() - { - Object array = new String[]{ "one", "two", "three" }; - Object list = Arrays.asList( "0", "-1", "-2" ); - Object map = Collections.singletonMap( "some.key", "value" ); + public void testEvaluate() { + Object array = new String[] {"one", "two", "three"}; + Object list = Arrays.asList("0", "-1", "-2"); + Object map = Collections.singletonMap("some.key", "value"); Object bean = new BeanTwo(); Map contexts = new HashMap<>(); - contexts.put( "array", array ); - contexts.put( "list", list ); - contexts.put( "map", map ); - contexts.put( "bean", bean ); - - assertSame( array, evaluate( "array", contexts ) ); - assertSame( array, ExpressionUtil.evaluate( "array/", contexts ).get( "array" ) ); - assertSame( list, evaluate( "list", contexts ) ); - assertSame( map, evaluate( "map", contexts ) ); - assertSame( bean, evaluate( "bean", contexts ) ); - assertNull( evaluate( "no-root", contexts ) ); - - assertEquals( 3, evaluate( "array/length", contexts ) ); - assertEquals( "three", evaluate( "array/2", contexts ) ); - assertEquals( 5, evaluate( "array/2/length", contexts ) ); - assertNull( evaluate( "array/invalid", contexts ) ); - assertNull( evaluate( "array/-1", contexts ) ); - assertNull( evaluate( "array/999", contexts ) ); - assertEquals( 3, ExpressionUtil.evaluate( "array/*", contexts ).size() ); - assertEquals( "one", ExpressionUtil.evaluate( "array/*", contexts ).get( "array/0" ) ); - assertEquals( "two", ExpressionUtil.evaluate( "array/*", contexts ).get( "array/1" ) ); - assertEquals( "three", ExpressionUtil.evaluate( "array/*", contexts ).get( "array/2" ) ); - - assertEquals( 3, evaluate( "list/size", contexts ) ); - assertEquals( "-2", evaluate( "list/2", contexts ) ); - assertNull( evaluate( "list/invalid", contexts ) ); - assertNull( evaluate( "list/-1", contexts ) ); - assertNull( evaluate( "list/999", contexts ) ); - assertEquals( 3, ExpressionUtil.evaluate( "list/*", contexts ).size() ); - assertEquals( "0", ExpressionUtil.evaluate( "list/*", contexts ).get( "list/0" ) ); - assertEquals( "-1", ExpressionUtil.evaluate( "list/*", contexts ).get( "list/1" ) ); - assertEquals( "-2", ExpressionUtil.evaluate( "list/*", contexts ).get( "list/2" ) ); - - assertEquals( 1, evaluate( "map/size", contexts ) ); - assertEquals( "value", evaluate( "map/some.key", contexts ) ); - assertNull( evaluate( "map/invalid", contexts ) ); - - assertEquals( "field", evaluate( "bean/field", contexts ) ); - assertNull( evaluate( "bean/invalid", contexts ) ); - assertEquals( "prop", evaluate( "bean/bean/prop", contexts ) ); - assertEquals( "flag", evaluate( "bean/bean/flag", contexts ) ); - assertEquals( "arg", evaluate( "bean/bean/arg", contexts ) ); + contexts.put("array", array); + contexts.put("list", list); + contexts.put("map", map); + contexts.put("bean", bean); + + assertSame(array, evaluate("array", contexts)); + assertSame(array, ExpressionUtil.evaluate("array/", contexts).get("array")); + assertSame(list, evaluate("list", contexts)); + assertSame(map, evaluate("map", contexts)); + assertSame(bean, evaluate("bean", contexts)); + assertNull(evaluate("no-root", contexts)); + + assertEquals(3, evaluate("array/length", contexts)); + assertEquals("three", evaluate("array/2", contexts)); + assertEquals(5, evaluate("array/2/length", contexts)); + assertNull(evaluate("array/invalid", contexts)); + assertNull(evaluate("array/-1", contexts)); + assertNull(evaluate("array/999", contexts)); + assertEquals(3, ExpressionUtil.evaluate("array/*", contexts).size()); + assertEquals("one", ExpressionUtil.evaluate("array/*", contexts).get("array/0")); + assertEquals("two", ExpressionUtil.evaluate("array/*", contexts).get("array/1")); + assertEquals("three", ExpressionUtil.evaluate("array/*", contexts).get("array/2")); + + assertEquals(3, evaluate("list/size", contexts)); + assertEquals("-2", evaluate("list/2", contexts)); + assertNull(evaluate("list/invalid", contexts)); + assertNull(evaluate("list/-1", contexts)); + assertNull(evaluate("list/999", contexts)); + assertEquals(3, ExpressionUtil.evaluate("list/*", contexts).size()); + assertEquals("0", ExpressionUtil.evaluate("list/*", contexts).get("list/0")); + assertEquals("-1", ExpressionUtil.evaluate("list/*", contexts).get("list/1")); + assertEquals("-2", ExpressionUtil.evaluate("list/*", contexts).get("list/2")); + + assertEquals(1, evaluate("map/size", contexts)); + assertEquals("value", evaluate("map/some.key", contexts)); + assertNull(evaluate("map/invalid", contexts)); + + assertEquals("field", evaluate("bean/field", contexts)); + assertNull(evaluate("bean/invalid", contexts)); + assertEquals("prop", evaluate("bean/bean/prop", contexts)); + assertEquals("flag", evaluate("bean/bean/flag", contexts)); + assertEquals("arg", evaluate("bean/bean/arg", contexts)); } - private static Object evaluate( String expression, Object context ) - { - return ExpressionUtil.evaluate( expression, context ).get( expression ); + private static Object evaluate(String expression, Object context) { + return ExpressionUtil.evaluate(expression, context).get(expression); } @Test - public void testGetProperty() - { + public void testGetProperty() { BeanOne bean1 = new BeanOne(); BeanTwo bean2 = new BeanTwo(); - assertEquals( bean1.isFlag(), ExpressionUtil.getProperty( bean1, "flag" ) ); - assertEquals( bean1.getProp(), ExpressionUtil.getProperty( bean1, "prop" ) ); - assertEquals( bean1.get( "get" ), ExpressionUtil.getProperty( bean1, "get" ) ); + assertEquals(bean1.isFlag(), ExpressionUtil.getProperty(bean1, "flag")); + assertEquals(bean1.getProp(), ExpressionUtil.getProperty(bean1, "prop")); + assertEquals(bean1.get("get"), ExpressionUtil.getProperty(bean1, "get")); - assertNull( ExpressionUtil.getProperty( bean2, "invalid" ) ); - assertEquals( bean2.field, ExpressionUtil.getProperty( bean2, "field" ) ); - assertSame( bean2.bean, ExpressionUtil.getProperty( bean2, "bean" ) ); + assertNull(ExpressionUtil.getProperty(bean2, "invalid")); + assertEquals(bean2.field, ExpressionUtil.getProperty(bean2, "field")); + assertSame(bean2.bean, ExpressionUtil.getProperty(bean2, "bean")); - assertEquals( 0, ExpressionUtil.getProperty( new String[0], "length" ) ); + assertEquals(0, ExpressionUtil.getProperty(new String[0], "length")); } - public static class BeanOne - { - public String isFlag() - { + public static class BeanOne { + public String isFlag() { return "flag"; } - public String getProp() - { + public String getProp() { return "prop"; } - public String get( String arg ) - { + public String get(String arg) { return arg; } } - public static class BeanTwo - { + @SuppressWarnings("checkstyle:VisibilityModifier") + public static class BeanTwo { public String field = "field"; public BeanOne bean = new BeanOne(); - } } diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/pom.xml index a849452f3e47..2f60dd74dffa 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/pom.xml +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/pom.xml @@ -37,29 +37,4 @@ under the License. dep-b dep-c - - - - - - com.diffplug.spotless - spotless-maven-plugin - - - - src/main/java/**/*.java - maven-it-plugin-class-loader/src/main/java/**/*.java - - - - - pom.xml - maven-it-plugin-class-loader/pom.xml - - - - - - - diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml index 01948ed89ae0..c2b2a83b0d30 100644 --- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml +++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/pom.xml @@ -47,7 +47,7 @@ under the License. org.junit.jupiter - junit-jupiter + junit-jupiter-api test diff --git a/its/core-it-support/maven-it-helper/pom.xml b/its/core-it-support/maven-it-helper/pom.xml index ae2d88e65cb4..0bc21b465c87 100644 --- a/its/core-it-support/maven-it-helper/pom.xml +++ b/its/core-it-support/maven-it-helper/pom.xml @@ -49,7 +49,7 @@ under the License. org.junit.jupiter - junit-jupiter + junit-jupiter-api diff --git a/its/pom.xml b/its/pom.xml index e557d01e7392..033c4da22cf2 100644 --- a/its/pom.xml +++ b/its/pom.xml @@ -252,11 +252,6 @@ under the License. maven-verifier 2.0.0-M1 - - org.junit.jupiter - junit-jupiter - 5.13.4 - org.apache.maven.plugin-tools maven-plugin-tools-java