diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b7935eb7..5b80ba48a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,8 @@ files. deprecated - Added a `JpmsResourceLocator` as an additional `ResourceLocator` to allow finding resources when running in a JPMS context (requires additional module `airline-jpms-resources`) + - **BREAKING** - Only `@AirlineModule` is used as a composition annotation by default, use of the older + `@javax.inject.Inject` or `@jakarta.inject.Inject` annotations **MUST** now be explicitly configured. - Help Improvements - Added an `@SeeAlso` annotation to Airline Core (#51) - **BREAKING** - `airline-help-bash` has moved `@BashCompletion` annotation into @@ -29,7 +31,7 @@ files. - A `ParserBuilder` created by calling `withParser()` on a `CliBuilder` can now return control back to its parent via the `parent()` method for cleaner Fluid CLI definitions - Dependency Updates - - Minimum JDK Version is now 11 + - **BREAKING** - Minimum JDK Version is now 11 - Apache Commons Collections upgraded to 4.4 - Apache Commons Lang upgraded to 3.14.0 - `jakarta.inject` and `airline-backcompat-javaxinject` were made `optional` so will no longer be pulled in diff --git a/Migrating.md b/Migrating.md index 55b128f37..f97279ca4 100644 --- a/Migrating.md +++ b/Migrating.md @@ -14,11 +14,14 @@ this annotation was moved into a new sub-package `com.github.rvesse.airline.anno ## Inject Dependencies are now optional -As noted in [Migrating to Airline 2.9](#migration-to-airline-29) Airline is moving away from usage of the `@Inject` +As noted in [Migrating to Airline 2.9](#migration-to-airline-29) Airline is moving away from usage of the `@Inject` annotation for composition in favour of its own `@AirlineModule` annotation. As part of this move the `jakarta. -inject-api` and `airline-backcompat-javaxinject` dependencies became `optional` in 3.0.0. This means that if you have an -existing Airline based application that is using `@Inject` annotations you must now provide the relevant dependency -yourself as you will not automatically pick it up as a transitive dependency of Airline. +inject-api` and `airline-backcompat-javaxinject` dependencies became `optional` in `3.0.0`. This means that if you have +an existing Airline based application that is using `@Inject` annotations you **MUST** now provide the relevant +dependency yourself as you will not automatically pick it up as a transitive dependency of Airline. + +You **MUST** also explicitly configure the `@Parser` configuration to use the old composition annotations if you still +need to use these. # Migration to Airline 2.9 diff --git a/airline-core/pom.xml b/airline-core/pom.xml index 7472fee01..d509a1f49 100644 --- a/airline-core/pom.xml +++ b/airline-core/pom.xml @@ -17,7 +17,6 @@ ${project.parent.basedir} true - com.github.rvesse.airline diff --git a/airline-core/src/main/java/com/github/rvesse/airline/annotations/help/Version.java b/airline-core/src/main/java/com/github/rvesse/airline/annotations/help/Version.java index f35bebe8c..a48d04099 100644 --- a/airline-core/src/main/java/com/github/rvesse/airline/annotations/help/Version.java +++ b/airline-core/src/main/java/com/github/rvesse/airline/annotations/help/Version.java @@ -23,6 +23,7 @@ import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.FileLocator; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; @Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @@ -127,6 +128,7 @@ */ Class[] sourceLocators() default { ClasspathLocator.class, + ModulePathLocator.class, FileLocator.class }; } diff --git a/airline-core/src/main/java/com/github/rvesse/airline/builder/ParserBuilder.java b/airline-core/src/main/java/com/github/rvesse/airline/builder/ParserBuilder.java index 22311f8db..9e30b69df 100644 --- a/airline-core/src/main/java/com/github/rvesse/airline/builder/ParserBuilder.java +++ b/airline-core/src/main/java/com/github/rvesse/airline/builder/ParserBuilder.java @@ -135,12 +135,9 @@ public ParserBuilder withCompositionAnnotations(String... annotationClassName *

* *

- * NB: Future releases will reduce the default set to just + * NB: As of {@code 3.0.0) the default set was reduced to just * {@code com.github.rvesse.airline.annotations.AirlineModule} and require that users explicitly configure * additional annotation classes as they see fit. If you are not currently using a dependency injection framework * that requires some form of {@code Inject} annotation we would recommend that you transition to using @@ -151,9 +148,7 @@ public ParserBuilder withCompositionAnnotations(String... annotationClassName * @since 2.9.0 */ public ParserBuilder withDefaultCompositionAnnotations() { - return withCompositionAnnotations(AirlineModule.class.getCanonicalName(), MetadataLoader.JAVAX_INJECT_INJECT, - MetadataLoader.JAKARTA_INJECT_INJECT, - MetadataLoader.COM_GOOGLE_INJECT_INJECT); + return withCompositionAnnotations(AirlineModule.class.getCanonicalName()); } /** @@ -574,15 +569,15 @@ public ParserBuilder withFlagNegationPrefix(String prefix) { /** * Gets the parent CLI builder (if any) - * + * * @return Parent CLI builder - * @throws IllegalStateException - * Thrown if there is no parent CLI builder + * @throws IllegalStateException Thrown if there is no parent CLI builder */ public CliBuilder parent() { - if (this.cliBuilder == null) + if (this.cliBuilder == null) { throw new IllegalStateException( "This Parser Builder was not created via a CLI builder and so cannot call parent() to obtain a parent CLI builder"); + } return this.cliBuilder; } diff --git a/airline-core/src/main/java/com/github/rvesse/airline/model/MetadataLoader.java b/airline-core/src/main/java/com/github/rvesse/airline/model/MetadataLoader.java index cacca713e..2a0699539 100644 --- a/airline-core/src/main/java/com/github/rvesse/airline/model/MetadataLoader.java +++ b/airline-core/src/main/java/com/github/rvesse/airline/model/MetadataLoader.java @@ -57,6 +57,11 @@ */ public class MetadataLoader { + /** + * Constant for the {@link AirlineModule} annotation class + */ + public static final String AIRLINE_MODULE = "com.github.rvesse.airline.annotations.AirlineModule"; + /** * Constant for the {@code javax.inject.Inject} annotation class */ @@ -574,14 +579,9 @@ public static SuggesterMetadata loadSuggester(Class suggest * migrated into the {@code jakarta} namespace. As of 2.9.0 Airline makes the choice of annotation * fully configurable via the parser configuration. To avoid potential class loading issues these are specified as * string class names with the metadata loader dynamically loading the relevant annotation classes if they are - * present on the runtime classpath. For backwards compatibility if this piece of configuration is not customised - * then we support the following annotations by default: - *

- * + * present on the runtime classpath. As of 3.10.0 we only look for our own {@link AirlineModule} + * annotation and any other composition annotation e.g. {@code jakarta.inject.Inject} MUST be + * explicitly configured. * * @param type Class * @param parserConfig Parser Configuration diff --git a/airline-core/src/main/java/com/github/rvesse/airline/parser/resources/ModulePathLocator.java b/airline-core/src/main/java/com/github/rvesse/airline/parser/resources/ModulePathLocator.java new file mode 100644 index 000000000..549a5532e --- /dev/null +++ b/airline-core/src/main/java/com/github/rvesse/airline/parser/resources/ModulePathLocator.java @@ -0,0 +1,67 @@ +/** + * Copyright (C) 2010-16 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 com.github.rvesse.airline.parser.resources; + +import java.io.IOException; +import java.io.InputStream; + +public class ModulePathLocator implements ResourceLocator { + @Override + public InputStream open(String searchLocation, String filename) throws IOException { + if (searchLocation == null) { + return null; + } + + // Strip off Classpath URI prefix if present + if (searchLocation.startsWith(ClasspathLocator.CLASSPATH_URI_PREFIX)) { + searchLocation = searchLocation.substring(ClasspathLocator.CLASSPATH_URI_PREFIX.length()); + } + + // Strip off leading / if present + // This is because when running on the Module Path the JVM translates the package name of the resource + // to its associated module by simply replacing / characters with . characters. Thus, if we have a leading + // slash we end up with an invalid module name like .foo.bar instead of foo.bar as was intended. And as a + // result we never correctly locate resources when running on the Module Path if we didn't do this. + if (searchLocation.startsWith("/")) { + searchLocation = searchLocation.length() > 1 ? searchLocation.substring(1) : ""; + } + + // Build the expected resource name + StringBuilder resourceName = new StringBuilder(); + resourceName.append(searchLocation); + if (!searchLocation.endsWith("/") && searchLocation.length() > 0) { + resourceName.append("/"); + } + resourceName.append(filename); + + // Try to open the classpath resource + InputStream resourceStream = ClassLoader.getSystemResourceAsStream(resourceName.toString()); + if (resourceStream != null) { + return resourceStream; + } + + // If the search location is not a package then return that directly if + // it is a valid location + if (!searchLocation.endsWith("/")) { + InputStream locStream = ClassLoader.getSystemResourceAsStream(searchLocation); + if (locStream != null) { + return locStream; + } + } + + return null; + } +} diff --git a/airline-core/src/main/java/com/github/rvesse/airline/restrictions/factories/RestrictionRegistry.java b/airline-core/src/main/java/com/github/rvesse/airline/restrictions/factories/RestrictionRegistry.java index 888a7d2bb..af3cf5181 100644 --- a/airline-core/src/main/java/com/github/rvesse/airline/restrictions/factories/RestrictionRegistry.java +++ b/airline-core/src/main/java/com/github/rvesse/airline/restrictions/factories/RestrictionRegistry.java @@ -16,10 +16,8 @@ package com.github.rvesse.airline.restrictions.factories; import java.lang.annotation.Annotation; -import java.util.HashMap; -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; +import java.util.*; +import java.util.function.Function; import com.github.rvesse.airline.restrictions.ArgumentsRestriction; import com.github.rvesse.airline.restrictions.GlobalRestriction; @@ -30,9 +28,12 @@ */ public class RestrictionRegistry { - private static final Map, OptionRestrictionFactory> OPTION_RESTRICTION_FACTORIES = new HashMap<>(); - private static final Map, ArgumentsRestrictionFactory> ARGUMENT_RESTRICTION_FACTORIES = new HashMap<>(); - private static final Map, GlobalRestrictionFactory> GLOBAL_RESTRICTION_FACTORIES = new HashMap<>(); + private static final Map, OptionRestrictionFactory> OPTION_RESTRICTION_FACTORIES = + new HashMap<>(); + private static final Map, ArgumentsRestrictionFactory> ARGUMENT_RESTRICTION_FACTORIES = + new HashMap<>(); + private static final Map, GlobalRestrictionFactory> GLOBAL_RESTRICTION_FACTORIES = + new HashMap<>(); private static volatile boolean init = false; @@ -40,36 +41,37 @@ public class RestrictionRegistry { init(); } + static void loadRestrictions(Class cls, Function>> annotationsSelector, + Map, T> registry) { + try { + ServiceLoader factories = ServiceLoader.load(cls); + Iterator iter = factories.iterator(); + while (iter.hasNext()) { + T factory = iter.next(); + for (Class annotationClass : annotationsSelector.apply(factory)) { + registry.put(annotationClass, factory); + } + } + } catch (Throwable e) { + System.err.println("Failed to load " + cls.getSimpleName() + ": " + e.getMessage()); + } + } + /** - * Initializes the base set of restrictions using the {@link ServiceLoader} - * mechanism + * Initializes the base set of restrictions using the {@link ServiceLoader} mechanism */ static synchronized void init() { - if (init) + if (init) { return; + } // Use ServerLoader to obtain restrictions - ServiceLoader optionRestrictionFactories = ServiceLoader - .load(OptionRestrictionFactory.class); - for (OptionRestrictionFactory factory : optionRestrictionFactories) { - for (Class cls : factory.supportedOptionAnnotations()) { - OPTION_RESTRICTION_FACTORIES.put(cls, factory); - } - } - ServiceLoader argumentsRestrictionFactories = ServiceLoader - .load(ArgumentsRestrictionFactory.class); - for (ArgumentsRestrictionFactory factory : argumentsRestrictionFactories) { - for (Class cls : factory.supportedArgumentsAnnotations()) { - ARGUMENT_RESTRICTION_FACTORIES.put(cls, factory); - } - } - ServiceLoader globalRestrictionFactories = ServiceLoader - .load(GlobalRestrictionFactory.class); - for (GlobalRestrictionFactory factory : globalRestrictionFactories) { - for (Class cls : factory.supportedGlobalAnnotations()) { - GLOBAL_RESTRICTION_FACTORIES.put(cls, factory); - } - } + loadRestrictions(OptionRestrictionFactory.class, x -> x.supportedOptionAnnotations(), + OPTION_RESTRICTION_FACTORIES); + loadRestrictions(ArgumentsRestrictionFactory.class, x -> x.supportedArgumentsAnnotations(), + ARGUMENT_RESTRICTION_FACTORIES); + loadRestrictions(GlobalRestrictionFactory.class, x -> x.supportedGlobalAnnotations(), + GLOBAL_RESTRICTION_FACTORIES); init = true; } @@ -90,22 +92,25 @@ public static Set> getOptionRestrictionAnnotationCla } public static void addOptionRestriction(Class cls, OptionRestrictionFactory factory) { - if (cls == null) + if (cls == null) { throw new NullPointerException("cls cannot be null"); + } OPTION_RESTRICTION_FACTORIES.put(cls, factory); } public static OptionRestriction getOptionRestriction(Class cls, - T annotation) { + T annotation) { OptionRestrictionFactory factory = OPTION_RESTRICTION_FACTORIES.get(cls); - if (factory != null) + if (factory != null) { return factory.createOptionRestriction(annotation); + } return null; } public static void addArgumentsRestriction(Class cls, ArgumentsRestrictionFactory factory) { - if (cls == null) + if (cls == null) { throw new NullPointerException("cls cannot be null"); + } ARGUMENT_RESTRICTION_FACTORIES.put(cls, factory); } @@ -114,10 +119,11 @@ public static Set> getArgumentsRestrictionAnnotation } public static ArgumentsRestriction getArgumentsRestriction(Class cls, - T annotation) { + T annotation) { ArgumentsRestrictionFactory factory = ARGUMENT_RESTRICTION_FACTORIES.get(cls); - if (factory != null) + if (factory != null) { return factory.createArgumentsRestriction(annotation); + } return null; } @@ -126,16 +132,18 @@ public static Set> getGlobalRestrictionAnnotationCla } public static void addGlobalRestriction(Class cls, GlobalRestrictionFactory factory) { - if (cls == null) + if (cls == null) { throw new NullPointerException("cls cannot be null"); + } GLOBAL_RESTRICTION_FACTORIES.put(cls, factory); } public static GlobalRestriction getGlobalRestriction(Class cls, - T annotation) { + T annotation) { GlobalRestrictionFactory factory = GLOBAL_RESTRICTION_FACTORIES.get(cls); - if (factory != null) + if (factory != null) { return factory.createGlobalRestriction(annotation); + } return null; } } diff --git a/airline-core/src/main/moditect/module-info.java b/airline-core/src/main/java/module-info.java similarity index 97% rename from airline-core/src/main/moditect/module-info.java rename to airline-core/src/main/java/module-info.java index 9cd3dfa4a..ea900aedf 100644 --- a/airline-core/src/main/moditect/module-info.java +++ b/airline-core/src/main/java/module-info.java @@ -20,10 +20,6 @@ requires org.apache.commons.lang3; requires org.apache.commons.collections4; - // Optional dependencies that a user might choose to add - requires static java.inject; - requires static jakarta.inject; - // Exported packages exports com.github.rvesse.airline; exports com.github.rvesse.airline.annotations; @@ -72,6 +68,7 @@ com.github.rvesse.airline.restrictions.factories.PathRestrictionFactory, com.github.rvesse.airline.restrictions.factories.PortRestrictionFactory, com.github.rvesse.airline.restrictions.factories.RangeRestrictionFactory, + com.github.rvesse.airline.restrictions.factories.RequireFromRestrictionFactory, com.github.rvesse.airline.restrictions.factories.SimpleRestrictionsFactory, com.github.rvesse.airline.restrictions.factories.StringRestrictionFactory; diff --git a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.ChannelFactory b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.ChannelFactory index 6928ff85d..7e9b4987b 100644 --- a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.ChannelFactory +++ b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.ChannelFactory @@ -1 +1 @@ -com.github.rvesse.airline.SystemChannelFactory \ No newline at end of file +com.github.rvesse.airline.SystemChannelFactory diff --git a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.help.sections.factories.HelpSectionFactory b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.help.sections.factories.HelpSectionFactory index e9601d59d..89c9224cb 100644 --- a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.help.sections.factories.HelpSectionFactory +++ b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.help.sections.factories.HelpSectionFactory @@ -1 +1 @@ -com.github.rvesse.airline.help.sections.factories.CommonSectionsFactory \ No newline at end of file +com.github.rvesse.airline.help.sections.factories.CommonSectionsFactory diff --git a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.ArgumentsRestrictionFactory b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.ArgumentsRestrictionFactory index 7b4512ad6..6301f37a3 100644 --- a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.ArgumentsRestrictionFactory +++ b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.ArgumentsRestrictionFactory @@ -4,6 +4,6 @@ com.github.rvesse.airline.restrictions.factories.OccurrencesRestrictionFactory com.github.rvesse.airline.restrictions.factories.PathRestrictionFactory com.github.rvesse.airline.restrictions.factories.PortRestrictionFactory com.github.rvesse.airline.restrictions.factories.RangeRestrictionFactory +com.github.rvesse.airline.restrictions.factories.RequireFromRestrictionFactory com.github.rvesse.airline.restrictions.factories.SimpleRestrictionsFactory com.github.rvesse.airline.restrictions.factories.StringRestrictionFactory -com.github.rvesse.airline.restrictions.factories.RequireFromRestrictionFactory \ No newline at end of file diff --git a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.GlobalRestrictionFactory b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.GlobalRestrictionFactory index e1caf875f..18f5563d4 100644 --- a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.GlobalRestrictionFactory +++ b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.GlobalRestrictionFactory @@ -1,2 +1,2 @@ #com.github.rvesse.airline.restrictions.factories. -com.github.rvesse.airline.restrictions.factories.StandardGlobalRestrictionsFactory \ No newline at end of file +com.github.rvesse.airline.restrictions.factories.StandardGlobalRestrictionsFactory diff --git a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.OptionRestrictionFactory b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.OptionRestrictionFactory index 964f0d453..c8ae8054b 100644 --- a/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.OptionRestrictionFactory +++ b/airline-core/src/main/resources/META-INF/services/com.github.rvesse.airline.restrictions.factories.OptionRestrictionFactory @@ -7,4 +7,4 @@ com.github.rvesse.airline.restrictions.factories.RangeRestrictionFactory com.github.rvesse.airline.restrictions.factories.RequiredOnlyIfRestrictionFactory com.github.rvesse.airline.restrictions.factories.RequireFromRestrictionFactory com.github.rvesse.airline.restrictions.factories.SimpleRestrictionsFactory -com.github.rvesse.airline.restrictions.factories.StringRestrictionFactory \ No newline at end of file +com.github.rvesse.airline.restrictions.factories.StringRestrictionFactory diff --git a/airline-core/src/test/java/com/github/rvesse/airline/ArgsRequiredWrongMain.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/ArgsRequiredWrongMain.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/ArgsRequiredWrongMain.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/ArgsRequiredWrongMain.java index ef2ff8450..3576c354b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/ArgsRequiredWrongMain.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/ArgsRequiredWrongMain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/ChannelsTest.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/ChannelsTest.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/ChannelsTest.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/ChannelsTest.java index b7eeef366..b5bc70098 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/ChannelsTest.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/ChannelsTest.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.Channels; import org.testng.annotations.Test; import java.io.*; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/CustomModule.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/CustomModule.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/CustomModule.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/CustomModule.java index 1b0c5ced9..9f74732e5 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/CustomModule.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/CustomModule.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/Git.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/Git.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/Git.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/Git.java index 7acad8455..5ce711079 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/Git.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/Git.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation.java similarity index 86% rename from airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation.java index 78879e1e8..1455c993d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteAdd; -import com.github.rvesse.airline.Git.RemoteShow; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteAdd; +import com.github.rvesse.airline.tests.Git.RemoteShow; import com.github.rvesse.airline.annotations.Cli; import com.github.rvesse.airline.annotations.Group; -import com.github.rvesse.airline.annotations.Parser; import com.github.rvesse.airline.help.Help; //@formatter:off diff --git a/airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation2.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation2.java similarity index 89% rename from airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation2.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation2.java index 51863819c..35f79140e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/GitWithCliAnnotation2.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/GitWithCliAnnotation2.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteAdd; -import com.github.rvesse.airline.Git.RemoteShow; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteAdd; +import com.github.rvesse.airline.tests.Git.RemoteShow; import com.github.rvesse.airline.annotations.Alias; import com.github.rvesse.airline.annotations.Cli; import com.github.rvesse.airline.annotations.Group; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/MutuallyExclusiveOptions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/MutuallyExclusiveOptions.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/MutuallyExclusiveOptions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/MutuallyExclusiveOptions.java index 0891688c0..6c91db315 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/MutuallyExclusiveOptions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/MutuallyExclusiveOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/Ping.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/Ping.java similarity index 91% rename from airline-core/src/test/java/com/github/rvesse/airline/Ping.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/Ping.java index e8a2ffaec..3066432f2 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/Ping.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/Ping.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.HelpOption; +import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestArityGreediness.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestArityGreediness.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/TestArityGreediness.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestArityGreediness.java index 9788a9b9b..e07ec005a 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestArityGreediness.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestArityGreediness.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import static com.github.rvesse.airline.SingleCommand.singleCommand; import static org.testng.Assert.assertEquals; import org.testng.Assert; import org.testng.annotations.Test; -import com.github.rvesse.airline.args.ArgsArityGreediness; +import com.github.rvesse.airline.tests.args.ArgsArityGreediness; import com.github.rvesse.airline.builder.ParserBuilder; import com.github.rvesse.airline.model.ParserMetadata; import com.github.rvesse.airline.parser.errors.ParseOptionMissingValueException; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestCommand.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommand.java similarity index 89% rename from airline-core/src/test/java/com/github/rvesse/airline/TestCommand.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommand.java index b977ecd67..4b2e0278b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestCommand.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommand.java @@ -13,38 +13,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import com.github.rvesse.airline.Cli; +import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.args.Args2; -import com.github.rvesse.airline.args.ArgsAllowedValues; -import com.github.rvesse.airline.args.ArgsArityLimited; -import com.github.rvesse.airline.args.ArgsArityString; -import com.github.rvesse.airline.args.ArgsBooleanArity; -import com.github.rvesse.airline.args.ArgsBooleanArity0; -import com.github.rvesse.airline.args.ArgsDefaultOption; -import com.github.rvesse.airline.args.ArgsDefaultOptionAndArguments; -import com.github.rvesse.airline.args.ArgsDefaultOptionBadArity; -import com.github.rvesse.airline.args.ArgsDefaultOptionGlobalScope; -import com.github.rvesse.airline.args.ArgsDefaultOptionGroupScope; -import com.github.rvesse.airline.args.ArgsEnum; -import com.github.rvesse.airline.args.ArgsInherited; -import com.github.rvesse.airline.args.ArgsMultipleDefaultOptions; -import com.github.rvesse.airline.args.ArgsMultipleUnparsed; -import com.github.rvesse.airline.args.ArgsNoArguments; -import com.github.rvesse.airline.args.ArgsNoArgumentsIgnored; -import com.github.rvesse.airline.args.ArgsOutOfMemory; -import com.github.rvesse.airline.args.ArgsPrivate; -import com.github.rvesse.airline.args.ArgsRequired; -import com.github.rvesse.airline.args.ArgsSingleChar; -import com.github.rvesse.airline.args.Arity1; -import com.github.rvesse.airline.args.OptionsRequired; -import com.github.rvesse.airline.command.CommandAdd; -import com.github.rvesse.airline.command.CommandCommit; +import com.github.rvesse.airline.tests.args.Args1; +import com.github.rvesse.airline.tests.args.Args2; +import com.github.rvesse.airline.tests.args.ArgsAllowedValues; +import com.github.rvesse.airline.tests.args.ArgsArityLimited; +import com.github.rvesse.airline.tests.args.ArgsArityString; +import com.github.rvesse.airline.tests.args.ArgsBooleanArity; +import com.github.rvesse.airline.tests.args.ArgsBooleanArity0; +import com.github.rvesse.airline.tests.args.ArgsDefaultOption; +import com.github.rvesse.airline.tests.args.ArgsDefaultOptionAndArguments; +import com.github.rvesse.airline.tests.args.ArgsDefaultOptionBadArity; +import com.github.rvesse.airline.tests.args.ArgsDefaultOptionGlobalScope; +import com.github.rvesse.airline.tests.args.ArgsDefaultOptionGroupScope; +import com.github.rvesse.airline.tests.args.ArgsEnum; +import com.github.rvesse.airline.tests.args.ArgsInherited; +import com.github.rvesse.airline.tests.args.ArgsMultipleDefaultOptions; +import com.github.rvesse.airline.tests.args.ArgsMultipleUnparsed; +import com.github.rvesse.airline.tests.args.ArgsNoArguments; +import com.github.rvesse.airline.tests.args.ArgsNoArgumentsIgnored; +import com.github.rvesse.airline.tests.args.ArgsOutOfMemory; +import com.github.rvesse.airline.tests.args.ArgsPrivate; +import com.github.rvesse.airline.tests.args.ArgsRequired; +import com.github.rvesse.airline.tests.args.ArgsSingleChar; +import com.github.rvesse.airline.tests.args.Arity1; +import com.github.rvesse.airline.tests.args.OptionsRequired; +import com.github.rvesse.airline.tests.command.CommandAdd; +import com.github.rvesse.airline.tests.command.CommandCommit; import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.parser.ParseResult; import com.github.rvesse.airline.parser.errors.ParseArgumentsUnexpectedException; @@ -62,10 +63,10 @@ import java.util.Arrays; import java.util.List; -import static com.github.rvesse.airline.TestingUtil.singleAbbreviatedCommandParser; -import static com.github.rvesse.airline.TestingUtil.singleAbbreviatedOptionParser; -import static com.github.rvesse.airline.TestingUtil.singleCommandParser; -import static com.github.rvesse.airline.TestingUtil.singleCli; +import static com.github.rvesse.airline.tests.TestingUtil.singleAbbreviatedCommandParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleAbbreviatedOptionParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleCommandParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleCli; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestCommandSuppression.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommandSuppression.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/TestCommandSuppression.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommandSuppression.java index 98c851d1b..972c0f4b2 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestCommandSuppression.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestCommandSuppression.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.github.rvesse.airline.tests; -package com.github.rvesse.airline; - +import com.github.rvesse.airline.Cli; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestDefaultCommand.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestDefaultCommand.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/TestDefaultCommand.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestDefaultCommand.java index 3ce83db50..e5709fd1c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestDefaultCommand.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestDefaultCommand.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import java.util.ArrayList; import java.util.List; +import com.github.rvesse.airline.Cli; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParser.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParser.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParser.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParser.java index fd4ed80b2..a510b26c8 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParser.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParser.java @@ -13,8 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.Cli; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; @@ -24,7 +25,7 @@ import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.model.GlobalMetadata; -import com.github.rvesse.airline.utils.AirlineTestUtils; +import com.github.rvesse.airline.tests.utils.AirlineTestUtils; import com.github.rvesse.airline.utils.predicates.parser.CommandFinder; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -35,7 +36,7 @@ import java.util.List; import static com.github.rvesse.airline.annotations.OptionType.GLOBAL; -import static com.github.rvesse.airline.utils.AirlineTestUtils.toStringHelper; +import static com.github.rvesse.airline.tests.utils.AirlineTestUtils.toStringHelper; public class TestGalaxyCommandLineParser { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParserByAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParserByAnnotation.java similarity index 61% rename from airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParserByAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParserByAnnotation.java index ef8e0de7c..b42762d86 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestGalaxyCommandLineParserByAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGalaxyCommandLineParserByAnnotation.java @@ -13,23 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.Cli; import org.testng.annotations.Test; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.AgentAddCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.AgentShowCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.AgentTerminateCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.HelpCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.InstallCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.ResetToActualCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.RestartCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.ShowCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.SshCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.StartCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.StopCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.TerminateCommand; -import com.github.rvesse.airline.TestGalaxyCommandLineParser.UpgradeCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.AgentAddCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.AgentShowCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.AgentTerminateCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.HelpCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.InstallCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.ResetToActualCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.RestartCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.ShowCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.SshCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.StartCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.StopCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.TerminateCommand; +import com.github.rvesse.airline.tests.TestGalaxyCommandLineParser.UpgradeCommand; import com.github.rvesse.airline.annotations.Group; @Test diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestGit.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGit.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/TestGit.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestGit.java index 3cc4e2e48..6aabb2dfc 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestGit.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestGitByAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGitByAnnotation.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/TestGitByAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestGitByAnnotation.java index 123e8a608..6366d1cb4 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestGitByAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestGitByAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import org.apache.commons.lang3.StringUtils; import org.testng.Assert; @@ -22,7 +22,6 @@ import com.github.rvesse.airline.builder.ParserBuilder; import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.model.ParserMetadata; -import com.github.rvesse.airline.parser.errors.ParseCommandUnrecognizedException; public class TestGitByAnnotation { @Test diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestHelp.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestHelp.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/TestHelp.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestHelp.java index 26f29760d..ce1e63737 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestHelp.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestHelp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -26,48 +26,49 @@ import com.github.rvesse.airline.Cli; import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.builder.CliBuilder; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteAdd; -import com.github.rvesse.airline.Git.RemoteShow; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.args.Args2; -import com.github.rvesse.airline.args.ArgsAllowedValues; -import com.github.rvesse.airline.args.ArgsArityString; -import com.github.rvesse.airline.args.ArgsArityStringPartialTitles; -import com.github.rvesse.airline.args.ArgsBooleanArity; -import com.github.rvesse.airline.args.ArgsCopyrightAndLicense; -import com.github.rvesse.airline.args.ArgsExamples; -import com.github.rvesse.airline.args.ArgsExitCodes; -import com.github.rvesse.airline.args.ArgsHiddenDiscussion; -import com.github.rvesse.airline.args.ArgsInherited; -import com.github.rvesse.airline.args.ArgsInheritedDiscussion; -import com.github.rvesse.airline.args.ArgsMultiLineDescription; -import com.github.rvesse.airline.args.ArgsMultiParagraphDiscussion; -import com.github.rvesse.airline.args.ArgsRequired; -import com.github.rvesse.airline.args.ArgsRestoredDiscussion; -import com.github.rvesse.airline.args.ArgsVersion; -import com.github.rvesse.airline.args.ArgsVersion2; -import com.github.rvesse.airline.args.ArgsVersion3; -import com.github.rvesse.airline.args.ArgsVersionMissing; -import com.github.rvesse.airline.args.ArgsVersionMissingSuppressed; -import com.github.rvesse.airline.args.CommandHidden; -import com.github.rvesse.airline.args.GlobalOptionsHidden; -import com.github.rvesse.airline.args.OptionsHidden; -import com.github.rvesse.airline.args.OptionsRequired; -import com.github.rvesse.airline.command.CommandRemove; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteAdd; +import com.github.rvesse.airline.tests.Git.RemoteShow; +import com.github.rvesse.airline.tests.args.Args1; +import com.github.rvesse.airline.tests.args.Args2; +import com.github.rvesse.airline.tests.args.ArgsAllowedValues; +import com.github.rvesse.airline.tests.args.ArgsArityString; +import com.github.rvesse.airline.tests.args.ArgsArityStringPartialTitles; +import com.github.rvesse.airline.tests.args.ArgsBooleanArity; +import com.github.rvesse.airline.tests.args.ArgsCopyrightAndLicense; +import com.github.rvesse.airline.tests.args.ArgsExamples; +import com.github.rvesse.airline.tests.args.ArgsExitCodes; +import com.github.rvesse.airline.tests.args.ArgsHiddenDiscussion; +import com.github.rvesse.airline.tests.args.ArgsInherited; +import com.github.rvesse.airline.tests.args.ArgsInheritedDiscussion; +import com.github.rvesse.airline.tests.args.ArgsMultiLineDescription; +import com.github.rvesse.airline.tests.args.ArgsMultiParagraphDiscussion; +import com.github.rvesse.airline.tests.args.ArgsRequired; +import com.github.rvesse.airline.tests.args.ArgsRestoredDiscussion; +import com.github.rvesse.airline.tests.args.ArgsVersion; +import com.github.rvesse.airline.tests.args.ArgsVersion2; +import com.github.rvesse.airline.tests.args.ArgsVersion3; +import com.github.rvesse.airline.tests.args.ArgsVersionMissing; +import com.github.rvesse.airline.tests.args.ArgsVersionMissingSuppressed; +import com.github.rvesse.airline.tests.args.CommandHidden; +import com.github.rvesse.airline.tests.args.GlobalOptionsHidden; +import com.github.rvesse.airline.tests.args.OptionsHidden; +import com.github.rvesse.airline.tests.args.OptionsRequired; +import com.github.rvesse.airline.tests.command.CommandRemove; import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.help.UsageHelper; import com.github.rvesse.airline.help.cli.CliCommandUsageGenerator; import com.github.rvesse.airline.help.cli.CliGlobalUsageGenerator; import com.github.rvesse.airline.help.cli.CliGlobalUsageSummaryGenerator; import com.github.rvesse.airline.help.common.AbstractCommandUsageGenerator; -import com.github.rvesse.airline.help.sections.CliWithSections; +import com.github.rvesse.airline.tests.sections.CliWithSections; import com.github.rvesse.airline.help.sections.common.VersionSection; import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; -import com.github.rvesse.airline.restrictions.Unless; -import com.github.rvesse.airline.restrictions.partial.PartialAnnotated; +import com.github.rvesse.airline.tests.restrictions.Unless; +import com.github.rvesse.airline.tests.restrictions.partial.PartialAnnotated; import com.github.rvesse.airline.utils.predicates.parser.CommandFinder; import org.apache.commons.collections4.CollectionUtils; @@ -1152,8 +1153,8 @@ public void testVersionCli() throws IOException { //@formatter:off Cli cli = new CliBuilder("test") .withCommand(Args1.class) - .withHelpSection(new VersionSection(new String[] { "/test.version" }, - new ResourceLocator[] { new ClasspathLocator() }, + .withHelpSection(new VersionSection(new String[] { "com/github/rvesse/airline/tests/test.version" }, + new ResourceLocator[] { new ModulePathLocator(), new ClasspathLocator() }, "component", "version", "build", @@ -1190,8 +1191,8 @@ public void testVersionCli2() throws IOException { Cli cli = new CliBuilder<>("test") .withCommand(Help.class) .withCommand(Args1.class) - .withHelpSection(new VersionSection(new String[] { "/test.version" }, - new ResourceLocator[] { new ClasspathLocator() }, + .withHelpSection(new VersionSection(new String[] { "com/github/rvesse/airline/tests/test.version" }, + new ResourceLocator[] { new ModulePathLocator(), new ClasspathLocator() }, "component", "version", "build", diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestOptionScope.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestOptionScope.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/TestOptionScope.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestOptionScope.java index 58e163fbf..ed0d753fc 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestOptionScope.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestOptionScope.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.github.rvesse.airline.tests; -package com.github.rvesse.airline; - +import com.github.rvesse.airline.Cli; import org.testng.Assert; import org.testng.annotations.Test; -import com.github.rvesse.airline.args.ArgsGlobal; +import com.github.rvesse.airline.tests.args.ArgsGlobal; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.parser.ParseResult; import com.github.rvesse.airline.parser.errors.handlers.CollectAll; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestParametersDelegate.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestParametersDelegate.java similarity index 92% rename from airline-core/src/test/java/com/github/rvesse/airline/TestParametersDelegate.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestParametersDelegate.java index 61b47eefd..edf38ce4d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestParametersDelegate.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestParametersDelegate.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; -import com.github.rvesse.airline.annotations.AirlineModule; -import com.github.rvesse.airline.annotations.Arguments; -import com.github.rvesse.airline.annotations.Command; -import com.github.rvesse.airline.annotations.Option; +import com.github.rvesse.airline.Cli; +import com.github.rvesse.airline.SingleCommand; +import com.github.rvesse.airline.annotations.*; import com.github.rvesse.airline.builder.ParserBuilder; +import com.github.rvesse.airline.model.MetadataLoader; import com.github.rvesse.airline.parser.errors.ParseArgumentsUnexpectedException; import com.github.rvesse.airline.parser.errors.ParseException; import jakarta.inject.Inject; @@ -30,7 +30,7 @@ import java.util.Arrays; import java.util.List; -import static com.github.rvesse.airline.TestingUtil.singleCommandParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleCommandParser; import static org.testng.Assert.*; /** @@ -40,7 +40,7 @@ * dependency injection frameworks as of 2.9.0 we moved to use our own * {@link com.github.rvesse.airline.annotations.AirlineModule} annotation. However, for backwards compatibility * purposes, we continue to support various {@code @Inject} annotations for the time being, though this will not be the - * default behaviour in the future. Therefore you will see a mixture of all different annotations within this test + * default behaviour in the future. Therefore, you will see a mixture of all different annotations within this test * class. * * @author dain @@ -111,6 +111,11 @@ public void delegatingSetsFieldsOnBothMainParamsAndTheDelegatedParams() { * This class uses three different injection delegates */ @Command(name = "command") + @Parser(compositionAnnotationClasses = { + MetadataLoader.AIRLINE_MODULE, + MetadataLoader.JAKARTA_INJECT_INJECT, + MetadataLoader.JAVAX_INJECT_INJECT + }) public static class CombinedAndNestedDelegates { public static class LeafDelegate { @Option(name = "--list") @@ -165,7 +170,7 @@ public void combinedAndNestedDelegates() { CombinedAndNestedDelegates p = singleCommandParser(CombinedAndNestedDelegates.class) .parse("-d", "234", "--list", "a", "--list", "b", "-a"); assertEquals(p.nestedDelegate2.nestedDelegate1.leafDelegate.list, - Arrays.asList(new String[] { "value1", "value2", "a", "b" })); + Arrays.asList("value1", "value2", "a", "b")); assertFalse(p.nestedDelegate2.nestedDelegate1.leafDelegate.bool); assertEquals(p.nestedDelegate2.nestedDelegate1.d, Integer.valueOf(234)); assertFalse(p.nestedDelegate2.isC); @@ -188,6 +193,8 @@ public void combinedAndNestedDelegatesWithCustomAnnotations() { SingleCommand.singleCommand(CombinedAndNestedDelegates.class, new ParserBuilder().withDefaultCompositionAnnotations() .withCompositionAnnotations( + MetadataLoader.JAVAX_INJECT_INJECT, + MetadataLoader.JAKARTA_INJECT_INJECT, CustomModule.class.getCanonicalName()) .build()) .parse("-d", "234", "--list", "a", "--list", "b", "-a", "-e"); @@ -312,7 +319,7 @@ public static class Delegate2 { @AirlineModule public Delegate1 delegate1 = new Delegate1(); - @Inject + @AirlineModule public Delegate2 delegate2 = new Delegate2(); } @@ -320,8 +327,8 @@ public static class Delegate2 { public void duplicateMainParametersAreAllowed() { DuplicateMainParametersAreAllowed value = singleCommandParser(DuplicateMainParametersAreAllowed.class).parse("main", "params"); - assertEquals(value.delegate1.mainParams1, Arrays.asList(new String[] { "main", "params" })); - assertEquals(value.delegate2.mainParams1, Arrays.asList(new String[] { "main", "params" })); + assertEquals(value.delegate1.mainParams1, Arrays.asList("main", "params")); + assertEquals(value.delegate2.mainParams1, Arrays.asList("main", "params")); } // ======================================================================================================================== diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestPing.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestPing.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/TestPing.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestPing.java index 52f1df67a..5791a4233 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestPing.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestPing.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; import org.apache.commons.lang3.StringUtils; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestSingleCommand.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestSingleCommand.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/TestSingleCommand.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestSingleCommand.java index 07a71a16e..122826001 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestSingleCommand.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestSingleCommand.java @@ -13,17 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.Cli; +import com.github.rvesse.airline.HelpOption; +import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; -import com.github.rvesse.airline.args.*; +import com.github.rvesse.airline.tests.args.*; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.builder.ParserBuilder; -import com.github.rvesse.airline.command.CommandAdd; -import com.github.rvesse.airline.command.CommandCommit; +import com.github.rvesse.airline.tests.command.CommandAdd; +import com.github.rvesse.airline.tests.command.CommandCommit; import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.model.ParserMetadata; import com.github.rvesse.airline.parser.errors.ParseException; @@ -81,7 +84,7 @@ public void simpleArgsCustomParserAnnotation() throws ParseException { // Using a customised parser // Hence abbreviating the option names is allowed Args1CustomParser args = singleCommand(Args1CustomParser.class).parse("-de", "-log", "2", "-fl", "1.2", "-do", - "1.3", "-bigd", "1.4", "-gr", "unit", "a", "b", "c"); + "1.3", "-bigd", "1.4", "-gr", "unit", "a", "b", "c"); assertTrue(args.debug); assertEquals(args.verbose.intValue(), 2); diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestSubGroups.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestSubGroups.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/TestSubGroups.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestSubGroups.java index 1c5c94b0f..90981ffa7 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestSubGroups.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestSubGroups.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteShow; +import com.github.rvesse.airline.Cli; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteShow; import com.github.rvesse.airline.annotations.Group; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.builder.GroupBuilder; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/TestingUtil.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestingUtil.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/TestingUtil.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/TestingUtil.java index 0ee1f767e..8d45ce992 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/TestingUtil.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/TestingUtil.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline; +package com.github.rvesse.airline.tests; +import com.github.rvesse.airline.Cli; +import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.model.ParserMetadata; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/Args1.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/args/Args1.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1.java index 24ce93cea..b7d407fb8 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/Args1.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/Args1CustomParser.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1CustomParser.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/Args1CustomParser.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1CustomParser.java index 2d851c1d3..8c50a314b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/Args1CustomParser.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args1CustomParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Parser; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/Args2.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args2.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/Args2.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args2.java index b65f0e41c..4f7324515 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/Args2.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Args2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsAllowedValues.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsAllowedValues.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsAllowedValues.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsAllowedValues.java index c37e2523c..82ebac973 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsAllowedValues.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsAllowedValues.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityGreediness.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityGreediness.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityGreediness.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityGreediness.java index c66892c35..f17afb309 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityGreediness.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityGreediness.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityLimited.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityLimited.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityLimited.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityLimited.java index 0401f8076..2ec4b56ae 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityLimited.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityLimited.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityString.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityString.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityString.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityString.java index 28916b401..5da9f384f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityString.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityString.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityStringPartialTitles.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityStringPartialTitles.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityStringPartialTitles.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityStringPartialTitles.java index e3f2ad52f..f9b93cb7f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsArityStringPartialTitles.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsArityStringPartialTitles.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity.java index 93ad13afb..8dc10f506 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity0.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity0.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity0.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity0.java index 8c388b124..4f4320e4c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsBooleanArity0.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsBooleanArity0.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsCopyrightAndLicense.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsCopyrightAndLicense.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsCopyrightAndLicense.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsCopyrightAndLicense.java index ae5aace08..af82f90ef 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsCopyrightAndLicense.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsCopyrightAndLicense.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Copyright; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefault.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefault.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefault.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefault.java index 0fbf2e28e..bf6cd393a 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefault.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefault.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOption.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOption.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOption.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOption.java index 40b0beaf5..c78ffa337 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOption.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.DefaultOption; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionAndArguments.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionAndArguments.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionAndArguments.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionAndArguments.java index 3ecf37348..16b28b19c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionAndArguments.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionAndArguments.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionBadArity.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionBadArity.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionBadArity.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionBadArity.java index 9525f22fc..2582ad590 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionBadArity.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionBadArity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGlobalScope.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGlobalScope.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGlobalScope.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGlobalScope.java index 9b1f38cf4..49ddaf195 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGlobalScope.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGlobalScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.DefaultOption; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGroupScope.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGroupScope.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGroupScope.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGroupScope.java index f50a4d8c3..ed5cb30b4 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsDefaultOptionGroupScope.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsDefaultOptionGroupScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.DefaultOption; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsEnum.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsEnum.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsEnum.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsEnum.java index 03f3628e2..e594eeff0 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsEnum.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExamples.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExamples.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExamples.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExamples.java index 77f9d5e18..468172602 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExamples.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExamples.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Examples; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExitCodes.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExitCodes.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExitCodes.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExitCodes.java index 20338feed..637f41c80 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsExitCodes.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsExitCodes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.ExitCodes; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsFlagNegation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsFlagNegation.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsFlagNegation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsFlagNegation.java index 4da321bb7..5f04fc395 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsFlagNegation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsFlagNegation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsGlobal.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsGlobal.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsGlobal.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsGlobal.java index 82308cba9..ed72952b0 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsGlobal.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsGlobal.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsHiddenDiscussion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsHiddenDiscussion.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsHiddenDiscussion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsHiddenDiscussion.java index 97c9ae5b3..00e33b188 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsHiddenDiscussion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsHiddenDiscussion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.HideSection; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInherited.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInherited.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInherited.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInherited.java index 9071a824e..118d2b46e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInherited.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInherited.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInheritedDiscussion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInheritedDiscussion.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInheritedDiscussion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInheritedDiscussion.java index 2f28567c1..3c8351f17 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsInheritedDiscussion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsInheritedDiscussion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiLineDescription.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiLineDescription.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiLineDescription.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiLineDescription.java index bf71da638..c8fe1fbff 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiLineDescription.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiLineDescription.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiParagraphDiscussion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiParagraphDiscussion.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiParagraphDiscussion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiParagraphDiscussion.java index 9fa476879..6a0b7d91a 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultiParagraphDiscussion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultiParagraphDiscussion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Discussion; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleDefaultOptions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleDefaultOptions.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleDefaultOptions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleDefaultOptions.java index 42a32eda0..63226ef1b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleDefaultOptions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleDefaultOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.DefaultOption; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleUnparsed.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleUnparsed.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleUnparsed.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleUnparsed.java index 9328c5c47..dade1c25f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsMultipleUnparsed.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsMultipleUnparsed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArguments.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArguments.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArguments.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArguments.java index 6dfa5bc31..4150be68e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArguments.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArguments.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArgumentsIgnored.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArgumentsIgnored.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArgumentsIgnored.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArgumentsIgnored.java index e0eb23d92..9902c815a 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsNoArgumentsIgnored.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsNoArgumentsIgnored.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.restrictions.Unrestricted; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsOutOfMemory.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsOutOfMemory.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsOutOfMemory.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsOutOfMemory.java index af0068ab5..d638a97f7 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsOutOfMemory.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsOutOfMemory.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsPrivate.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsPrivate.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsPrivate.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsPrivate.java index 8ed316b58..f990ed11e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsPrivate.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsPrivate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequired.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequired.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequired.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequired.java index c77c8e09d..d762e4b73 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequired.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequired.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequiredInheritedUnrestricted.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequiredInheritedUnrestricted.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequiredInheritedUnrestricted.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequiredInheritedUnrestricted.java index 8bfb97425..0a9f188b6 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRequiredInheritedUnrestricted.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRequiredInheritedUnrestricted.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRestoredDiscussion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRestoredDiscussion.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRestoredDiscussion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRestoredDiscussion.java index d75297581..c6fbfe29e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsRestoredDiscussion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsRestoredDiscussion.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Discussion; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleChar.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleChar.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleChar.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleChar.java index 85b76208a..4a4aafce4 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleChar.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleChar.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleCharCustomParser.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleCharCustomParser.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleCharCustomParser.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleCharCustomParser.java index 172c37135..492aa9602 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsSingleCharCustomParser.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsSingleCharCustomParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Parser; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion.java similarity index 85% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion.java index 53f828f77..1ff7a05c5 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Version; @Command(name = "ArgsVersion", description = "ArgsVersion description") -@Version(sources = { "/test.version" }, suppressOnError = false) +@Version(sources = { "com/github/rvesse/airline/tests/test.version" }, suppressOnError = false) public class ArgsVersion { } diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion2.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion2.java similarity index 82% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion2.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion2.java index 032a6d032..55f1560be 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion2.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Version; @@ -21,9 +21,9 @@ //@formatter:off @Command(name = "ArgsVersion", description = "Multiple component versions") @Version(sources = { - "/test.version", - "/foo.version", - "/bar.version" + "com/github/rvesse/airline/tests/test.version", + "com/github/rvesse/airline/tests/foo.version", + "com/github/rvesse/airline/tests/bar.version" }, suppressOnError = false, additionalProperties = { "author", "builtWith" }, diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion3.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion3.java similarity index 82% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion3.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion3.java index 05b495d84..c79489ed2 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersion3.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersion3.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Version; @@ -21,9 +21,9 @@ //@formatter:off @Command(name = "ArgsVersion", description = "Multiple component versions") @Version(sources = { - "/test.version", - "/foo.version", - "/bar.version" + "com/github/rvesse/airline/tests/test.version", + "com/github/rvesse/airline/tests/foo.version", + "com/github/rvesse/airline/tests/bar.version" }, suppressOnError = false, tabular = true, diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissing.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissing.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissing.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissing.java index 7a3eb6779..d9077db87 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissing.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissing.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Version; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissingSuppressed.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissingSuppressed.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissingSuppressed.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissingSuppressed.java index 89fdfb884..f6c5b8478 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/ArgsVersionMissingSuppressed.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/ArgsVersionMissingSuppressed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.Version; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/Arity1.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Arity1.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/Arity1.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/Arity1.java index d379804d2..f352fdad0 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/Arity1.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/Arity1.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/CommandHidden.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandHidden.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/CommandHidden.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandHidden.java index 2a9313b9f..898d51948 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/CommandHidden.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandHidden.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/CommandLineArgs.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandLineArgs.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/args/CommandLineArgs.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandLineArgs.java index 6b3954fdf..1ed95a752 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/CommandLineArgs.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/CommandLineArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/GlobalOptionsHidden.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/GlobalOptionsHidden.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/GlobalOptionsHidden.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/GlobalOptionsHidden.java index 4557de441..6f1673afd 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/GlobalOptionsHidden.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/GlobalOptionsHidden.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/OptionsHidden.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsHidden.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/OptionsHidden.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsHidden.java index 91fdccce3..9552b30d8 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/OptionsHidden.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsHidden.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/OptionsRequired.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsRequired.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/OptionsRequired.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsRequired.java index 2b467f7f6..ac23687c2 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/OptionsRequired.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/OptionsRequired.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args; +package com.github.rvesse.airline.tests.args; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeAddition.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeAddition.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeAddition.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeAddition.java index 3621d6d88..b6fc94e3c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeAddition.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeAddition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeChangeRestrictions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeChangeRestrictions.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeChangeRestrictions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeChangeRestrictions.java index a7b8ec301..fe59cd25c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeChangeRestrictions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeChangeRestrictions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInheritRestrictions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInheritRestrictions.java similarity index 88% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInheritRestrictions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInheritRestrictions.java index 4ddcb9742..fafbdd77c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInheritRestrictions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInheritRestrictions.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; -import com.github.rvesse.airline.args.OptionsRequired; +import com.github.rvesse.airline.tests.args.OptionsRequired; @Command(name = "ArgsMergeInheritRestrictions") public class ArgsMergeInheritRestrictions extends OptionsRequired { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInvalidTypeChange.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInvalidTypeChange.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInvalidTypeChange.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInvalidTypeChange.java index 6280bd1c6..90a5112f1 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeInvalidTypeChange.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeInvalidTypeChange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNameChange.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNameChange.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNameChange.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNameChange.java index dd9b37dc0..32ab46f50 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNameChange.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNameChange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNarrowingTypeChange.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNarrowingTypeChange.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNarrowingTypeChange.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNarrowingTypeChange.java index b81364e29..46a626d55 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeNarrowingTypeChange.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeNarrowingTypeChange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeOverride.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeOverride.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeOverride.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeOverride.java index 4994a2dbc..28104c8ef 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeOverride.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeOverride.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeParent.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeParent.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeParent.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeParent.java index 1ccd03424..4901f0e19 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeParent.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeParent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealed.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealed.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealed.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealed.java index cf985accb..55ba617da 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealed.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealedOverride.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealedOverride.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealedOverride.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealedOverride.java index 0ee8a67e8..fd8c6158a 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeSealedOverride.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeSealedOverride.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeTypeParent.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeTypeParent.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeTypeParent.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeTypeParent.java index 39bf8d161..ffe60ad23 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeTypeParent.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeTypeParent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeUndeclaredOverride.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeUndeclaredOverride.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeUndeclaredOverride.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeUndeclaredOverride.java index 244813f61..dfba4e75f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeUndeclaredOverride.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeUndeclaredOverride.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeWideningTypeChange.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeWideningTypeChange.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeWideningTypeChange.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeWideningTypeChange.java index e763bd211..6f347dbaa 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/ArgsMergeWideningTypeChange.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/ArgsMergeWideningTypeChange.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/TestOverrides.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/TestOverrides.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/args/overrides/TestOverrides.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/TestOverrides.java index ef2ffe1f1..ac7f139dc 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/args/overrides/TestOverrides.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/args/overrides/TestOverrides.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.args.overrides; +package com.github.rvesse.airline.tests.args.overrides; import org.testng.annotations.Test; @@ -22,7 +22,7 @@ import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.model.OptionMetadata; -import static com.github.rvesse.airline.TestingUtil.singleCommandParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleCommandParser; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertEquals; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/AbstractGroupAnnotationCommand.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/AbstractGroupAnnotationCommand.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/AbstractGroupAnnotationCommand.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/AbstractGroupAnnotationCommand.java index 1920b55ec..e498e9116 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/AbstractGroupAnnotationCommand.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/AbstractGroupAnnotationCommand.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandAdd.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandAdd.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandAdd.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandAdd.java index a94373bce..ae7dc9e5b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandAdd.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandAdd.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommit.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommit.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommit.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommit.java index 57ffe9e3d..3e622b487 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommit.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommit.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommits.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommits.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommits.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommits.java index 4e0e2cacb..bdee71856 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandCommits.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandCommits.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandHighArityOption.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandHighArityOption.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandHighArityOption.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandHighArityOption.java index e9f9c80e2..9171b57fb 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandHighArityOption.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandHighArityOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandMain.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandMain.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandMain.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandMain.java index 85d3b6e19..941bcfe6c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandMain.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandMain.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemote.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemote.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemote.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemote.java index 2a51e65d4..0bd913de9 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemote.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemote.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemotes.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemotes.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemotes.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemotes.java index dca4a0369..a26d130df 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemotes.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemotes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemove.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemove.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemove.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemove.java index f2a8f8722..6c116d2ac 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandRemove.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandRemove.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.AirlineModule; import com.github.rvesse.airline.annotations.Arguments; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupAnnotation.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupAnnotation.java index eaf2baef5..0ba150e33 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Group; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupNames.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupNames.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupNames.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupNames.java index d26e6c12e..4dbaad8a6 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupNames.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupsAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupsAnnotation.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupsAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupsAnnotation.java index 4c474f085..a8af492d1 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithGroupsAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithGroupsAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Group; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupAnnotation.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupAnnotation.java index bc6012685..fb6b9cf35 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Group; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupNames.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupNames.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupNames.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupNames.java index 6fe4dc9f0..0bd959001 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupNames.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupsAnnotation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupsAnnotation.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupsAnnotation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupsAnnotation.java index ea7c0d51f..e6c7254c9 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/CommandWithSubGroupsAnnotation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/CommandWithSubGroupsAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Group; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/TestCommand.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestCommand.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/command/TestCommand.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestCommand.java index 6601f730a..30555af59 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/TestCommand.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestCommand.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import com.github.rvesse.airline.Cli; import com.github.rvesse.airline.builder.CliBuilder; @@ -30,7 +30,7 @@ import java.util.Collection; import java.util.List; -import static com.github.rvesse.airline.TestingUtil.singleCommandParser; +import static com.github.rvesse.airline.tests.TestingUtil.singleCommandParser; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertNotNull; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/command/TestGroupAnnotations.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestGroupAnnotations.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/command/TestGroupAnnotations.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestGroupAnnotations.java index bc4725998..a00ef6b79 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/command/TestGroupAnnotations.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/command/TestGroupAnnotations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.command; +package com.github.rvesse.airline.tests.command; import java.util.Arrays; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestDefaultTypeConverter.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestDefaultTypeConverter.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/TestDefaultTypeConverter.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestDefaultTypeConverter.java index bbdd8d2f1..20232cb9b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestDefaultTypeConverter.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestDefaultTypeConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser; +package com.github.rvesse.airline.tests.parser; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestFlagNegation.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestFlagNegation.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/TestFlagNegation.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestFlagNegation.java index ed367e5b3..69451adbe 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestFlagNegation.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestFlagNegation.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser; +package com.github.rvesse.airline.tests.parser; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.args.ArgsFlagNegation; +import com.github.rvesse.airline.tests.args.ArgsFlagNegation; import com.github.rvesse.airline.builder.ParserBuilder; import com.github.rvesse.airline.model.ParserMetadata; import com.github.rvesse.airline.parser.errors.ParseArgumentsUnexpectedException; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestOptionParsing.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestOptionParsing.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/TestOptionParsing.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestOptionParsing.java index 6af54f684..f1af5a051 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/TestOptionParsing.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/TestOptionParsing.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser; +package com.github.rvesse.airline.tests.parser; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/Logs.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/Logs.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/Logs.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/Logs.java index 60f7b299f..787d80efc 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/Logs.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/Logs.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.parser.aliases; +package com.github.rvesse.airline.tests.parser.aliases; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/LogsWithParser.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/LogsWithParser.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/LogsWithParser.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/LogsWithParser.java index 76e3b9c21..7bf7fd6db 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/LogsWithParser.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/LogsWithParser.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.parser.aliases; +package com.github.rvesse.airline.tests.parser.aliases; import com.github.rvesse.airline.annotations.Cli; import com.github.rvesse.airline.annotations.Parser; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasArgumentsParser.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasArgumentsParser.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasArgumentsParser.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasArgumentsParser.java index 70c16acd0..ab95fe5c6 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasArgumentsParser.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasArgumentsParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser.aliases; +package com.github.rvesse.airline.tests.parser.aliases; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasResolver.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasResolver.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasResolver.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasResolver.java index 83189135f..220b1f7c2 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliasResolver.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliasResolver.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser.aliases; +package com.github.rvesse.airline.tests.parser.aliases; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.Cli; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.parser.errors.ParseAliasCircularReferenceException; import com.github.rvesse.airline.parser.errors.ParseOptionConversionException; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliases.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliases.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliases.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliases.java index 136499afb..cc27d77b5 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/aliases/TestAliases.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/aliases/TestAliases.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser.aliases; +package com.github.rvesse.airline.tests.parser.aliases; import com.github.rvesse.airline.Cli; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.help.cli.CliGlobalUsageGenerator; import com.github.rvesse.airline.model.AliasMetadata; @@ -619,8 +620,8 @@ public void user_aliases_classpath_01() throws Exception { builder.withParser() .withUserAliases() .withFilename("aliases.config") - .withSearchLocation("/") - .withLocator(new ClasspathLocator()); + .withSearchLocation("/com/github/rvesse/airline/tests/") + .withLocators(new ClasspathLocator(), new ModulePathLocator()); Cli cli = builder.build(); //@formatter:on @@ -649,8 +650,8 @@ public void user_aliases_classpath_02() throws Exception { builder.withParser() .withUserAliases() .withFilename("aliases.config") - .withSearchLocation("classpath:/") - .withLocator(new ClasspathLocator()); + .withSearchLocation("classpath:/com/github/rvesse/airline/tests/") + .withLocators(new ClasspathLocator(), new ModulePathLocator()); Cli cli = builder.build(); //@formatter:on diff --git a/airline-core/src/test/java/com/github/rvesse/airline/parser/errors/handlers/TestErrorHandlers.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/errors/handlers/TestErrorHandlers.java similarity index 88% rename from airline-core/src/test/java/com/github/rvesse/airline/parser/errors/handlers/TestErrorHandlers.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/parser/errors/handlers/TestErrorHandlers.java index 835b704ef..9d07bc3b8 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/parser/errors/handlers/TestErrorHandlers.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/parser/errors/handlers/TestErrorHandlers.java @@ -13,19 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.parser.errors.handlers; +package com.github.rvesse.airline.tests.parser.errors.handlers; +import com.github.rvesse.airline.parser.errors.handlers.CollectAll; +import com.github.rvesse.airline.parser.errors.handlers.FailAll; +import com.github.rvesse.airline.parser.errors.handlers.FailFast; +import com.github.rvesse.airline.parser.errors.handlers.ParserErrorHandler; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.args.ArgsRequired; +import com.github.rvesse.airline.tests.args.ArgsRequired; import com.github.rvesse.airline.builder.ParserBuilder; import com.github.rvesse.airline.model.ParserMetadata; import com.github.rvesse.airline.parser.ParseResult; import com.github.rvesse.airline.parser.errors.ParseException; -import com.github.rvesse.airline.restrictions.Some; -import com.github.rvesse.airline.restrictions.Strings; +import com.github.rvesse.airline.tests.restrictions.Some; +import com.github.rvesse.airline.tests.restrictions.Strings; public class TestErrorHandlers { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Allowable.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Allowable.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Allowable.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Allowable.java index 17cf40a6b..76ed7b95d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Allowable.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Allowable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import java.util.concurrent.TimeUnit; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Args1NotOptionLike.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Args1NotOptionLike.java similarity index 89% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Args1NotOptionLike.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Args1NotOptionLike.java index 207f9b426..c2e90816b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Args1NotOptionLike.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Args1NotOptionLike.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.restrictions.NoOptionLikeValues; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; @Command(name = "args") @NoOptionLikeValues diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/If.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/If.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/If.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/If.java index 1abf4a59c..1d1b98338 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/If.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/If.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Numbers.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Numbers.java similarity index 93% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Numbers.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Numbers.java index cdb97ec2c..0bbad3e81 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Numbers.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Numbers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLike.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLike.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLike.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLike.java index 4124bb843..259d909af 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLike.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLike.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLikeGlobal.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLikeGlobal.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLikeGlobal.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLikeGlobal.java index 39ef4fbbb..01ea3ee73 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/NumbersNoOptionLikeGlobal.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/NumbersNoOptionLikeGlobal.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Occurrences.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Occurrences.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Occurrences.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Occurrences.java index 22c19775b..2186a15af 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Occurrences.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Occurrences.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/One.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/One.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/One.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/One.java index d1e589042..7fc5fb235 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/One.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/One.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/OptionallyOne.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/OptionallyOne.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/OptionallyOne.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/OptionallyOne.java index a81bdafb0..13b71d9b1 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/OptionallyOne.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/OptionallyOne.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Paths.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Paths.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Paths.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Paths.java index 42d53c1f8..9ef74bb4f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Paths.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Paths.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Some.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Some.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Some.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Some.java index cd6be598d..31cd29888 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Some.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Some.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Strings.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Strings.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Strings.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Strings.java index 352c72a1f..9a057189e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Strings.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Strings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.HelpOption; import com.github.rvesse.airline.annotations.AirlineModule; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/StringsNotOptionLike.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/StringsNotOptionLike.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/StringsNotOptionLike.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/StringsNotOptionLike.java index 989fc85a9..90dfe757d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/StringsNotOptionLike.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/StringsNotOptionLike.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.restrictions.NoOptionLikeValues; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestAllowedValues.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestAllowedValues.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestAllowedValues.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestAllowedValues.java index a18dd5eca..d595b2df0 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestAllowedValues.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestAllowedValues.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import java.util.Locale; import java.util.concurrent.TimeUnit; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestGlobalRestrictions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestGlobalRestrictions.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestGlobalRestrictions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestGlobalRestrictions.java index 01262063c..16702bfd6 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestGlobalRestrictions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestGlobalRestrictions.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import org.testng.Assert; import org.testng.annotations.Test; @@ -24,7 +23,7 @@ import com.github.rvesse.airline.annotations.restrictions.global.CommandRequired; import com.github.rvesse.airline.annotations.restrictions.global.NoMissingOptionValues; import com.github.rvesse.airline.annotations.restrictions.global.NoUnexpectedArguments; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.parser.errors.ParseArgumentsUnexpectedException; import com.github.rvesse.airline.parser.errors.ParseCommandMissingException; import com.github.rvesse.airline.parser.errors.ParseCommandUnrecognizedException; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestOccurrences.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestOccurrences.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestOccurrences.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestOccurrences.java index 31f2b503b..9b73c6ca4 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestOccurrences.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestOccurrences.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.TestingUtil; +import com.github.rvesse.airline.tests.TestingUtil; import com.github.rvesse.airline.parser.errors.ParseRestrictionViolatedException; public class TestOccurrences { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestPathRestriction.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestPathRestriction.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestPathRestriction.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestPathRestriction.java index fe110eaff..70892a939 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestPathRestriction.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestPathRestriction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestRequired.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestRequired.java similarity index 98% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestRequired.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestRequired.java index f6bb74d05..18391c7b3 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestRequired.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestRequired.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.parser.errors.ParseArgumentsMissingException; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.TestingUtil; +import com.github.rvesse.airline.tests.TestingUtil; import com.github.rvesse.airline.parser.errors.ParseOptionGroupException; import com.github.rvesse.airline.parser.errors.ParseOptionMissingException; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestStrings.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestStrings.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestStrings.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestStrings.java index 6cac4c54b..0e26c1841 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/TestStrings.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/TestStrings.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.TestingUtil; +import com.github.rvesse.airline.tests.TestingUtil; import com.github.rvesse.airline.parser.errors.ParseRestrictionViolatedException; public class TestStrings { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Unless.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Unless.java similarity index 90% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/Unless.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Unless.java index ead035584..46d809d54 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/Unless.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/Unless.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions; +package com.github.rvesse.airline.tests.restrictions; import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; @@ -21,7 +21,6 @@ import com.github.rvesse.airline.annotations.restrictions.RequiredUnlessEnvironment; import org.apache.commons.lang3.StringUtils; -import java.sql.Array; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -57,6 +56,6 @@ private static List fromEnvAsList(String... vars) { public String foo = fromEnv("FOO", "FOO_BAR"); @Arguments(title = "arg", description = "Provides additional arguments.") - @RequiredUnlessEnvironment(variables = { "ARGS", "ARGUMENTS" }) - public List args = new ArrayList<>(fromEnvAsList("ARGS", "ARGUMENTS")); + @RequiredUnlessEnvironment(variables = { "ARGS", "ARGUMENTS" }) + public List args = fromEnvAsList("ARGS", "ARGUMENTS"); } \ No newline at end of file diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialAnnotated.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialAnnotated.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialAnnotated.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialAnnotated.java index ec2030e8a..017c66fdf 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialAnnotated.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialAnnotated.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions.partial; +package com.github.rvesse.airline.tests.restrictions.partial; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialUnannotated.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialUnannotated.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialUnannotated.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialUnannotated.java index 661547d70..0311ab857 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialUnannotated.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialUnannotated.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions.partial; +package com.github.rvesse.airline.tests.restrictions.partial; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialsAnnotated.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialsAnnotated.java similarity index 96% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialsAnnotated.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialsAnnotated.java index 1f59549e4..a77d66e8d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/PartialsAnnotated.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/PartialsAnnotated.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions.partial; +package com.github.rvesse.airline.tests.restrictions.partial; import java.util.ArrayList; import java.util.List; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/TestPartialRestriction.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/TestPartialRestriction.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/TestPartialRestriction.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/TestPartialRestriction.java index 4f05a87e0..87b19e975 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/partial/TestPartialRestriction.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/partial/TestPartialRestriction.java @@ -13,8 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.restrictions.partial; +package com.github.rvesse.airline.tests.restrictions.partial; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll.java index c060d9f48..06d067efa 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll2.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll2.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll2.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll2.java index 533881a8b..b0070d58b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAll2.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAll2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAny.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAny.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAny.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAny.java index 328f89755..5863ebc87 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortAny.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortAny.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortBase.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortBase.java similarity index 92% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortBase.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortBase.java index 4d42b040d..ba2eaeb84 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortBase.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustom.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustom.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustom.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustom.java index 5fb324d9a..dd6f90f50 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustom.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustom.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomInvalid.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomInvalid.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomInvalid.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomInvalid.java index 0ae1cbb08..0f2a2f376 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomInvalid.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomInvalid.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomMultiple.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomMultiple.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomMultiple.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomMultiple.java index 062a9402d..b26c83df5 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortCustomMultiple.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortCustomMultiple.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortEphemeral.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortEphemeral.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortEphemeral.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortEphemeral.java index 9cd935311..fefe9ca7d 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortEphemeral.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortEphemeral.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortSeveral.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortSeveral.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortSeveral.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortSeveral.java index b967851eb..1cee8a153 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/OptionPortSeveral.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/OptionPortSeveral.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/TestPortRestrictions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/TestPortRestrictions.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/TestPortRestrictions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/TestPortRestrictions.java index 702517178..bbec45faf 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ports/TestPortRestrictions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ports/TestPortRestrictions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ports; +package com.github.rvesse.airline.tests.restrictions.ports; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -23,7 +23,7 @@ import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.TestingUtil; +import com.github.rvesse.airline.tests.TestingUtil; import com.github.rvesse.airline.annotations.restrictions.PortType; import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.model.CommandMetadata; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionDoubleRangeInclusive.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionDoubleRangeInclusive.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionDoubleRangeInclusive.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionDoubleRangeInclusive.java index de8acfbaf..d81199832 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionDoubleRangeInclusive.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionDoubleRangeInclusive.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeComplete.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeComplete.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeComplete.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeComplete.java index f9cb6c431..6466da4b3 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeComplete.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeComplete.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java index 083fa3047..090a2052b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeCompleteExclusive.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusive.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusive.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusive.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusive.java index 9bcbf1dc0..15b9d0e8b 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusive.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusive.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMax.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMax.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMax.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMax.java index 274076f63..c4342e906 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMax.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMax.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMin.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMin.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMin.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMin.java index f73d59966..49bd8740c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInclusiveMin.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInclusiveMin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalid.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalid.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalid.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalid.java index da44a1a54..11b9f79d1 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalid.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalid.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java index f128fd08b..60ac289b9 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeInvalidSingleValue.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeSingleValue.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeSingleValue.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeSingleValue.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeSingleValue.java index 8087f2431..1c1ddbc17 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionIntegerRangeSingleValue.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionIntegerRangeSingleValue.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionLexicalRangeInclusive.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionLexicalRangeInclusive.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionLexicalRangeInclusive.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionLexicalRangeInclusive.java index 96e57c87e..82815051c 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionLexicalRangeInclusive.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionLexicalRangeInclusive.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeBase.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeBase.java similarity index 93% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeBase.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeBase.java index dfd3b5aa9..f2d976b60 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeBase.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegative.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegative.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegative.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegative.java index 524395529..743c3b321 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegative.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegative.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegativeIncludesZero.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegativeIncludesZero.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegativeIncludesZero.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegativeIncludesZero.java index d5e449522..e8cde60c7 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangeNegativeIncludesZero.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangeNegativeIncludesZero.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositive.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositive.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositive.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositive.java index c59c7f923..05a21da36 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositive.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositive.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositiveExcludesZero.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositiveExcludesZero.java similarity index 94% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositiveExcludesZero.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositiveExcludesZero.java index 62b371b10..32d070cda 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/OptionRangePositiveExcludesZero.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/OptionRangePositiveExcludesZero.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/TestRangeRestrictions.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/TestRangeRestrictions.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/TestRangeRestrictions.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/TestRangeRestrictions.java index c1b044945..da628d347 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/restrictions/ranges/TestRangeRestrictions.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/restrictions/ranges/TestRangeRestrictions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.restrictions.ranges; +package com.github.rvesse.airline.tests.restrictions.ranges; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -23,7 +23,7 @@ import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.TestingUtil; +import com.github.rvesse.airline.tests.TestingUtil; import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.model.CommandMetadata; import com.github.rvesse.airline.model.OptionMetadata; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/Args1HidesDiscussion.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/Args1HidesDiscussion.java similarity index 89% rename from airline-core/src/test/java/com/github/rvesse/airline/help/sections/Args1HidesDiscussion.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/sections/Args1HidesDiscussion.java index 596e52c3d..781cd463e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/Args1HidesDiscussion.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/Args1HidesDiscussion.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.github.rvesse.airline.help.sections; +package com.github.rvesse.airline.tests.sections; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.HideSection; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; @Command(name = "Args1") @HideSection(title = "Discussion") diff --git a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/CliWithSections.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/CliWithSections.java similarity index 87% rename from airline-core/src/test/java/com/github/rvesse/airline/help/sections/CliWithSections.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/sections/CliWithSections.java index e01d80b18..6949dd00e 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/CliWithSections.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/CliWithSections.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.sections; +package com.github.rvesse.airline.tests.sections; import com.github.rvesse.airline.annotations.Cli; import com.github.rvesse.airline.annotations.help.Discussion; import com.github.rvesse.airline.annotations.help.SeeAlso; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.command.CommandRemove; +import com.github.rvesse.airline.tests.args.Args1; +import com.github.rvesse.airline.tests.command.CommandRemove; import com.github.rvesse.airline.help.Help; @Cli(defaultCommand = Help.class, commands = { Help.class, Args1.class, CommandRemove.class }, name = "test") diff --git a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/TestHelpSectionDetection.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/TestHelpSectionDetection.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/help/sections/TestHelpSectionDetection.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/sections/TestHelpSectionDetection.java index b596f3d61..9e4eb51f4 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/help/sections/TestHelpSectionDetection.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/sections/TestHelpSectionDetection.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.sections; +package com.github.rvesse.airline.tests.sections; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import com.github.rvesse.airline.help.sections.HelpFormat; +import com.github.rvesse.airline.help.sections.HelpSection; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; @@ -27,7 +29,7 @@ import org.testng.annotations.Test; import com.github.rvesse.airline.Cli; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.help.sections.common.BasicSection; import com.github.rvesse.airline.help.sections.common.CommonSections; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/types/ArgsRadix.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/types/ArgsRadix.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/types/ArgsRadix.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/types/ArgsRadix.java index 22e5a2866..f8dcd30ae 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/types/ArgsRadix.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/types/ArgsRadix.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.types; +package com.github.rvesse.airline.tests.types; import java.math.BigInteger; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/types/TestTypeConverters.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/types/TestTypeConverters.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/types/TestTypeConverters.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/types/TestTypeConverters.java index 4986ee352..d5334a8a5 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/types/TestTypeConverters.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/types/TestTypeConverters.java @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.types; +package com.github.rvesse.airline.tests.types; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Random; +import com.github.rvesse.airline.types.ConvertResult; import org.testng.Assert; import org.testng.annotations.Test; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.parser.errors.ParseOptionConversionException; import com.github.rvesse.airline.types.numerics.DefaultNumericConverter; import com.github.rvesse.airline.types.numerics.NumericTypeConverter; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/utils/AirlineTestUtils.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/AirlineTestUtils.java similarity index 95% rename from airline-core/src/test/java/com/github/rvesse/airline/utils/AirlineTestUtils.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/utils/AirlineTestUtils.java index e64d8493c..68e830035 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/utils/AirlineTestUtils.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/AirlineTestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.utils; +package com.github.rvesse.airline.tests.utils; public class AirlineTestUtils { diff --git a/airline-core/src/test/java/com/github/rvesse/airline/utils/ComparatorTests.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ComparatorTests.java similarity index 99% rename from airline-core/src/test/java/com/github/rvesse/airline/utils/ComparatorTests.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ComparatorTests.java index 4f2c32b32..6ca56b9c0 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/utils/ComparatorTests.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ComparatorTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.utils; +package com.github.rvesse.airline.tests.utils; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/airline-core/src/test/java/com/github/rvesse/airline/utils/ToStringHelper.java b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ToStringHelper.java similarity index 97% rename from airline-core/src/test/java/com/github/rvesse/airline/utils/ToStringHelper.java rename to airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ToStringHelper.java index c0ae043b7..938a55b5f 100644 --- a/airline-core/src/test/java/com/github/rvesse/airline/utils/ToStringHelper.java +++ b/airline-core/src/test/java/com/github/rvesse/airline/tests/utils/ToStringHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.utils; +package com.github.rvesse.airline.tests.utils; import java.util.LinkedHashMap; import java.util.Map; diff --git a/airline-core/src/test/java/module-info.java b/airline-core/src/test/java/module-info.java new file mode 100644 index 000000000..a6a562b84 --- /dev/null +++ b/airline-core/src/test/java/module-info.java @@ -0,0 +1,54 @@ +/** + * Copyright (C) 2010-16 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. + */ +module com.github.rvesse.airline.tests +{ + // Required dependencies + requires com.github.rvesse.airline; + requires com.github.rvesse.airline.io; + requires org.apache.commons.lang3; + requires org.apache.commons.collections4; + requires org.testng; + requires jakarta.inject; + requires javax.inject; + + // Exported packages + exports com.github.rvesse.airline.tests; + exports com.github.rvesse.airline.tests.args; + exports com.github.rvesse.airline.tests.args.overrides; + exports com.github.rvesse.airline.tests.command; + exports com.github.rvesse.airline.tests.parser; + exports com.github.rvesse.airline.tests.parser.aliases; + exports com.github.rvesse.airline.tests.parser.errors.handlers; + exports com.github.rvesse.airline.tests.restrictions; + exports com.github.rvesse.airline.tests.restrictions.partial; + exports com.github.rvesse.airline.tests.restrictions.ports; + exports com.github.rvesse.airline.tests.restrictions.ranges; + exports com.github.rvesse.airline.tests.sections; + exports com.github.rvesse.airline.tests.types; + exports com.github.rvesse.airline.tests.utils; + + // Opened packages + opens com.github.rvesse.airline.tests; + opens com.github.rvesse.airline.tests.args; + opens com.github.rvesse.airline.tests.args.overrides; + opens com.github.rvesse.airline.tests.parser; + opens com.github.rvesse.airline.tests.restrictions; + opens com.github.rvesse.airline.tests.restrictions.partial; + opens com.github.rvesse.airline.tests.restrictions.ports; + opens com.github.rvesse.airline.tests.restrictions.ranges; + opens com.github.rvesse.airline.tests.sections; + opens com.github.rvesse.airline.tests.types; +} diff --git a/airline-core/src/test/resources/aliases.config b/airline-core/src/test/resources/com/github/rvesse/airline/tests/aliases.config similarity index 100% rename from airline-core/src/test/resources/aliases.config rename to airline-core/src/test/resources/com/github/rvesse/airline/tests/aliases.config diff --git a/airline-core/src/test/resources/bar.version b/airline-core/src/test/resources/com/github/rvesse/airline/tests/bar.version similarity index 100% rename from airline-core/src/test/resources/bar.version rename to airline-core/src/test/resources/com/github/rvesse/airline/tests/bar.version diff --git a/airline-core/src/test/resources/foo.version b/airline-core/src/test/resources/com/github/rvesse/airline/tests/foo.version similarity index 100% rename from airline-core/src/test/resources/foo.version rename to airline-core/src/test/resources/com/github/rvesse/airline/tests/foo.version diff --git a/airline-core/src/test/resources/test.version b/airline-core/src/test/resources/com/github/rvesse/airline/tests/test.version similarity index 100% rename from airline-core/src/test/resources/test.version rename to airline-core/src/test/resources/com/github/rvesse/airline/tests/test.version diff --git a/airline-examples/src/main/moditect/module-info.java b/airline-examples/src/main/java/module-info.java similarity index 100% rename from airline-examples/src/main/moditect/module-info.java rename to airline-examples/src/main/java/module-info.java diff --git a/airline-help/airline-help-bash/src/main/moditect/module-info.java b/airline-help/airline-help-bash/src/main/java/module-info.java similarity index 100% rename from airline-help/airline-help-bash/src/main/moditect/module-info.java rename to airline-help/airline-help-bash/src/main/java/module-info.java diff --git a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExamples.java b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExamples.java index 079aa6c31..80dc817ba 100644 --- a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExamples.java +++ b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExamples.java @@ -25,6 +25,7 @@ import com.github.rvesse.airline.help.external.parsers.defaults.DefaultExternalHelpParser; import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.FileLocator; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; /** @@ -56,6 +57,7 @@ */ Class[] sourceLocators() default { ClasspathLocator.class, + ModulePathLocator.class, FileLocator.class }; diff --git a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExitCodes.java b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExitCodes.java index 24f2a017e..eebf29216 100644 --- a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExitCodes.java +++ b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalExitCodes.java @@ -25,6 +25,7 @@ import com.github.rvesse.airline.help.external.parsers.defaults.DefaultExternalHelpParser; import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.FileLocator; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; /** @@ -52,6 +53,7 @@ */ Class[] sourceLocators() default { ClasspathLocator.class, + ModulePathLocator.class, FileLocator.class }; diff --git a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalProse.java b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalProse.java index 28a0bd29c..ca3d758cb 100644 --- a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalProse.java +++ b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalProse.java @@ -19,6 +19,7 @@ import com.github.rvesse.airline.help.external.parsers.defaults.DefaultExternalHelpParser; import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.FileLocator; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; import java.lang.annotation.Retention; @@ -67,6 +68,7 @@ */ Class[] sourceLocators() default { ClasspathLocator.class, + ModulePathLocator.class, FileLocator.class }; diff --git a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalTabularExamples.java b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalTabularExamples.java index 673606c13..5a6175a99 100644 --- a/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalTabularExamples.java +++ b/airline-help/airline-help-external/src/main/java/com/github/rvesse/airline/annotations/help/external/ExternalTabularExamples.java @@ -19,6 +19,7 @@ import com.github.rvesse.airline.help.external.parsers.defaults.DefaultExternalHelpParser; import com.github.rvesse.airline.parser.resources.ClasspathLocator; import com.github.rvesse.airline.parser.resources.FileLocator; +import com.github.rvesse.airline.parser.resources.ModulePathLocator; import com.github.rvesse.airline.parser.resources.ResourceLocator; import java.lang.annotation.Documented; @@ -49,6 +50,7 @@ */ Class[] sourceLocators() default { ClasspathLocator.class, + ModulePathLocator.class, FileLocator.class }; diff --git a/airline-help/airline-help-external/src/main/moditect/module-info.java b/airline-help/airline-help-external/src/main/java/module-info.java similarity index 100% rename from airline-help/airline-help-external/src/main/moditect/module-info.java rename to airline-help/airline-help-external/src/main/java/module-info.java diff --git a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTabular.java b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTabular.java index efd06f8fb..249c04b5d 100644 --- a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTabular.java +++ b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTabular.java @@ -18,7 +18,7 @@ import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.external.ExternalTabularExamples; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; import com.github.rvesse.airline.help.external.parsers.defaults.TabDelimitedHelpParser; @Command(name = "args-examples-tabular", description = "args-examples-tabular description") diff --git a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTextual.java b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTextual.java index 725fa2698..81f2f986d 100644 --- a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTextual.java +++ b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsExamplesTextual.java @@ -18,7 +18,7 @@ import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.external.ExternalExamples; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; @Command(name = "args-examples-textual", description = "args-examples-textual description") @ExternalExamples(exampleSource = "/com/github/rvesse/airline/help/external/examples.txt", descriptionSource = "/com/github/rvesse/airline/help/external/example-descriptions.txt") diff --git a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsInvalidResourceLocators.java b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsInvalidResourceLocators.java index efdc35747..6e7564e84 100644 --- a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsInvalidResourceLocators.java +++ b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/commands/ArgsInvalidResourceLocators.java @@ -18,7 +18,7 @@ import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.help.external.ExternalExamples; -import com.github.rvesse.airline.args.Args1; +import com.github.rvesse.airline.tests.args.Args1; @Command(name = "args-examples-textual", description = "args-examples-textual description") diff --git a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/CliWithExternalSections.java b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/CliWithExternalSections.java index 3c0694a29..0a89d7bb8 100644 --- a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/CliWithExternalSections.java +++ b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/CliWithExternalSections.java @@ -18,8 +18,8 @@ import com.github.rvesse.airline.annotations.Cli; import com.github.rvesse.airline.annotations.help.external.ExternalExitCodes; import com.github.rvesse.airline.annotations.help.external.ExternalProse; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.command.CommandRemove; +import com.github.rvesse.airline.tests.args.Args1; +import com.github.rvesse.airline.tests.command.CommandRemove; import com.github.rvesse.airline.help.Help; import com.github.rvesse.airline.help.external.commands.ArgsExamplesTabular; import com.github.rvesse.airline.help.external.commands.ArgsExamplesTextual; diff --git a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/TestExternalHelpSections.java b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/TestExternalHelpSections.java index b0db9ee35..0eafadc8a 100644 --- a/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/TestExternalHelpSections.java +++ b/airline-help/airline-help-external/src/test/java/com/github/rvesse/airline/help/external/sections/TestExternalHelpSections.java @@ -16,7 +16,6 @@ package com.github.rvesse.airline.help.external.sections; import com.github.rvesse.airline.builder.ParserBuilder; -import com.github.rvesse.airline.model.ParserMetadata; import org.apache.commons.collections4.IterableUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -35,7 +34,7 @@ import com.github.rvesse.airline.model.MetadataLoader; import com.github.rvesse.airline.utils.predicates.parser.CommandFinder; -import static com.github.rvesse.airline.help.sections.TestHelpSectionDetection.HelpSectionFinder; +import static com.github.rvesse.airline.tests.sections.TestHelpSectionDetection.HelpSectionFinder; public class TestExternalHelpSections { diff --git a/airline-help/airline-help-html/src/main/moditect/module-info.java b/airline-help/airline-help-html/src/main/java/module-info.java similarity index 100% rename from airline-help/airline-help-html/src/main/moditect/module-info.java rename to airline-help/airline-help-html/src/main/java/module-info.java diff --git a/airline-help/airline-help-man/pom.xml b/airline-help/airline-help-man/pom.xml index 5843d0051..696ac2112 100644 --- a/airline-help/airline-help-man/pom.xml +++ b/airline-help/airline-help-man/pom.xml @@ -13,4 +13,19 @@ ${project.parent.parent.basedir} true + + + + com.github.rvesse + airline-backcompat-javaxinject + ${project.version} + test + + + + jakarta.inject + jakarta.inject-api + test + + \ No newline at end of file diff --git a/airline-help/airline-help-man/src/main/moditect/module-info.java b/airline-help/airline-help-man/src/main/java/module-info.java similarity index 99% rename from airline-help/airline-help-man/src/main/moditect/module-info.java rename to airline-help/airline-help-man/src/main/java/module-info.java index 16177f40e..869a97048 100644 --- a/airline-help/airline-help-man/src/main/moditect/module-info.java +++ b/airline-help/airline-help-man/src/main/java/module-info.java @@ -20,5 +20,4 @@ requires com.github.rvesse.airline; exports com.github.rvesse.airline.help.man; - } \ No newline at end of file diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManArgs.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManArgs.java similarity index 94% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManArgs.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManArgs.java index 542ca7640..4949b22d9 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManArgs.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManArgs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import java.util.List; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed.java similarity index 95% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed.java index 3ff527a24..9e24ba117 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import java.util.List; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed2.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed2.java similarity index 95% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed2.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed2.java index b96789f4f..520529360 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed2.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import java.util.List; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed3.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed3.java similarity index 95% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed3.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed3.java index f2260bac9..757fe9475 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManMixed3.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManMixed3.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import java.util.List; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManNone.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManNone.java similarity index 85% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManNone.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManNone.java index c3c41dcc2..6c7e1c4c2 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManNone.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManNone.java @@ -13,11 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; -import java.util.List; - -import com.github.rvesse.airline.annotations.Arguments; import com.github.rvesse.airline.annotations.Command; @Command(name = "args-none") diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption.java similarity index 94% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption.java index 1b5625853..0ef4f1f3b 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption2.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption2.java similarity index 94% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption2.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption2.java index 9070fcc4a..8c6328af4 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/ArgsManOption2.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/ArgsManOption2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; +package com.github.rvesse.airline.help.man.tests; import com.github.rvesse.airline.annotations.Command; import com.github.rvesse.airline.annotations.Option; diff --git a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/TestHelpMan.java b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/TestHelpMan.java similarity index 97% rename from airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/TestHelpMan.java rename to airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/TestHelpMan.java index 93c6205d1..1efce746a 100644 --- a/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/TestHelpMan.java +++ b/airline-help/airline-help-man/src/test/java/com/github/rvesse/airline/help/man/tests/TestHelpMan.java @@ -13,39 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.github.rvesse.airline.help.man; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.Collections; +package com.github.rvesse.airline.help.man.tests; import com.github.rvesse.airline.Cli; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteAdd; -import com.github.rvesse.airline.Git.RemoteShow; +import com.github.rvesse.airline.help.man.ManCommandUsageGenerator; +import com.github.rvesse.airline.help.man.ManGlobalUsageGenerator; +import com.github.rvesse.airline.help.man.ManMultiPageGlobalUsageGenerator; +import com.github.rvesse.airline.help.man.ManSections; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteAdd; +import com.github.rvesse.airline.tests.Git.RemoteShow; import com.github.rvesse.airline.SingleCommand; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.args.ArgsArityString; -import com.github.rvesse.airline.args.ArgsCopyrightAndLicense; -import com.github.rvesse.airline.args.ArgsExamples; -import com.github.rvesse.airline.args.ArgsExitCodes; -import com.github.rvesse.airline.args.ArgsMultiParagraphDiscussion; -import com.github.rvesse.airline.args.ArgsVersion; -import com.github.rvesse.airline.args.ArgsVersion2; -import com.github.rvesse.airline.args.ArgsVersion3; -import com.github.rvesse.airline.args.ArgsVersionMissing; -import com.github.rvesse.airline.args.ArgsVersionMissingSuppressed; import com.github.rvesse.airline.builder.CliBuilder; import com.github.rvesse.airline.help.Help; +import com.github.rvesse.airline.tests.args.*; import org.apache.commons.lang3.StringUtils; import org.testng.Assert; import org.testng.annotations.Test; +import java.io.*; +import java.nio.charset.Charset; + import static com.github.rvesse.airline.SingleCommand.singleCommand; import static org.testng.Assert.assertEquals; @@ -663,7 +651,7 @@ public void testManMultiPage() throws IOException { public void testManMultiPageNoGroups() throws IOException { @SuppressWarnings("unchecked") - CliBuilder builder = new CliBuilder("multi-page") + CliBuilder builder = new CliBuilder<>("multi-page") .withDefaultCommand(Args1.class) .withCommands(Args1.class, ArgsVersion.class); Cli cli = builder.build(); diff --git a/airline-help/airline-help-man/src/test/java/module-info.java b/airline-help/airline-help-man/src/test/java/module-info.java new file mode 100644 index 000000000..594aaad74 --- /dev/null +++ b/airline-help/airline-help-man/src/test/java/module-info.java @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2010-16 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. + */ +module com.github.rvesse.airline.help.man.tests +{ + requires com.github.rvesse.airline; + requires com.github.rvesse.airline.tests; + requires com.github.rvesse.airline.help.man; + requires org.testng; + requires org.apache.commons.lang3; + + exports com.github.rvesse.airline.help.man.tests; + + opens com.github.rvesse.airline.help.man.tests; +} \ No newline at end of file diff --git a/airline-help/airline-help-man/src/test/resources/help-man.version b/airline-help/airline-help-man/src/test/resources/help-man.version new file mode 100644 index 000000000..1faf3ce99 --- /dev/null +++ b/airline-help/airline-help-man/src/test/resources/help-man.version @@ -0,0 +1,3 @@ +component=Airline Test +version=1.2.3 +build=12345abcde \ No newline at end of file diff --git a/airline-help/airline-help-markdown/src/main/moditect/module-info.java b/airline-help/airline-help-markdown/src/main/java/module-info.java similarity index 100% rename from airline-help/airline-help-markdown/src/main/moditect/module-info.java rename to airline-help/airline-help-markdown/src/main/java/module-info.java diff --git a/airline-help/airline-help-markdown/src/test/java/com/github/rvesse/airline/help/markdown/TestHelpMarkdown.java b/airline-help/airline-help-markdown/src/test/java/com/github/rvesse/airline/help/markdown/TestHelpMarkdown.java index 73c694e3b..4b8a8a9cb 100644 --- a/airline-help/airline-help-markdown/src/test/java/com/github/rvesse/airline/help/markdown/TestHelpMarkdown.java +++ b/airline-help/airline-help-markdown/src/test/java/com/github/rvesse/airline/help/markdown/TestHelpMarkdown.java @@ -27,19 +27,17 @@ import com.github.rvesse.airline.Cli; import com.github.rvesse.airline.SingleCommand; import com.github.rvesse.airline.builder.CliBuilder; -import com.github.rvesse.airline.Git.Add; -import com.github.rvesse.airline.Git.RemoteAdd; -import com.github.rvesse.airline.Git.RemoteShow; -import com.github.rvesse.airline.args.Args1; -import com.github.rvesse.airline.args.ArgsAllowedValues; -import com.github.rvesse.airline.args.ArgsCopyrightAndLicense; -import com.github.rvesse.airline.args.ArgsExamples; -import com.github.rvesse.airline.args.ArgsExitCodes; -import com.github.rvesse.airline.args.ArgsMultiParagraphDiscussion; +import com.github.rvesse.airline.tests.Git.Add; +import com.github.rvesse.airline.tests.Git.RemoteAdd; +import com.github.rvesse.airline.tests.Git.RemoteShow; +import com.github.rvesse.airline.tests.args.Args1; +import com.github.rvesse.airline.tests.args.ArgsAllowedValues; +import com.github.rvesse.airline.tests.args.ArgsCopyrightAndLicense; +import com.github.rvesse.airline.tests.args.ArgsExamples; +import com.github.rvesse.airline.tests.args.ArgsExitCodes; +import com.github.rvesse.airline.tests.args.ArgsMultiParagraphDiscussion; import com.github.rvesse.airline.help.Help; -import com.github.rvesse.airline.help.markdown.MarkdownCommandUsageGenerator; -import com.github.rvesse.airline.help.markdown.MarkdownGlobalUsageGenerator; -import com.github.rvesse.airline.parser.aliases.TestAliases; +import com.github.rvesse.airline.tests.parser.aliases.TestAliases; import org.apache.commons.lang3.StringUtils; import org.testng.Assert; diff --git a/airline-io/pom.xml b/airline-io/pom.xml index 8d6527529..c51a6ad59 100644 --- a/airline-io/pom.xml +++ b/airline-io/pom.xml @@ -12,7 +12,6 @@ ${project.parent.basedir} true - com.github.rvesse.airline.io diff --git a/airline-io/src/main/moditect/module-info.java b/airline-io/src/main/java/module-info.java similarity index 100% rename from airline-io/src/main/moditect/module-info.java rename to airline-io/src/main/java/module-info.java diff --git a/airline-jpms-debug/src/main/moditect/module-info.java b/airline-jpms-debug/src/main/java/module-info.java similarity index 100% rename from airline-jpms-debug/src/main/moditect/module-info.java rename to airline-jpms-debug/src/main/java/module-info.java diff --git a/airline-jpms-resources/src/main/moditect/module-info.java b/airline-jpms-resources/src/main/java/module-info.java similarity index 100% rename from airline-jpms-resources/src/main/moditect/module-info.java rename to airline-jpms-resources/src/main/java/module-info.java diff --git a/airline-maven-plugin/pom.xml b/airline-maven-plugin/pom.xml index c51f49f77..9b511429f 100644 --- a/airline-maven-plugin/pom.xml +++ b/airline-maven-plugin/pom.xml @@ -70,7 +70,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - 3.6.4 + 3.10.2 provided @@ -91,7 +91,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.5.1 + 3.10.2 airline true @@ -115,7 +115,7 @@ org.apache.maven.plugins maven-invoker-plugin - 2.0.0 + 3.6.0 ${project.build.directory}/it-repo verify @@ -125,6 +125,8 @@ true ${skipTests} 4 + true + settings.xml diff --git a/airline-maven-plugin/settings.xml b/airline-maven-plugin/settings.xml new file mode 100644 index 000000000..278a5c2e6 --- /dev/null +++ b/airline-maven-plugin/settings.xml @@ -0,0 +1,74 @@ + + + + + + true + + it-repo + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + ossrh + + true + + + + ossrh + Sonatype Open Source SNAPSHOTs + default + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + true + + + false + + + + + + diff --git a/airline-maven-plugin/src/it/args1-cli-columns/pom.xml b/airline-maven-plugin/src/it/args1-cli-columns/pom.xml index f6778421b..783d3a45e 100644 --- a/airline-maven-plugin/src/it/args1-cli-columns/pom.xml +++ b/airline-maven-plugin/src/it/args1-cli-columns/pom.xml @@ -33,7 +33,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-cli-columns/verify.bsh b/airline-maven-plugin/src/it/args1-cli-columns/verify.bsh index 2775bfeab..447ff9b8e 100644 --- a/airline-maven-plugin/src/it/args1-cli-columns/verify.bsh +++ b/airline-maven-plugin/src/it/args1-cli-columns/verify.bsh @@ -22,4 +22,4 @@ for (String line : lines) { // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file " + outputFile + ".*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file " + outputFile + ".*"); diff --git a/airline-maven-plugin/src/it/args1-cli/pom.xml b/airline-maven-plugin/src/it/args1-cli/pom.xml index d546c6db7..01166ca45 100644 --- a/airline-maven-plugin/src/it/args1-cli/pom.xml +++ b/airline-maven-plugin/src/it/args1-cli/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-cli/verify.bsh b/airline-maven-plugin/src/it/args1-cli/verify.bsh index 346f770ca..9503d9430 100644 --- a/airline-maven-plugin/src/it/args1-cli/verify.bsh +++ b/airline-maven-plugin/src/it/args1-cli/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*SYNOPSIS.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-columns-default-and-per-format/pom.xml b/airline-maven-plugin/src/it/args1-columns-default-and-per-format/pom.xml index 2d465da99..72fbc15b7 100644 --- a/airline-maven-plugin/src/it/args1-columns-default-and-per-format/pom.xml +++ b/airline-maven-plugin/src/it/args1-columns-default-and-per-format/pom.xml @@ -41,7 +41,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-columns-default-and-per-format/verify.bsh b/airline-maven-plugin/src/it/args1-columns-default-and-per-format/verify.bsh index 2775bfeab..447ff9b8e 100644 --- a/airline-maven-plugin/src/it/args1-columns-default-and-per-format/verify.bsh +++ b/airline-maven-plugin/src/it/args1-columns-default-and-per-format/verify.bsh @@ -22,4 +22,4 @@ for (String line : lines) { // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file " + outputFile + ".*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file " + outputFile + ".*"); diff --git a/airline-maven-plugin/src/it/args1-columns-per-format/pom.xml b/airline-maven-plugin/src/it/args1-columns-per-format/pom.xml index d0bbbce05..98cd6dcde 100644 --- a/airline-maven-plugin/src/it/args1-columns-per-format/pom.xml +++ b/airline-maven-plugin/src/it/args1-columns-per-format/pom.xml @@ -38,7 +38,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-columns-per-format/verify.bsh b/airline-maven-plugin/src/it/args1-columns-per-format/verify.bsh index 2775bfeab..447ff9b8e 100644 --- a/airline-maven-plugin/src/it/args1-columns-per-format/verify.bsh +++ b/airline-maven-plugin/src/it/args1-columns-per-format/verify.bsh @@ -22,4 +22,4 @@ for (String line : lines) { // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file " + outputFile + ".*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file " + outputFile + ".*"); diff --git a/airline-maven-plugin/src/it/args1-columns-per-source/pom.xml b/airline-maven-plugin/src/it/args1-columns-per-source/pom.xml index bff52a89c..3438b747c 100644 --- a/airline-maven-plugin/src/it/args1-columns-per-source/pom.xml +++ b/airline-maven-plugin/src/it/args1-columns-per-source/pom.xml @@ -31,7 +31,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 68 diff --git a/airline-maven-plugin/src/it/args1-columns-per-source/verify.bsh b/airline-maven-plugin/src/it/args1-columns-per-source/verify.bsh index 2775bfeab..447ff9b8e 100644 --- a/airline-maven-plugin/src/it/args1-columns-per-source/verify.bsh +++ b/airline-maven-plugin/src/it/args1-columns-per-source/verify.bsh @@ -22,4 +22,4 @@ for (String line : lines) { // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file " + outputFile + ".*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file " + outputFile + ".*"); diff --git a/airline-maven-plugin/src/it/args1-foo-as-man/pom.xml b/airline-maven-plugin/src/it/args1-foo-as-man/pom.xml index c356b6c74..4d41e52bc 100644 --- a/airline-maven-plugin/src/it/args1-foo-as-man/pom.xml +++ b/airline-maven-plugin/src/it/args1-foo-as-man/pom.xml @@ -36,7 +36,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-foo-as-man/verify.bsh b/airline-maven-plugin/src/it/args1-foo-as-man/verify.bsh index 0f483a2c3..2c44c3a3a 100644 --- a/airline-maven-plugin/src/it/args1-foo-as-man/verify.bsh +++ b/airline-maven-plugin/src/it/args1-foo-as-man/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format FOO to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format FOO to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-foo-default-provider/pom.xml b/airline-maven-plugin/src/it/args1-foo-default-provider/pom.xml index b45bd32a8..5167f1237 100644 --- a/airline-maven-plugin/src/it/args1-foo-default-provider/pom.xml +++ b/airline-maven-plugin/src/it/args1-foo-default-provider/pom.xml @@ -36,7 +36,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-foo-failed/pom.xml b/airline-maven-plugin/src/it/args1-foo-failed/pom.xml index 5e7e390a9..8742359ed 100644 --- a/airline-maven-plugin/src/it/args1-foo-failed/pom.xml +++ b/airline-maven-plugin/src/it/args1-foo-failed/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 CLI diff --git a/airline-maven-plugin/src/it/args1-foo-invalid-provider/pom.xml b/airline-maven-plugin/src/it/args1-foo-invalid-provider/pom.xml index d580bc24d..ebfb43944 100644 --- a/airline-maven-plugin/src/it/args1-foo-invalid-provider/pom.xml +++ b/airline-maven-plugin/src/it/args1-foo-invalid-provider/pom.xml @@ -36,7 +36,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-foo-skipped/pom.xml b/airline-maven-plugin/src/it/args1-foo-skipped/pom.xml index d5e575988..d8577c597 100644 --- a/airline-maven-plugin/src/it/args1-foo-skipped/pom.xml +++ b/airline-maven-plugin/src/it/args1-foo-skipped/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 CLI diff --git a/airline-maven-plugin/src/it/args1-html/pom.xml b/airline-maven-plugin/src/it/args1-html/pom.xml index 3769678d0..59a44f3d1 100644 --- a/airline-maven-plugin/src/it/args1-html/pom.xml +++ b/airline-maven-plugin/src/it/args1-html/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-html/verify.bsh b/airline-maven-plugin/src/it/args1-html/verify.bsh index 4b041289c..dce5a24b8 100644 --- a/airline-maven-plugin/src/it/args1-html/verify.bsh +++ b/airline-maven-plugin/src/it/args1-html/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format HTML to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format HTML to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-implicit-format/pom.xml b/airline-maven-plugin/src/it/args1-implicit-format/pom.xml index 2a0100435..0f5de0648 100644 --- a/airline-maven-plugin/src/it/args1-implicit-format/pom.xml +++ b/airline-maven-plugin/src/it/args1-implicit-format/pom.xml @@ -27,7 +27,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-implicit-format/verify.bsh b/airline-maven-plugin/src/it/args1-implicit-format/verify.bsh index 485748a0e..890bace66 100644 --- a/airline-maven-plugin/src/it/args1-implicit-format/verify.bsh +++ b/airline-maven-plugin/src/it/args1-implicit-format/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-man-as-default/pom.xml b/airline-maven-plugin/src/it/args1-man-as-default/pom.xml index c69dcaaf3..cdbd75548 100644 --- a/airline-maven-plugin/src/it/args1-man-as-default/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-as-default/pom.xml @@ -36,7 +36,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-man-as-default/verify.bsh b/airline-maven-plugin/src/it/args1-man-as-default/verify.bsh index 485748a0e..890bace66 100644 --- a/airline-maven-plugin/src/it/args1-man-as-default/verify.bsh +++ b/airline-maven-plugin/src/it/args1-man-as-default/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-man-failed-output-mode/pom.xml b/airline-maven-plugin/src/it/args1-man-failed-output-mode/pom.xml index 429f2d2d0..8f0f11757 100644 --- a/airline-maven-plugin/src/it/args1-man-failed-output-mode/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-failed-output-mode/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 GROUP diff --git a/airline-maven-plugin/src/it/args1-man-section-per-format/pom.xml b/airline-maven-plugin/src/it/args1-man-section-per-format/pom.xml index 3ca567642..6155fd3b9 100644 --- a/airline-maven-plugin/src/it/args1-man-section-per-format/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-section-per-format/pom.xml @@ -41,7 +41,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-man-section-per-format/verify.bsh b/airline-maven-plugin/src/it/args1-man-section-per-format/verify.bsh index c13e54303..ea54c1de0 100644 --- a/airline-maven-plugin/src/it/args1-man-section-per-format/verify.bsh +++ b/airline-maven-plugin/src/it/args1-man-section-per-format/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-man-section-per-source/pom.xml b/airline-maven-plugin/src/it/args1-man-section-per-source/pom.xml index fa7cb1cf3..567cf280d 100644 --- a/airline-maven-plugin/src/it/args1-man-section-per-source/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-section-per-source/pom.xml @@ -34,7 +34,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 5 diff --git a/airline-maven-plugin/src/it/args1-man-section-per-source/verify.bsh b/airline-maven-plugin/src/it/args1-man-section-per-source/verify.bsh index c13e54303..ea54c1de0 100644 --- a/airline-maven-plugin/src/it/args1-man-section-per-source/verify.bsh +++ b/airline-maven-plugin/src/it/args1-man-section-per-source/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-man-section/pom.xml b/airline-maven-plugin/src/it/args1-man-section/pom.xml index d68c89f98..fe50b158e 100644 --- a/airline-maven-plugin/src/it/args1-man-section/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-section/pom.xml @@ -33,7 +33,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-man-section/verify.bsh b/airline-maven-plugin/src/it/args1-man-section/verify.bsh index b9bf087be..968cdb526 100644 --- a/airline-maven-plugin/src/it/args1-man-section/verify.bsh +++ b/airline-maven-plugin/src/it/args1-man-section/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-man-skipped/pom.xml b/airline-maven-plugin/src/it/args1-man-skipped/pom.xml index a05dcd630..30f71df8e 100644 --- a/airline-maven-plugin/src/it/args1-man-skipped/pom.xml +++ b/airline-maven-plugin/src/it/args1-man-skipped/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 CLI diff --git a/airline-maven-plugin/src/it/args1-man/pom.xml b/airline-maven-plugin/src/it/args1-man/pom.xml index d8bfdcc73..8a2085663 100644 --- a/airline-maven-plugin/src/it/args1-man/pom.xml +++ b/airline-maven-plugin/src/it/args1-man/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-man/verify.bsh b/airline-maven-plugin/src/it/args1-man/verify.bsh index 485748a0e..890bace66 100644 --- a/airline-maven-plugin/src/it/args1-man/verify.bsh +++ b/airline-maven-plugin/src/it/args1-man/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*[.]SH NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-md/pom.xml b/airline-maven-plugin/src/it/args1-md/pom.xml index a7e0facc6..ba1cc678a 100644 --- a/airline-maven-plugin/src/it/args1-md/pom.xml +++ b/airline-maven-plugin/src/it/args1-md/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-md/verify.bsh b/airline-maven-plugin/src/it/args1-md/verify.bsh index 6bd7c9610..a6be22b1a 100644 --- a/airline-maven-plugin/src/it/args1-md/verify.bsh +++ b/airline-maven-plugin/src/it/args1-md/verify.bsh @@ -12,4 +12,4 @@ verifier.assertFileMatches(outputFile, "(?s).*# NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MARKDOWN to file " + outputFile + ".*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MARKDOWN to file " + outputFile + ".*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-multi-format/pom.xml b/airline-maven-plugin/src/it/args1-multi-format/pom.xml index ba94654c7..0f26e68e6 100644 --- a/airline-maven-plugin/src/it/args1-multi-format/pom.xml +++ b/airline-maven-plugin/src/it/args1-multi-format/pom.xml @@ -32,7 +32,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/args1-multi-format/verify.bsh b/airline-maven-plugin/src/it/args1-multi-format/verify.bsh index 205a1eca3..c254baab8 100644 --- a/airline-maven-plugin/src/it/args1-multi-format/verify.bsh +++ b/airline-maven-plugin/src/it/args1-multi-format/verify.bsh @@ -23,6 +23,6 @@ verifier.assertFileMatches(outputFile, "(?s).*# NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MARKDOWN to file.*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MARKDOWN to file.*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/args1-output-mode-cli/pom.xml b/airline-maven-plugin/src/it/args1-output-mode-cli/pom.xml index ba5dbaa50..7f781df13 100644 --- a/airline-maven-plugin/src/it/args1-output-mode-cli/pom.xml +++ b/airline-maven-plugin/src/it/args1-output-mode-cli/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 CLI diff --git a/airline-maven-plugin/src/it/args1-output-mode-group/pom.xml b/airline-maven-plugin/src/it/args1-output-mode-group/pom.xml index 86c17c9b7..9092cb4df 100644 --- a/airline-maven-plugin/src/it/args1-output-mode-group/pom.xml +++ b/airline-maven-plugin/src/it/args1-output-mode-group/pom.xml @@ -30,7 +30,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 GROUP diff --git a/airline-maven-plugin/src/it/multi-source-multi-format-2/pom.xml b/airline-maven-plugin/src/it/multi-source-multi-format-2/pom.xml index 2faf97169..68e535ded 100644 --- a/airline-maven-plugin/src/it/multi-source-multi-format-2/pom.xml +++ b/airline-maven-plugin/src/it/multi-source-multi-format-2/pom.xml @@ -39,7 +39,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/multi-source-multi-format-2/verify.bsh b/airline-maven-plugin/src/it/multi-source-multi-format-2/verify.bsh index d1582dc3d..2abbf074d 100644 --- a/airline-maven-plugin/src/it/multi-source-multi-format-2/verify.bsh +++ b/airline-maven-plugin/src/it/multi-source-multi-format-2/verify.bsh @@ -41,9 +41,9 @@ verifier.assertFileMatches(outputFile, "(?s).*# NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MARKDOWN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MARKDOWN to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format MAN to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format CLI to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format MARKDOWN to file.*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/multi-source-multi-format/pom.xml b/airline-maven-plugin/src/it/multi-source-multi-format/pom.xml index c557a50ec..ad9a6bbbf 100644 --- a/airline-maven-plugin/src/it/multi-source-multi-format/pom.xml +++ b/airline-maven-plugin/src/it/multi-source-multi-format/pom.xml @@ -37,7 +37,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 com.github.rvesse.airline.examples.userguide.BasicCli diff --git a/airline-maven-plugin/src/it/multi-source-multi-format/verify.bsh b/airline-maven-plugin/src/it/multi-source-multi-format/verify.bsh index d1582dc3d..2abbf074d 100644 --- a/airline-maven-plugin/src/it/multi-source-multi-format/verify.bsh +++ b/airline-maven-plugin/src/it/multi-source-multi-format/verify.bsh @@ -41,9 +41,9 @@ verifier.assertFileMatches(outputFile, "(?s).*# NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MARKDOWN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MARKDOWN to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format MAN to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format CLI to file.*"); verifier.assertFileMatches(logFile, "(?s).*Generated CLI help for class com.github.rvesse.airline.examples.userguide.BasicCli in format MARKDOWN to file.*"); \ No newline at end of file diff --git a/airline-maven-plugin/src/it/output-dir/pom.xml b/airline-maven-plugin/src/it/output-dir/pom.xml index 2dc0c8cdb..b3b04a6d2 100644 --- a/airline-maven-plugin/src/it/output-dir/pom.xml +++ b/airline-maven-plugin/src/it/output-dir/pom.xml @@ -33,7 +33,7 @@ - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 diff --git a/airline-maven-plugin/src/it/output-dir/verify.bsh b/airline-maven-plugin/src/it/output-dir/verify.bsh index 6fdd14d4c..e2840f841 100644 --- a/airline-maven-plugin/src/it/output-dir/verify.bsh +++ b/airline-maven-plugin/src/it/output-dir/verify.bsh @@ -23,6 +23,6 @@ verifier.assertFileMatches(outputFile, "(?s).*# NAME.*"); // Verify log file String logFile = verifier.getBasedir() + "/build.log"; verifier.assertFilePresent(logFile); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MAN to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format CLI to file.*"); -verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.args.Args1 in format MARKDOWN to file.*"); \ No newline at end of file +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MAN to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format CLI to file.*"); +verifier.assertFileMatches(logFile, "(?s).*Generated command help for class com.github.rvesse.airline.tests.args.Args1 in format MARKDOWN to file.*"); \ No newline at end of file diff --git a/airline-prompts/pom.xml b/airline-prompts/pom.xml index dda7d0a1a..cd473b583 100644 --- a/airline-prompts/pom.xml +++ b/airline-prompts/pom.xml @@ -14,7 +14,6 @@ ${project.parent.basedir} true - com.github.rvesse.airline.prompts diff --git a/airline-prompts/src/main/moditect/module-info.java b/airline-prompts/src/main/java/module-info.java similarity index 100% rename from airline-prompts/src/main/moditect/module-info.java rename to airline-prompts/src/main/java/module-info.java diff --git a/docs/guide/annotations/examples.md b/docs/guide/annotations/examples.md index 06286f7bb..86fd4b52c 100644 --- a/docs/guide/annotations/examples.md +++ b/docs/guide/annotations/examples.md @@ -28,7 +28,7 @@ provides corresponding description of what each example does. ## `@ExternalExamples` and `@ExternalTabularExamples` -{% include req-ver.md version="2.10.0" module="airline-help-external" %} +{% include req-ver.md version="3.0.0" module="airline-help-external" %} If your application has a lot of examples it may be simpler to define these in separate file(s) and just have Airline load this for you. diff --git a/docs/guide/annotations/exit-codes.md b/docs/guide/annotations/exit-codes.md index 03cab6547..17cdd628c 100644 --- a/docs/guide/annotations/exit-codes.md +++ b/docs/guide/annotations/exit-codes.md @@ -28,7 +28,7 @@ The annotation takes two arrays, the `codes` array specifies the exit codes that ## `@ExternalExitCodes` -{% include req-ver.md version="2.10.0" module="airline-help-external" %} +{% include req-ver.md version="3.0.0" module="airline-help-external" %} If your application has a lot of exit codes it may be simpler to define these in a separate file and just have Airline load this for you. diff --git a/docs/guide/annotations/prose-section.md b/docs/guide/annotations/prose-section.md index 3c093df94..843c361cc 100644 --- a/docs/guide/annotations/prose-section.md +++ b/docs/guide/annotations/prose-section.md @@ -32,7 +32,7 @@ sections. ## `@ExternalProse` -{% include req-ver.md version="2.10.0" module="airline-help-external" %} +{% include req-ver.md version="3.0.0" module="airline-help-external" %} If your application has a lot of additional sections you wish to add and they are quite wordy it may be easier to provide this as a separate resource that Airline loads rather than directly in an annotation. This can be done via the diff --git a/docs/guide/practise/jdk.md b/docs/guide/practise/jdk.md index c7bb304a8..c5f0e51c5 100644 --- a/docs/guide/practise/jdk.md +++ b/docs/guide/practise/jdk.md @@ -45,11 +45,12 @@ module com.yourdomain.yourmodule {% include req-ver.md version="3.0.0" %} Prior to `3.0.0` Airline only provided basic `module-info.java` files, as of `3.0.0` these have been properly -handcrafted to provide much improved JPMS compatibility. +handcrafted to provide full JPMS compatibility. -If you are using any of the Airline annotations that locate resources e.g. `@Version` then you **MAY** need to -explicitly open the package containing those resources to `com.github.rvesse.airline` and to `io.github.classgraph`. -Where your resources are in the root of your package this **MAY** be unnecessary. +If you are using any of the Airline annotations that locate resources e.g. `@Version` then you **MAY** need to +explicitly open the package containing those resources to `com.github.rvesse.airline`. The new `ModulePathLocator` +introduced in `3.0.0` should allow locating such resources when appropriate `opens` declarations are present in your +`module-info.java`. You may find that Airline is unable to locate some resources with its default configuration. If this is the case you can add the `airline-jpms-resources` module as an additional dependency and reference the `JpmsResourceLocator.class` in diff --git a/docs/guide/practise/maven-plugin.md b/docs/guide/practise/maven-plugin.md index a78d5a54e..f575ec783 100644 --- a/docs/guide/practise/maven-plugin.md +++ b/docs/guide/practise/maven-plugin.md @@ -73,7 +73,7 @@ For example: - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 @@ -431,7 +431,7 @@ Here's an example configuration that does all of the above: - com.github.rvesse.airline.args.Args1 + com.github.rvesse.airline.tests.args.Args1 100 diff --git a/docs/guide/practise/resource-locators.md b/docs/guide/practise/resource-locators.md index a3fad514c..e2d35b59a 100644 --- a/docs/guide/practise/resource-locators.md +++ b/docs/guide/practise/resource-locators.md @@ -17,7 +17,8 @@ allow users to extend resource location as desired. The following locators are | {% include javadoc-ref.md class="EnvVarLocator" package="parser.resources" %} | Locates resources on the filesystem where the search locations given may contain `${VAR}` placeholders to refer to environment variables. | | {% include javadoc-ref.md class="JvmSystemPropertyLocator" package="parser.resources" %} | Locates resources on the filesystem where the search locations given may contain `${var}` placeholders to refer to JVM system properties i.e. those passed to the JVM via the `-Dvar=value` flag. | | {% include javadoc-ref.md class="ClasspathLocator" package="parser.resources" %} | Locates resources on the JVM class path. | -| {% include javadoc-ref.md class="JpmsResourceLocator" package="parser.resources.jpms" module="airline-jpms-resources" %} | Locates resources on the JVM Module Path. +| {% include javadoc-ref.md class="ModulePathLocator" package="parser.resources" %} | Locates resources on the JVM module path. | +| {% include javadoc-ref.md class="JpmsResourceLocator" package="parser.resources.jpms" module="airline-jpms-resources" %} | Locates resources on the JVM Module Path, especially in the case where modules are not open to each other. | This makes it possible to configure CLIs that have intelligent behaviours e.g. resolving user aliases from environment variable driven locations. @@ -34,11 +35,22 @@ force the `FileLocator` to be used and `classpath://` to force the `ClasspathLoc ### JPMS Resource Location +{% include req-ver.md version="3.0.0" %} + +When running on the Java Module Path resource location is somewhat more complicated as in order for a resource to be +accessible to another module like Airline the package in which it is contained **MUST** be declared as `opens` in the +`module-info.java` for your module. + +From 3.0.0 onwards a `ModulePathLocator` was added to the core `airline` module so that it can successfully locate +resources on the module path when the above conditions are met. + {% include req-ver.md version="3.0.0" module="airline-jpms-resources" %} -From 3.0.0 onwards a `JpmsResourceLocator` was added in a separate `airline-jpms-resources` module since it requires -additional dependencies. This resource locator is capable of locating resources when Airline is run on the Module Path -where the stronger encapsulation may make accessing resources via the standard `ClasspathLocator` fail. +However in some cases this may be insufficient e.g. you want to read a resource from a module whose `module-info.java` +you do not control and thus cannot change the `opens` declarations. Additionally from 3.0.0 onwards a +`JpmsResourceLocator` was added in a separate `airline-jpms-resources` module since it requires additional dependencies. +This resource locator is capable of locating resources when Airline is run on the Module Path where the stronger +encapsulation may make accessing resources via the standard `ClasspathLocator`/`ModulePathLocator` fail. Please refer to the [JPMS Notes](jdk.html#jpms) for more information on running Airline in a JPMS context. diff --git a/pom.xml b/pom.xml index 0e6aa3d75..0c67a6624 100644 --- a/pom.xml +++ b/pom.xml @@ -68,13 +68,12 @@ 2.11 0.8.8 3.2.2 - 3.0.1 + 3.2.1 3.0.1 - 2.5.3 - 1.6 + 3.0.1 + 3.1.0 3.1.1 3.0.0-M7 - 1.0.0.RC1 2.0.1 @@ -175,7 +174,7 @@ ${plugin.enforcer} - enforce-jdk7 + enforce-required-jdk enforce @@ -388,9 +387,6 @@ airline-maven-plugin docs - - 1.8 - @@ -439,73 +435,6 @@ - - javadoc-jdk7 - - (,1.7] - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${plugin.javadoc} - - - package - - jar - - - - - ${jdk.target} - true - UTF-8 - UTF-8 - UTF-8 - - - - - - - - javadoc-jdk8 - - 1.8 - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${plugin.javadoc} - - - package - - jar - - - - - ${jdk.target} - true - UTF-8 - UTF-8 - UTF-8 - - - - - - - - - javadoc-jdk10-plus @@ -540,116 +469,6 @@ - - - moditect-jdk8-plus - - [1.8,) - - ${basedir}/src/main/moditect/module-info.java - - - - - - org.moditect - moditect-maven-plugin - ${plugin.moditect} - - - add-module-infos - package - - add-module-info - - - 9 - true - - - ${basedir}/src/main/moditect/module-info.java - - - - - - - - - - - - automatic-module-name - - - moditect.skip - true - - - ${basedir}/src/main/moditect/module-info.java - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${plugin.jar} - - - - ${moditect.moduleName} - - - - - - - - - - generate-module-info - - 9 - - - - - org.moditect - moditect-maven-plugin - ${plugin.moditect} - - - - generate-module-info - - - - - - ${project.groupId} - ${project.artifactId} - ${project.version} - - - ${moditect.moduleName} - - *; - - - *; - - true - - - - - - - - - -