diff --git a/AGENTS.md b/AGENTS.md index 4e3c78a9e..c36e06773 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -19,8 +19,9 @@ ## Tests - Put isolated Mojo behavior, parameters, version gates, reflection failures, and utility behavior in `src/test/java` unit tests. -- Add `src/it/` Maven Invoker tests only for real consuming-build behavior: lifecycle wiring, classpaths, Groovy compilation, generated stubs, multi-module builds, or configuration interactions. -- Do not add integration-test combinations mechanically; cover distinct user-visible workflows and regressions that unit tests cannot establish. +- `src/it` intentionally contains one flat Maven Invoker project per distinct consuming-build workflow; it covers lifecycle wiring, classpaths, Groovy compilation, generated stubs, reactor builds, and packaging boundaries that unit tests cannot establish. +- Add an Invoker project only for a new user-visible workflow or a regression whose consuming-build boundary is absent from `src/it/README.md`; otherwise extend the existing fixture that owns that boundary. +- Keep parameter-only changes without consuming-build output, version gates, reflection failures, and interactive `console`/`shell` behavior in focused unit tests; do not add configuration cross-products mechanically. ## References | Need | File | @@ -28,4 +29,5 @@ | Build, plugin metadata, and Invoker configuration | `pom.xml` | | CI compatibility matrix | `.github/workflows/ci.yaml` | | Common local, release, and maintenance commands | `DEVELOPER_NOTES.md` | +| Invoker workflow coverage and add-test criteria | `src/it/README.md` | | Project and user documentation | `README.md` | diff --git a/src/it/README.md b/src/it/README.md new file mode 100644 index 000000000..e97ff7c89 --- /dev/null +++ b/src/it/README.md @@ -0,0 +1,28 @@ +# Integration Test Coverage + +Each directory is one user-visible Maven workflow. Keep fixtures flat so they can be selected with `-Dinvoker.test`, and add one only when it covers a distinct lifecycle, classpath, reactor, compatibility, or historical feature/regression boundary that unit tests cannot prove. + +| Fixture | Workflow | Coverage boundary | Primary assertion | +|---|---|---|---| +| `compile-default` | Compile Groovy sources | Default lifecycle | Compiled classes run in tests | +| `compile-config-script` | Compile with a configuration script | Compiler configuration | Configured source and test compilation | +| `compile-parameters` | Compile with Java parameter metadata | Generated bytecode metadata | Reflection assertion | +| `compile-mixed-java-groovy` | Compile Java and Groovy together | Main source ordering | Cross-language runtime behavior | +| `compile-reactor` | Compile a mixed reactor | Inter-module dependency ordering | Reactor consumer test | +| `stubs-main-and-test` | Generate main and test stubs | Source-root registration | Maven source-root model | +| `stubs-cleanup` | Remove test stubs | Source-root removal | Removed test source root | +| `compile-classpath-isolation` | Reject a polluted classpath | Classloader isolation | Expected Maven failure | +| `stubs-classpath-isolation` | Reject polluted stub generation classpaths | Stub classloader isolation | Expected Maven failure | +| `execute-inline-and-file` | Execute inline and file scripts | Script and Maven-context injection | Script assertions and runtime output | +| `execute-reactor-classpath` | Execute scripts in a reactor | Reactor classpath resolution | Cross-module script execution | +| `groovydoc-main-and-jar` | Generate main GroovyDoc and JAR | Attached documentation artifact | Documentation test and package goal | +| `groovydoc-test-and-test-jar` | Generate test GroovyDoc and JAR | Test documentation lifecycle | Generated test documentation | +| `forked-jvm-compile-and-stubs` | Fork compilation and stubs | JDK toolchain selection | Toolchain build-log check | +| `forked-jvm-groovydoc` | Fork GroovyDoc | JDK toolchain selection | Toolchain build-log check | +| `classpath-project-only` | Resolve Groovy from the project | `PROJECT_ONLY` | Project dependency compilation | +| `classpath-plugin-only` | Resolve Groovy from plugin dependencies | `PLUGIN_ONLY` | Plugin-only compilation and docs | +| `classpath-project-and-plugin` | Resolve both classpaths | `PROJECT_AND_PLUGIN` | Combined dependency compilation and docs | +| `shaded-groovy` | Use Groovy from an uber JAR | Shaded runtime discovery | Consumer runtime test | +| `maven-plugin-consumer` | Build a Groovy Maven plugin | Plugin descriptor and consumer execution | Invoked custom Mojo | + +Do not add a fixture for a parameter-only change without consuming-build output, reflection failure, or interactive console/shell behavior; cover those with focused unit tests. New fixtures require a regression issue or a documented distinct user workflow. diff --git a/src/it/advancedGenerateStubs/pom.xml b/src/it/advancedGenerateStubs/pom.xml deleted file mode 100644 index a8a2c59c1..000000000 --- a/src/it/advancedGenerateStubs/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-advancedGenerateStubs - GMavenPlus Plugin Advanced Generate Stubs Test - The kitchen sink of stub generation use cases. This will fail for all versions of Groovy before - 1.8.2. - - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - generateStubs - removeStubs - - - - - - - ${project.basedir}/src/main/groovy - - **/*.groovy - **/*.gvy - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/advancedGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy b/src/it/advancedGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy deleted file mode 100644 index 4b2c5922d..000000000 --- a/src/it/advancedGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeOtherClass { - - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/advancedGenerateStubs/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/advancedGenerateStubs/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index 6e0c91c20..000000000 --- a/src/it/advancedGenerateStubs/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class TheTest { - - @Test - public void testSomeClassExists() { - File generatedStub = new File("target/generated-sources/groovy-stubs/main/org/codehaus/gmavenplus/SomeClass.java"); - Assert.assertTrue(generatedStub + " does not exist.", generatedStub.exists()); - Assert.assertTrue(generatedStub + " is empty.", generatedStub.length() > 0); - } - - @Test - public void testSomeOtherClassExists() { - File generatedStub = new File("target/generated-sources/groovy-stubs/main/org/codehaus/gmavenplus/SomeOtherClass.java"); - Assert.assertTrue(generatedStub + " does not exist.", generatedStub.exists()); - Assert.assertTrue(generatedStub + " is empty.", generatedStub.length() > 0); - } - -} diff --git a/src/it/advancedGroovydoc/pom.xml b/src/it/advancedGroovydoc/pom.xml deleted file mode 100644 index 2770858cb..000000000 --- a/src/it/advancedGroovydoc/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-advancedGroovyDoc - testing - GMavenPlus Plugin Advanced GroovyDoc Test - The kitchen sink of GroovyDoc use cases. This will fail for Groovy 1.5.8 and 1.6-RC-1. - - - - junit - junit - - - @groovyGroupId@ - groovy - - - @groovyGroupId@ - groovy-groovydoc - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - generate-test-sources - - generateStubs - groovydoc - removeStubs - - - - - - - ${project.basedir}/src/main/groovy - - **/*.groovy - **/*.gvy - - - - src/main/resources/stylesheet.css - - - java,javax,org.ietf.jgss,org.omg,org.w3c,org.xml - https://docs.oracle.com/en/java/javase/11/docs/api/ - - - org.codehaus.groovy,groovy - https://docs.groovy-lang.org/latest/html/api/ - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/advancedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy b/src/it/advancedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy deleted file mode 100644 index 42e50bb68..000000000 --- a/src/it/advancedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.gmavenplus - - -/** -* Some Other Example Cass -* -* @author Keegan Witt -* @version super awesome -*/ -class SomeOtherClass { - - /** - * A method that returns a string. - * - * @return a string - */ - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/advancedGroovydoc/src/main/resources/stylesheet.css b/src/it/advancedGroovydoc/src/main/resources/stylesheet.css deleted file mode 100644 index 25faa161a..000000000 --- a/src/it/advancedGroovydoc/src/main/resources/stylesheet.css +++ /dev/null @@ -1,2306 +0,0 @@ -@charset "${props.charset}"; - -/*! normalize.css v2.1.0 | MIT License | git.io/normalize */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { - display: block -} - -audio, canvas, video { - display: inline-block -} - -audio:not([controls]) { - display: none; - height: 0 -} - -[hidden] { - display: none -} - -html { - font-family: sans-serif; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100% -} - -body { - margin: 0 -} - -a:focus { - outline: thin dotted -} - -a:active, a:hover { - outline: 0 -} - -h1 { - font-size: 2em; - margin: .67em 0 -} - -abbr[title] { - border-bottom: 1px dotted -} - -b, strong { - font-weight: bold -} - -dfn { - font-style: italic -} - -hr { - -moz-box-sizing: content-box; - box-sizing: content-box; - height: 0 -} - -mark { - background: #ff0; - color: #000 -} - -code, kbd, pre, samp { - font-family: monospace, serif; - font-size: 1em -} - -pre { - white-space: pre-wrap -} - -q { - quotes: "\201C" "\201D" "\2018" "\2019" -} - -small { - font-size: 80% -} - -sub, sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline -} - -sup { - top: -0.5em -} - -sub { - bottom: -0.25em -} - -img { - border: 0 -} - -svg:not(:root) { - overflow: hidden -} - -figure { - margin: 0 -} - -fieldset { - border: 1px solid #c0c0c0; - margin: 0 2px; - padding: .35em .625em .75em -} - -legend { - border: 0; - padding: 0 -} - -button, input, select, textarea { - font-family: inherit; - font-size: 100%; - margin: 0 -} - -button, input { - line-height: normal -} - -button, select { - text-transform: none -} - -button, html input[type="button"], input[type="reset"], input[type="submit"] { - -webkit-appearance: button; - cursor: pointer -} - -button[disabled], html input[disabled] { - cursor: default -} - -input[type="checkbox"], input[type="radio"] { - box-sizing: border-box; - padding: 0 -} - -input[type="search"] { - -webkit-appearance: textfield; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box -} - -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { - -webkit-appearance: none -} - -button::-moz-focus-inner, input::-moz-focus-inner { - border: 0; - padding: 0 -} - -textarea { - overflow: auto; - vertical-align: top -} - -table { - border-collapse: collapse; - border-spacing: 0 -} - -@-ms-viewport { - width: device-width -} - -@media screen and (max-width: 400px) { - @-ms-viewport { - width: 320px - } -} - -.hidden { - display: none !important; - visibility: hidden !important -} - -.visible-xs { - display: none !important -} - -tr.visible-xs { - display: none !important -} - -th.visible-xs, td.visible-xs { - display: none !important -} - -@media (max-width: 767px) { - .visible-xs { - display: block !important - } - - tr.visible-xs { - display: table-row !important - } - - th.visible-xs, td.visible-xs { - display: table-cell !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-xs.visible-sm { - display: block !important - } - - tr.visible-xs.visible-sm { - display: table-row !important - } - - th.visible-xs.visible-sm, td.visible-xs.visible-sm { - display: table-cell !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-xs.visible-md { - display: block !important - } - - tr.visible-xs.visible-md { - display: table-row !important - } - - th.visible-xs.visible-md, td.visible-xs.visible-md { - display: table-cell !important - } -} - -@media (min-width: 1200px) { - .visible-xs.visible-lg { - display: block !important - } - - tr.visible-xs.visible-lg { - display: table-row !important - } - - th.visible-xs.visible-lg, td.visible-xs.visible-lg { - display: table-cell !important - } -} - -.visible-sm { - display: none !important -} - -tr.visible-sm { - display: none !important -} - -th.visible-sm, td.visible-sm { - display: none !important -} - -@media (max-width: 767px) { - .visible-sm.visible-xs { - display: block !important - } - - tr.visible-sm.visible-xs { - display: table-row !important - } - - th.visible-sm.visible-xs, td.visible-sm.visible-xs { - display: table-cell !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-sm { - display: block !important - } - - tr.visible-sm { - display: table-row !important - } - - th.visible-sm, td.visible-sm { - display: table-cell !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-sm.visible-md { - display: block !important - } - - tr.visible-sm.visible-md { - display: table-row !important - } - - th.visible-sm.visible-md, td.visible-sm.visible-md { - display: table-cell !important - } -} - -@media (min-width: 1200px) { - .visible-sm.visible-lg { - display: block !important - } - - tr.visible-sm.visible-lg { - display: table-row !important - } - - th.visible-sm.visible-lg, td.visible-sm.visible-lg { - display: table-cell !important - } -} - -.visible-md { - display: none !important -} - -tr.visible-md { - display: none !important -} - -th.visible-md, td.visible-md { - display: none !important -} - -@media (max-width: 767px) { - .visible-md.visible-xs { - display: block !important - } - - tr.visible-md.visible-xs { - display: table-row !important - } - - th.visible-md.visible-xs, td.visible-md.visible-xs { - display: table-cell !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-md.visible-sm { - display: block !important - } - - tr.visible-md.visible-sm { - display: table-row !important - } - - th.visible-md.visible-sm, td.visible-md.visible-sm { - display: table-cell !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-md { - display: block !important - } - - tr.visible-md { - display: table-row !important - } - - th.visible-md, td.visible-md { - display: table-cell !important - } -} - -@media (min-width: 1200px) { - .visible-md.visible-lg { - display: block !important - } - - tr.visible-md.visible-lg { - display: table-row !important - } - - th.visible-md.visible-lg, td.visible-md.visible-lg { - display: table-cell !important - } -} - -.visible-lg { - display: none !important -} - -tr.visible-lg { - display: none !important -} - -th.visible-lg, td.visible-lg { - display: none !important -} - -@media (max-width: 767px) { - .visible-lg.visible-xs { - display: block !important - } - - tr.visible-lg.visible-xs { - display: table-row !important - } - - th.visible-lg.visible-xs, td.visible-lg.visible-xs { - display: table-cell !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .visible-lg.visible-sm { - display: block !important - } - - tr.visible-lg.visible-sm { - display: table-row !important - } - - th.visible-lg.visible-sm, td.visible-lg.visible-sm { - display: table-cell !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .visible-lg.visible-md { - display: block !important - } - - tr.visible-lg.visible-md { - display: table-row !important - } - - th.visible-lg.visible-md, td.visible-lg.visible-md { - display: table-cell !important - } -} - -@media (min-width: 1200px) { - .visible-lg { - display: block !important - } - - tr.visible-lg { - display: table-row !important - } - - th.visible-lg, td.visible-lg { - display: table-cell !important - } -} - -.hidden-xs { - display: block !important -} - -tr.hidden-xs { - display: table-row !important -} - -th.hidden-xs, td.hidden-xs { - display: table-cell !important -} - -@media (max-width: 767px) { - .hidden-xs { - display: none !important - } - - tr.hidden-xs { - display: none !important - } - - th.hidden-xs, td.hidden-xs { - display: none !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-xs.hidden-sm { - display: none !important - } - - tr.hidden-xs.hidden-sm { - display: none !important - } - - th.hidden-xs.hidden-sm, td.hidden-xs.hidden-sm { - display: none !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-xs.hidden-md { - display: none !important - } - - tr.hidden-xs.hidden-md { - display: none !important - } - - th.hidden-xs.hidden-md, td.hidden-xs.hidden-md { - display: none !important - } -} - -@media (min-width: 1200px) { - .hidden-xs.hidden-lg { - display: none !important - } - - tr.hidden-xs.hidden-lg { - display: none !important - } - - th.hidden-xs.hidden-lg, td.hidden-xs.hidden-lg { - display: none !important - } -} - -.hidden-sm { - display: block !important -} - -tr.hidden-sm { - display: table-row !important -} - -th.hidden-sm, td.hidden-sm { - display: table-cell !important -} - -@media (max-width: 767px) { - .hidden-sm.hidden-xs { - display: none !important - } - - tr.hidden-sm.hidden-xs { - display: none !important - } - - th.hidden-sm.hidden-xs, td.hidden-sm.hidden-xs { - display: none !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-sm { - display: none !important - } - - tr.hidden-sm { - display: none !important - } - - th.hidden-sm, td.hidden-sm { - display: none !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-sm.hidden-md { - display: none !important - } - - tr.hidden-sm.hidden-md { - display: none !important - } - - th.hidden-sm.hidden-md, td.hidden-sm.hidden-md { - display: none !important - } -} - -@media (min-width: 1200px) { - .hidden-sm.hidden-lg { - display: none !important - } - - tr.hidden-sm.hidden-lg { - display: none !important - } - - th.hidden-sm.hidden-lg, td.hidden-sm.hidden-lg { - display: none !important - } -} - -.hidden-md { - display: block !important -} - -tr.hidden-md { - display: table-row !important -} - -th.hidden-md, td.hidden-md { - display: table-cell !important -} - -@media (max-width: 767px) { - .hidden-md.hidden-xs { - display: none !important - } - - tr.hidden-md.hidden-xs { - display: none !important - } - - th.hidden-md.hidden-xs, td.hidden-md.hidden-xs { - display: none !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-md.hidden-sm { - display: none !important - } - - tr.hidden-md.hidden-sm { - display: none !important - } - - th.hidden-md.hidden-sm, td.hidden-md.hidden-sm { - display: none !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-md { - display: none !important - } - - tr.hidden-md { - display: none !important - } - - th.hidden-md, td.hidden-md { - display: none !important - } -} - -@media (min-width: 1200px) { - .hidden-md.hidden-lg { - display: none !important - } - - tr.hidden-md.hidden-lg { - display: none !important - } - - th.hidden-md.hidden-lg, td.hidden-md.hidden-lg { - display: none !important - } -} - -.hidden-lg { - display: block !important -} - -tr.hidden-lg { - display: table-row !important -} - -th.hidden-lg, td.hidden-lg { - display: table-cell !important -} - -@media (max-width: 767px) { - .hidden-lg.hidden-xs { - display: none !important - } - - tr.hidden-lg.hidden-xs { - display: none !important - } - - th.hidden-lg.hidden-xs, td.hidden-lg.hidden-xs { - display: none !important - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .hidden-lg.hidden-sm { - display: none !important - } - - tr.hidden-lg.hidden-sm { - display: none !important - } - - th.hidden-lg.hidden-sm, td.hidden-lg.hidden-sm { - display: none !important - } -} - -@media (min-width: 992px) and (max-width: 1199px) { - .hidden-lg.hidden-md { - display: none !important - } - - tr.hidden-lg.hidden-md { - display: none !important - } - - th.hidden-lg.hidden-md, td.hidden-lg.hidden-md { - display: none !important - } -} - -@media (min-width: 1200px) { - .hidden-lg { - display: none !important - } - - tr.hidden-lg { - display: none !important - } - - th.hidden-lg, td.hidden-lg { - display: none !important - } -} - -.visible-print { - display: none !important -} - -tr.visible-print { - display: none !important -} - -th.visible-print, td.visible-print { - display: none !important -} - -@media print { - .visible-print { - display: block !important - } - - tr.visible-print { - display: table-row !important - } - - th.visible-print, td.visible-print { - display: table-cell !important - } - - .hidden-print { - display: none !important - } - - tr.hidden-print { - display: none !important - } - - th.hidden-print, td.hidden-print { - display: none !important - } -} - -.container { - margin-right: auto; - margin-left: auto; - padding-left: 15px; - padding-right: 15px -} - -.container:before, .container:after { - content: " "; - display: table -} - -.container:after { - clear: both -} - -.row-fluid { - margin-left: -15px; - margin-right: -15px -} - -.row-fluid:before, .row-fluid:after { - content: " "; - display: table -} - -.row-fluid:after { - clear: both -} - -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { - position: relative; - min-height: 1px; - padding-left: 15px; - padding-right: 15px -} - -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11 { - float: left -} - -.col-xs-1 { - width: 8.333333333333332% -} - -.col-xs-2 { - width: 16.666666666666664% -} - -.col-xs-3 { - width: 25% -} - -.col-xs-4 { - width: 33.33333333333333% -} - -.col-xs-5 { - width: 41.66666666666667% -} - -.col-xs-6 { - width: 50% -} - -.col-xs-7 { - width: 58.333333333333336% -} - -.col-xs-8 { - width: 66.66666666666666% -} - -.col-xs-9 { - width: 75% -} - -.col-xs-10 { - width: 83.33333333333334% -} - -.col-xs-11 { - width: 91.66666666666666% -} - -.col-xs-12 { - width: 100% -} - -@media (min-width: 768px) { - .container { - max-width: 750px - } - - .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11 { - float: left - } - - .col-sm-1 { - width: 8.333333333333332% - } - - .col-sm-2 { - width: 16.666666666666664% - } - - .col-sm-3 { - width: 25% - } - - .col-sm-4 { - width: 33.33333333333333% - } - - .col-sm-5 { - width: 41.66666666666667% - } - - .col-sm-6 { - width: 50% - } - - .col-sm-7 { - width: 58.333333333333336% - } - - .col-sm-8 { - width: 66.66666666666666% - } - - .col-sm-9 { - width: 75% - } - - .col-sm-10 { - width: 83.33333333333334% - } - - .col-sm-11 { - width: 91.66666666666666% - } - - .col-sm-12 { - width: 100% - } - - .col-sm-push-1 { - left: 8.333333333333332% - } - - .col-sm-push-2 { - left: 16.666666666666664% - } - - .col-sm-push-3 { - left: 25% - } - - .col-sm-push-4 { - left: 33.33333333333333% - } - - .col-sm-push-5 { - left: 41.66666666666667% - } - - .col-sm-push-6 { - left: 50% - } - - .col-sm-push-7 { - left: 58.333333333333336% - } - - .col-sm-push-8 { - left: 66.66666666666666% - } - - .col-sm-push-9 { - left: 75% - } - - .col-sm-push-10 { - left: 83.33333333333334% - } - - .col-sm-push-11 { - left: 91.66666666666666% - } - - .col-sm-pull-1 { - right: 8.333333333333332% - } - - .col-sm-pull-2 { - right: 16.666666666666664% - } - - .col-sm-pull-3 { - right: 25% - } - - .col-sm-pull-4 { - right: 33.33333333333333% - } - - .col-sm-pull-5 { - right: 41.66666666666667% - } - - .col-sm-pull-6 { - right: 50% - } - - .col-sm-pull-7 { - right: 58.333333333333336% - } - - .col-sm-pull-8 { - right: 66.66666666666666% - } - - .col-sm-pull-9 { - right: 75% - } - - .col-sm-pull-10 { - right: 83.33333333333334% - } - - .col-sm-pull-11 { - right: 91.66666666666666% - } - - .col-sm-offset-1 { - margin-left: 8.333333333333332% - } - - .col-sm-offset-2 { - margin-left: 16.666666666666664% - } - - .col-sm-offset-3 { - margin-left: 25% - } - - .col-sm-offset-4 { - margin-left: 33.33333333333333% - } - - .col-sm-offset-5 { - margin-left: 41.66666666666667% - } - - .col-sm-offset-6 { - margin-left: 50% - } - - .col-sm-offset-7 { - margin-left: 58.333333333333336% - } - - .col-sm-offset-8 { - margin-left: 66.66666666666666% - } - - .col-sm-offset-9 { - margin-left: 75% - } - - .col-sm-offset-10 { - margin-left: 83.33333333333334% - } - - .col-sm-offset-11 { - margin-left: 91.66666666666666% - } -} - -@media (min-width: 992px) { - .container { - max-width: 970px - } - - .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11 { - float: left - } - - .col-md-1 { - width: 8.333333333333332% - } - - .col-md-2 { - width: 16.666666666666664% - } - - .col-md-3 { - width: 25% - } - - .col-md-4 { - width: 33.33333333333333% - } - - .col-md-5 { - width: 41.66666666666667% - } - - .col-md-6 { - width: 50% - } - - .col-md-7 { - width: 58.333333333333336% - } - - .col-md-8 { - width: 66.66666666666666% - } - - .col-md-9 { - width: 75% - } - - .col-md-10 { - width: 83.33333333333334% - } - - .col-md-11 { - width: 91.66666666666666% - } - - .col-md-12 { - width: 100% - } - - .col-md-push-0 { - left: auto - } - - .col-md-push-1 { - left: 8.333333333333332% - } - - .col-md-push-2 { - left: 16.666666666666664% - } - - .col-md-push-3 { - left: 25% - } - - .col-md-push-4 { - left: 33.33333333333333% - } - - .col-md-push-5 { - left: 41.66666666666667% - } - - .col-md-push-6 { - left: 50% - } - - .col-md-push-7 { - left: 58.333333333333336% - } - - .col-md-push-8 { - left: 66.66666666666666% - } - - .col-md-push-9 { - left: 75% - } - - .col-md-push-10 { - left: 83.33333333333334% - } - - .col-md-push-11 { - left: 91.66666666666666% - } - - .col-md-pull-0 { - right: auto - } - - .col-md-pull-1 { - right: 8.333333333333332% - } - - .col-md-pull-2 { - right: 16.666666666666664% - } - - .col-md-pull-3 { - right: 25% - } - - .col-md-pull-4 { - right: 33.33333333333333% - } - - .col-md-pull-5 { - right: 41.66666666666667% - } - - .col-md-pull-6 { - right: 50% - } - - .col-md-pull-7 { - right: 58.333333333333336% - } - - .col-md-pull-8 { - right: 66.66666666666666% - } - - .col-md-pull-9 { - right: 75% - } - - .col-md-pull-10 { - right: 83.33333333333334% - } - - .col-md-pull-11 { - right: 91.66666666666666% - } - - .col-md-offset-0 { - margin-left: 0 - } - - .col-md-offset-1 { - margin-left: 8.333333333333332% - } - - .col-md-offset-2 { - margin-left: 16.666666666666664% - } - - .col-md-offset-3 { - margin-left: 25% - } - - .col-md-offset-4 { - margin-left: 33.33333333333333% - } - - .col-md-offset-5 { - margin-left: 41.66666666666667% - } - - .col-md-offset-6 { - margin-left: 50% - } - - .col-md-offset-7 { - margin-left: 58.333333333333336% - } - - .col-md-offset-8 { - margin-left: 66.66666666666666% - } - - .col-md-offset-9 { - margin-left: 75% - } - - .col-md-offset-10 { - margin-left: 83.33333333333334% - } - - .col-md-offset-11 { - margin-left: 91.66666666666666% - } -} - -@media (min-width: 1200px) { - .container { - max-width: 1170px - } - - .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11 { - float: left - } - - .col-lg-1 { - width: 8.333333333333332% - } - - .col-lg-2 { - width: 16.666666666666664% - } - - .col-lg-3 { - width: 25% - } - - .col-lg-4 { - width: 33.33333333333333% - } - - .col-lg-5 { - width: 41.66666666666667% - } - - .col-lg-6 { - width: 50% - } - - .col-lg-7 { - width: 58.333333333333336% - } - - .col-lg-8 { - width: 66.66666666666666% - } - - .col-lg-9 { - width: 75% - } - - .col-lg-10 { - width: 83.33333333333334% - } - - .col-lg-11 { - width: 91.66666666666666% - } - - .col-lg-12 { - width: 100% - } - - .col-lg-push-0 { - left: auto - } - - .col-lg-push-1 { - left: 8.333333333333332% - } - - .col-lg-push-2 { - left: 16.666666666666664% - } - - .col-lg-push-3 { - left: 25% - } - - .col-lg-push-4 { - left: 33.33333333333333% - } - - .col-lg-push-5 { - left: 41.66666666666667% - } - - .col-lg-push-6 { - left: 50% - } - - .col-lg-push-7 { - left: 58.333333333333336% - } - - .col-lg-push-8 { - left: 66.66666666666666% - } - - .col-lg-push-9 { - left: 75% - } - - .col-lg-push-10 { - left: 83.33333333333334% - } - - .col-lg-push-11 { - left: 91.66666666666666% - } - - .col-lg-pull-0 { - right: auto - } - - .col-lg-pull-1 { - right: 8.333333333333332% - } - - .col-lg-pull-2 { - right: 16.666666666666664% - } - - .col-lg-pull-3 { - right: 25% - } - - .col-lg-pull-4 { - right: 33.33333333333333% - } - - .col-lg-pull-5 { - right: 41.66666666666667% - } - - .col-lg-pull-6 { - right: 50% - } - - .col-lg-pull-7 { - right: 58.333333333333336% - } - - .col-lg-pull-8 { - right: 66.66666666666666% - } - - .col-lg-pull-9 { - right: 75% - } - - .col-lg-pull-10 { - right: 83.33333333333334% - } - - .col-lg-pull-11 { - right: 91.66666666666666% - } - - .col-lg-offset-0 { - margin-left: 0 - } - - .col-lg-offset-1 { - margin-left: 8.333333333333332% - } - - .col-lg-offset-2 { - margin-left: 16.666666666666664% - } - - .col-lg-offset-3 { - margin-left: 25% - } - - .col-lg-offset-4 { - margin-left: 33.33333333333333% - } - - .col-lg-offset-5 { - margin-left: 41.66666666666667% - } - - .col-lg-offset-6 { - margin-left: 50% - } - - .col-lg-offset-7 { - margin-left: 58.333333333333336% - } - - .col-lg-offset-8 { - margin-left: 66.66666666666666% - } - - .col-lg-offset-9 { - margin-left: 75% - } - - .col-lg-offset-10 { - margin-left: 83.33333333333334% - } - - .col-lg-offset-11 { - margin-left: 91.66666666666666% - } -} - -.btn { - display: inline-block; - padding: 6px 12px; - margin-bottom: 0; - font-size: 14px; - font-weight: normal; - line-height: 1.428571429; - text-align: center; - vertical-align: middle; - cursor: pointer; - border: 1px solid transparent; - border-radius: 0; - white-space: nowrap; - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - -o-user-select: none; - user-select: none -} - -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px -} - -.btn:hover, .btn:focus { - color: #333; - text-decoration: none -} - -.btn:active, .btn.active { - outline: 0; - background-image: none -} - -.btn.disabled, .btn[disabled], fieldset[disabled] .btn { - cursor: not-allowed; - pointer-events: none; - opacity: .65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - box-shadow: none -} - -.btn-default { - color: #333; - background-color: #fff; - border-color: #ccc -} - -.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default { - color: #333; - background-color: #ebebeb; - border-color: #adadad -} - -.btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default { - background-image: none -} - -.btn-default.disabled, .btn-default[disabled], fieldset[disabled] .btn-default, .btn-default.disabled:hover, .btn-default[disabled]:hover, fieldset[disabled] .btn-default:hover, .btn-default.disabled:focus, .btn-default[disabled]:focus, fieldset[disabled] .btn-default:focus, .btn-default.disabled:active, .btn-default[disabled]:active, fieldset[disabled] .btn-default:active, .btn-default.disabled.active, .btn-default[disabled].active, fieldset[disabled] .btn-default.active { - background-color: #fff; - border-color: #ccc -} - -.btn-primary { - color: #fff; - background-color: #428bca; - border-color: #357ebd -} - -.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary { - color: #fff; - background-color: #3276b1; - border-color: #285e8e -} - -.btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary { - background-image: none -} - -.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { - background-color: #428bca; - border-color: #357ebd -} - -.btn-warning { - color: #fff; - background-color: #f0ad4e; - border-color: #eea236 -} - -.btn-warning:hover, .btn-warning:focus, .btn-warning:active, .btn-warning.active, .open .dropdown-toggle.btn-warning { - color: #fff; - background-color: #ed9c28; - border-color: #d58512 -} - -.btn-warning:active, .btn-warning.active, .open .dropdown-toggle.btn-warning { - background-image: none -} - -.btn-warning.disabled, .btn-warning[disabled], fieldset[disabled] .btn-warning, .btn-warning.disabled:hover, .btn-warning[disabled]:hover, fieldset[disabled] .btn-warning:hover, .btn-warning.disabled:focus, .btn-warning[disabled]:focus, fieldset[disabled] .btn-warning:focus, .btn-warning.disabled:active, .btn-warning[disabled]:active, fieldset[disabled] .btn-warning:active, .btn-warning.disabled.active, .btn-warning[disabled].active, fieldset[disabled] .btn-warning.active { - background-color: #f0ad4e; - border-color: #eea236 -} - -.btn-danger { - color: #fff; - background-color: #d9534f; - border-color: #d43f3a -} - -.btn-danger:hover, .btn-danger:focus, .btn-danger:active, .btn-danger.active, .open .dropdown-toggle.btn-danger { - color: #fff; - background-color: #d2322d; - border-color: #ac2925 -} - -.btn-danger:active, .btn-danger.active, .open .dropdown-toggle.btn-danger { - background-image: none -} - -.btn-danger.disabled, .btn-danger[disabled], fieldset[disabled] .btn-danger, .btn-danger.disabled:hover, .btn-danger[disabled]:hover, fieldset[disabled] .btn-danger:hover, .btn-danger.disabled:focus, .btn-danger[disabled]:focus, fieldset[disabled] .btn-danger:focus, .btn-danger.disabled:active, .btn-danger[disabled]:active, fieldset[disabled] .btn-danger:active, .btn-danger.disabled.active, .btn-danger[disabled].active, fieldset[disabled] .btn-danger.active { - background-color: #d9534f; - border-color: #d43f3a -} - -.btn-success { - color: #fff; - background-color: #5cb85c; - border-color: #4cae4c -} - -.btn-success:hover, .btn-success:focus, .btn-success:active, .btn-success.active, .open .dropdown-toggle.btn-success { - color: #fff; - background-color: #47a447; - border-color: #398439 -} - -.btn-success:active, .btn-success.active, .open .dropdown-toggle.btn-success { - background-image: none -} - -.btn-success.disabled, .btn-success[disabled], fieldset[disabled] .btn-success, .btn-success.disabled:hover, .btn-success[disabled]:hover, fieldset[disabled] .btn-success:hover, .btn-success.disabled:focus, .btn-success[disabled]:focus, fieldset[disabled] .btn-success:focus, .btn-success.disabled:active, .btn-success[disabled]:active, fieldset[disabled] .btn-success:active, .btn-success.disabled.active, .btn-success[disabled].active, fieldset[disabled] .btn-success.active { - background-color: #5cb85c; - border-color: #4cae4c -} - -.btn-info { - color: #fff; - background-color: #5bc0de; - border-color: #46b8da -} - -.btn-info:hover, .btn-info:focus, .btn-info:active, .btn-info.active, .open .dropdown-toggle.btn-info { - color: #fff; - background-color: #39b3d7; - border-color: #269abc -} - -.btn-info:active, .btn-info.active, .open .dropdown-toggle.btn-info { - background-image: none -} - -.btn-info.disabled, .btn-info[disabled], fieldset[disabled] .btn-info, .btn-info.disabled:hover, .btn-info[disabled]:hover, fieldset[disabled] .btn-info:hover, .btn-info.disabled:focus, .btn-info[disabled]:focus, fieldset[disabled] .btn-info:focus, .btn-info.disabled:active, .btn-info[disabled]:active, fieldset[disabled] .btn-info:active, .btn-info.disabled.active, .btn-info[disabled].active, fieldset[disabled] .btn-info.active { - background-color: #5bc0de; - border-color: #46b8da -} - -.btn-link { - color: #428bca; - font-weight: normal; - cursor: pointer; - border-radius: 0 -} - -.btn-link, .btn-link:active, .btn-link[disabled], fieldset[disabled] .btn-link { - background-color: transparent; - -webkit-box-shadow: none; - box-shadow: none -} - -.btn-link, .btn-link:hover, .btn-link:focus, .btn-link:active { - border-color: transparent -} - -.btn-link:hover, .btn-link:focus { - color: #2a6496; - text-decoration: underline; - background-color: transparent -} - -.btn-link[disabled]:hover, fieldset[disabled] .btn-link:hover, .btn-link[disabled]:focus, fieldset[disabled] .btn-link:focus { - color: #999; - text-decoration: none -} - -.btn-lg { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px -} - -.btn-sm, .btn-xs { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px -} - -.btn-xs { - padding: 1px 5px -} - -.btn-block { - display: block; - width: 100%; - padding-left: 0; - padding-right: 0 -} - -.btn-block + .btn-block { - margin-top: 5px -} - -input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="button"].btn-block { - width: 100% -} - -.btn-default .caret { - border-top-color: #333 -} - -.btn-primary .caret, .btn-success .caret, .btn-warning .caret, .btn-danger .caret, .btn-info .caret { - border-top-color: #fff -} - -.dropup .btn-default .caret { - border-bottom-color: #333 -} - -.dropup .btn-primary .caret, .dropup .btn-success .caret, .dropup .btn-warning .caret, .dropup .btn-danger .caret, .dropup .btn-info .caret { - border-bottom-color: #fff -} - -.btn-group, .btn-group-vertical { - position: relative; - display: inline-block; - vertical-align: middle -} - -.btn-group > .btn, .btn-group-vertical > .btn { - position: relative; - float: left -} - -.btn-group > .btn:hover, .btn-group-vertical > .btn:hover, .btn-group > .btn:focus, .btn-group-vertical > .btn:focus, .btn-group > .btn:active, .btn-group-vertical > .btn:active, .btn-group > .btn.active, .btn-group-vertical > .btn.active { - z-index: 2 -} - -.btn-group > .btn:focus, .btn-group-vertical > .btn:focus { - outline: 0 -} - -.btn-group .btn + .btn, .btn-group .btn + .btn-group, .btn-group .btn-group + .btn, .btn-group .btn-group + .btn-group { - margin-left: -1px -} - -.btn-toolbar:before, .btn-toolbar:after { - content: " "; - display: table -} - -.btn-toolbar:after { - clear: both -} - -.btn-toolbar .btn-group { - float: left -} - -.btn-toolbar > .btn + .btn, .btn-toolbar > .btn-group + .btn, .btn-toolbar > .btn + .btn-group, .btn-toolbar > .btn-group + .btn-group { - margin-left: 5px -} - -.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) { - border-radius: 0 -} - -.btn-group > .btn:first-child { - margin-left: 0 -} - -.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-bottom-right-radius: 0; - border-top-right-radius: 0 -} - -.btn-group > .btn:last-child:not(:first-child), .btn-group > .dropdown-toggle:not(:first-child) { - border-bottom-left-radius: 0; - border-top-left-radius: 0 -} - -.btn-group > .btn-group { - float: left -} - -.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0 -} - -.btn-group > .btn-group:first-child > .btn:last-child, .btn-group > .btn-group:first-child > .dropdown-toggle { - border-bottom-right-radius: 0; - border-top-right-radius: 0 -} - -.btn-group > .btn-group:last-child > .btn:first-child { - border-bottom-left-radius: 0; - border-top-left-radius: 0 -} - -.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { - outline: 0 -} - -.btn-group-xs > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px; - padding: 1px 5px -} - -.btn-group-sm > .btn { - padding: 5px 10px; - font-size: 12px; - line-height: 1.5; - border-radius: 3px -} - -.btn-group-lg > .btn { - padding: 10px 16px; - font-size: 18px; - line-height: 1.33; - border-radius: 6px -} - -.btn-group > .btn + .dropdown-toggle { - padding-left: 8px; - padding-right: 8px -} - -.btn-group > .btn-lg + .dropdown-toggle { - padding-left: 12px; - padding-right: 12px -} - -.btn-group.open .dropdown-toggle { - background: #f2f2f2 -} - -.btn .caret { - margin-left: 0 -} - -.btn-lg .caret { - border-width: 5px 5px 0; - border-bottom-width: 0 -} - -.dropup .btn-lg .caret { - border-width: 0 5px 5px -} - -.btn-group-vertical > .btn, .btn-group-vertical > .btn-group { - display: block; - float: none; - width: 100%; - max-width: 100% -} - -.btn-group-vertical > .btn-group:before, .btn-group-vertical > .btn-group:after { - content: " "; - display: table -} - -.btn-group-vertical > .btn-group:after { - clear: both -} - -.btn-group-vertical > .btn-group > .btn { - float: none -} - -.btn-group-vertical > .btn + .btn, .btn-group-vertical > .btn + .btn-group, .btn-group-vertical > .btn-group + .btn, .btn-group-vertical > .btn-group + .btn-group { - margin-top: -1px; - margin-left: 0 -} - -.btn-group-vertical > .btn:not(:first-child):not(:last-child) { - border-radius: 0 -} - -.btn-group-vertical > .btn:first-child:not(:last-child) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; - border-bottom-left-radius: 0 -} - -.btn-group-vertical > .btn:last-child:not(:first-child) { - border-bottom-left-radius: 0; - border-top-right-radius: 0; - border-top-left-radius: 0 -} - -.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0 -} - -.btn-group-vertical > .btn-group:first-child > .btn:last-child, .btn-group-vertical > .btn-group:first-child > .dropdown-toggle { - border-bottom-right-radius: 0; - border-bottom-left-radius: 0 -} - -.btn-group-vertical > .btn-group:last-child > .btn:first-child { - border-top-right-radius: 0; - border-top-left-radius: 0 -} - -.btn-group-justified { - display: table; - width: 100%; - table-layout: fixed; - border-collapse: separate -} - -.btn-group-justified .btn { - float: none; - display: table-cell; - width: 1% -} - -[data-toggle="buttons"] > .btn > input[type="radio"], [data-toggle="buttons"] > .btn > input[type="checkbox"] { - display: none -} - -.caret { - display: inline-block; - width: 0; - height: 0; - margin-left: 2px; - vertical-align: middle; - border-top: 4px solid #000; - border-right: 4px solid transparent; - border-left: 4px solid transparent; - border-bottom: 0 dotted; - content: "" -} - -.dropdown { - position: relative -} - -.dropdown-toggle:focus { - outline: 0 -} - -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - display: none; - float: left; - min-width: 160px; - padding: 5px 0; - margin: 2px 0 0; - list-style: none; - font-size: 14px; - background-color: #fff; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - border-radius: 0; - background-clip: padding-box -} - -.dropdown-menu.pull-right { - right: 0; - left: auto -} - -.dropdown-menu .divider { - height: 1px; - margin: 9px 0; - overflow: hidden; - background-color: #e5e5e5 -} - -.dropdown-menu > li > a { - font-size: 14px; - text-decoration: none; - display: block; - padding: 5px 20px; - clear: both; - font-weight: normal; - line-height: 1.428571429; - color: #333; - white-space: nowrap -} - -.dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - text-decoration: none; - color: #fff; - background-color: #428bca -} - -.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { - color: #fff; - text-decoration: none; - outline: 0; - background-color: #428bca -} - -.dropdown-menu > .disabled > a, .dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - color: #999 -} - -.dropdown-menu > .disabled > a:hover, .dropdown-menu > .disabled > a:focus { - text-decoration: none; - background-color: transparent; - background-image: none; - filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); - cursor: not-allowed -} - -.open > .dropdown-menu { - display: block -} - -.open > a { - outline: 0 -} - -.dropdown-header { - display: block; - padding: 3px 20px; - font-size: 12px; - line-height: 1.428571429; - color: #999 -} - -.dropdown-backdrop { - position: fixed; - left: 0; - right: 0; - bottom: 0; - top: 0; - z-index: 990 -} - -.pull-right > .dropdown-menu { - right: 0; - left: auto -} - -.dropup .caret, .navbar-fixed-bottom .dropdown .caret { - border-top: 0 dotted; - border-bottom: 4px solid #000; - content: "" -} - -.dropup .dropdown-menu, .navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px -} - -@media (min-width: 768px) { - .navbar-right .dropdown-menu { - right: 0; - left: auto - } -} - -body, html { - font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; - margin: 0; - background: #ededed; - color: #343437; - line-height: 2em; - font-weight: 300; - font-size: .95em -} - -h1 { - font-size: 2.5em; - margin: .8em 0 -} - -body.center { - padding: 0 30px; - background: #FFF; - font-size: 1em -} - -ul li { - list-style-type: disc -} - -a { - color: #4290ad; - text-decoration: none; - font-weight: normal -} - -a:hover { - text-decoration: underline -} - -h1, h2, h3 { - font-weight: 300; - line-height: 1.2em -} - -.topNav, .bottomNav { - background: #f2f2f2; - margin: 0 -30px; - margin-bottom: 20px -} - -.topNav:before, .bottomNav:before, .topNav:after, .bottomNav:after { - content: " "; - display: table -} - -.topNav:after, .bottomNav:after { - clear: both -} - -.topNav ul.navList, .bottomNav ul.navList { - padding: 10px 20px; - margin: 0; - list-style-type: none -} - -.topNav ul.navList li, .bottomNav ul.navList li { - display: inline; - padding: 0 10px -} - -.topNav ul.navList li.navBarCell1Rev, .bottomNav ul.navList li.navBarCell1Rev { - font-weight: bold -} - -.bottomNav { - margin-top: 30px; - margin-bottom: 0 -} - -.aboutLanguage { - color: #BBB; - background: white; - text-align: center; - padding: 20px 0 -} - -.subNav { - padding-bottom: 10px; - margin-bottom: 10px; - border-bottom: 1px solid #EEE -} - -.subNav:before, .subNav:after { - content: " "; - display: table -} - -.subNav:after { - clear: both -} - -.subNav div:before, .subNav div:after { - content: " "; - display: table -} - -.subNav div:after { - clear: both -} - -.subNav ul.navList, .subNav ul { - font-size: .9em; - margin: 0; - padding: 00; - float: left; - list-style-type: none -} - -.subNav ul.navList li, .subNav ul li { - padding: 0 5px; - display: inline -} - -table.overviewSummary, .contentContainer ul li table { - width: 100%; - margin: 20px 0 -} - -table.overviewSummary caption, .contentContainer ul li table caption { - text-align: left; - font-weight: 100; - font-size: 1em; - float: left; - padding: 0 10px; - margin-top: 10px; - background: #db4800; - color: white -} - -table.overviewSummary tr th, .contentContainer ul li table tr th { - padding: 10px; - font-weight: bold; - font-size: 1em; - text-align: left -} - -table.overviewSummary tr td, .contentContainer ul li table tr td { - vertical-align: top; - font-size: .9em; - padding: 5px 10px; - border-top: 1px solid #EEE -} - -table.overviewSummary tbody > tr:nth-child(odd) > td, .contentContainer ul li table tbody > tr:nth-child(odd) > td { - background-color: #f9f9f9 -} - -body.left { - padding-top: 10px -} - -body.left h1, body.left h2 { - display: inline; - text-align: left; - font-weight: 100; - font-size: 1em; - margin: 0 10px; - padding: 3px 10px; - margin-top: 10px; - background: #db4800; - color: white; - line-height: 40px -} - -body.left .indexHeader { - margin: 0; - padding: 0 15px; - font-size: .9em -} - -body.left ul { - list-style-type: none; - margin: 0; - padding: 0 -} - -body.left ul li { - margin: 0; - padding: 0 -} - -body.left ul li a { - display: block; - padding: 0 15px; - text-decoration: none -} - -body.left ul li a:hover { - text-decoration: underline -} - -.contentContainer .header ul, .contentContainer ul.blockList { - padding: 0 -} - -.contentContainer .header ul > li, .contentContainer ul.blockList > li { - list-style-type: none -} - -.contentContainer ul.inheritance { - margin-left: 0; - padding-left: 0 -} - -.contentContainer ul.inheritance li { - list-style-type: none -} - -.contentContainer ul.inheritance ul.inheritance { - padding-left: 20px -} - -.contentContainer hr { - border: 0 none; - border-top: 1px solid #EEE; - margin-top: 30px; - margin-botom: 0 -} - -ul.blockList ul.blockList, ul.blockList ul.blockListLast { - border: 1px solid #EEE; - margin: 20px 0; - padding: 0 20px -} - -ul.blockList ul.blockList h4, ul.blockList ul.blockListLast h4, ul.blockList ul.blockList h3, ul.blockList ul.blockListLast h3 { - font-size: 1em; - font-weight: bold; - line-height: 2em; - text-indent: 10px; - border-bottom: 1px solid #EEE; - margin: 0 -20px; - padding: 5px 0; - background: #f2f2f2 -} - -ul.blockList ul.blockList li, ul.blockList ul.blockListLast li { - list-style-type: none -} - -ul.horizontal { - list-style-type: none; - padding: 0; - margin: 0; - font-size: .9em -} - -ul.horizontal li { - display: inline -} - -span.strong { - font-weight: bold -} - -a span.strong { - font-weight: normal -} diff --git a/src/it/advancedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/advancedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index 543489c5b..000000000 --- a/src/it/advancedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; -import java.util.Scanner; - - -public class TheTest { - - @Test - public void testSomeClassExistsAndContainsJavaLinks() throws Exception { - File generatedGroovyDoc = new File("target/gapidocs/org/codehaus/gmavenplus/SomeClass.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - Assert.assertTrue(generatedGroovyDoc + " does not contain Java 5 links.", readFileToString(generatedGroovyDoc) - .contains("https://docs.oracle.com/en/java/javase/11/docs/api/")); - } - - @Test - public void testSomeOtherClassExistsAndContainsJavaLinks() throws Exception { - File generatedGroovyDoc = new File("target/gapidocs/org/codehaus/gmavenplus/SomeOtherClass.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - Assert.assertTrue(generatedGroovyDoc + " does not contain Java 5 links.", readFileToString(generatedGroovyDoc) - .contains("https://docs.oracle.com/en/java/javase/11/docs/api/")); - } - - @Test - public void testOverviewSummaryExistsAndContainsStylesheetLink() throws Exception { - File generatedGroovyDoc = new File("target/gapidocs/overview-summary.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - Assert.assertTrue(generatedGroovyDoc + " does not contain stylesheet link.", readFileToString(generatedGroovyDoc) - .contains("")); - } - - private String readFileToString(File file) throws IOException { - Scanner scanner = null; - try { - scanner = new Scanner(file); - return scanner.useDelimiter("\\A").next(); - } finally { - if (scanner != null) { - scanner.close(); - } - } - } - -} diff --git a/src/it/astCompile/pom.xml b/src/it/astCompile/pom.xml deleted file mode 100644 index 4fc212628..000000000 --- a/src/it/astCompile/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-astCompile - testing - GMavenPlus Plugin AST Compile Test - A test of an AST transformation. This will fail for all Groovy versions before 1.6-beta-2. - - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/astCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/astCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index 73b2ce0ec..000000000 --- a/src/it/astCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeClass { - @Lazy - def list = ["dog", "cat"] - - def someMethod() { - return list.toString() - } - -} diff --git a/src/it/astCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/astCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java deleted file mode 100644 index 4d362230f..000000000 --- a/src/it/astCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - - -public class SomeClassTest { - - @Test - public void testSomeMethod() { - SomeClass someClass = new SomeClass(); - Assert.assertEquals("[dog, cat]", someClass.someMethod().toString()); - } - -} diff --git a/src/it/basicCompile/pom.xml b/src/it/basicCompile/pom.xml deleted file mode 100644 index c67157743..000000000 --- a/src/it/basicCompile/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-basicCompile - testing - GMavenPlus Plugin Basic Compile Test - The simplest compile use case. - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - compile - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/basicExecute/pom.xml b/src/it/basicExecute/pom.xml deleted file mode 100644 index 5880401c5..000000000 --- a/src/it/basicExecute/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-basicExecute - testing - GMavenPlus Plugin Execute Test - - - - junit - junit - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - generate-test-sources - - execute - - - - - - - - - - - @groovyGroupId@ - groovy - @groovyVersion@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/basicExecute/src/main/groovy/HelloWorld.groovy b/src/it/basicExecute/src/main/groovy/HelloWorld.groovy deleted file mode 100644 index 31c45c6f3..000000000 --- a/src/it/basicExecute/src/main/groovy/HelloWorld.groovy +++ /dev/null @@ -1,4 +0,0 @@ -File targetDir = new File('target') -if (!targetDir.exists()) - targetDir.mkdir() -new File('target/helloWorld.txt').append('Hello world!') diff --git a/src/it/basicExecute/src/test/java/TheTest.java b/src/it/basicExecute/src/test/java/TheTest.java deleted file mode 100644 index 5e65848a0..000000000 --- a/src/it/basicExecute/src/test/java/TheTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class TheTest { - - @Test - public void test() { - File fileFromScript = new File("target/helloWorld.txt"); - Assert.assertTrue(fileFromScript.exists()); - Assert.assertTrue(fileFromScript.length() > 0); - } - -} diff --git a/src/it/basicGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/basicGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index f5e054171..000000000 --- a/src/it/basicGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeClass { - - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/basicGenerateStubs/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/basicGenerateStubs/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java deleted file mode 100644 index c5cf0a070..000000000 --- a/src/it/basicGenerateStubs/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class SomeClassTest { - - @Test - public void testSomeClassStubExists() { - File generatedStub = new File("target/generated-sources/groovy-stubs/main/org/codehaus/gmavenplus/SomeClass.java"); - Assert.assertTrue(generatedStub + " does not exist.", generatedStub.exists()); - Assert.assertTrue(generatedStub + " is empty.", generatedStub.length() > 0); - } - -} diff --git a/src/it/basicGroovydoc/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/basicGroovydoc/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java deleted file mode 100644 index b4e21d872..000000000 --- a/src/it/basicGroovydoc/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class SomeClassTest { - - @Test - public void testSomeClassExists() { - File generatedGroovyDoc = new File("target/gapidocs/org/codehaus/gmavenplus/SomeClass.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - } - - @Test - public void testOverviewSummaryExists() { - File generatedGroovyDoc = new File("target/gapidocs/overview-summary.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - } - -} diff --git a/src/it/basicGroovydocJar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/basicGroovydocJar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index 9c741190f..000000000 --- a/src/it/basicGroovydocJar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.gmavenplus - - -/** - * Some Example Cass - * - * @author Keegan Witt - * @version super awesome - */ -class SomeClass { - - /** - * This method does absolutely nothing - * @param unusedParam a useless parameter - */ - void doNothing(String unusedParam) {} - -} diff --git a/src/it/advancedCompile/invoker.properties b/src/it/classpath-plugin-only/invoker.properties similarity index 100% rename from src/it/advancedCompile/invoker.properties rename to src/it/classpath-plugin-only/invoker.properties diff --git a/src/it/pluginClasspath/pom.xml b/src/it/classpath-plugin-only/pom.xml similarity index 94% rename from src/it/pluginClasspath/pom.xml rename to src/it/classpath-plugin-only/pom.xml index b1d50b704..1fd6cd925 100644 --- a/src/it/pluginClasspath/pom.xml +++ b/src/it/classpath-plugin-only/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-pluginClasspath + gmavenplus-plugin-it-classpath-plugin-only testing - GMavenPlus Plugin Plugin Classpath test + GMavenPlus Plugin Plugin-only Classpath Test Compiling, generating stubs, and GroovyDoc, using Groovy as a plugin dependency. diff --git a/src/it/pluginAndProjectClasspath/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/classpath-plugin-only/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/pluginAndProjectClasspath/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/classpath-plugin-only/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/pluginAndProjectClasspath/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/classpath-plugin-only/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java similarity index 100% rename from src/it/pluginAndProjectClasspath/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java rename to src/it/classpath-plugin-only/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java diff --git a/src/it/advancedExecute/invoker.properties b/src/it/classpath-project-and-plugin/invoker.properties similarity index 100% rename from src/it/advancedExecute/invoker.properties rename to src/it/classpath-project-and-plugin/invoker.properties diff --git a/src/it/pluginAndProjectClasspath/pom.xml b/src/it/classpath-project-and-plugin/pom.xml similarity index 94% rename from src/it/pluginAndProjectClasspath/pom.xml rename to src/it/classpath-project-and-plugin/pom.xml index 6449e2d2b..12b69aa96 100644 --- a/src/it/pluginAndProjectClasspath/pom.xml +++ b/src/it/classpath-project-and-plugin/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-pluginAndProjectClasspath + gmavenplus-plugin-it-classpath-project-and-plugin testing - GMavenPlus Plugin Plugin and Project Classpath test + GMavenPlus Plugin Project and Plugin Classpath Test Compiling, generating stubs, and GroovyDoc, using Groovy as a plugin dependency, while also including project dependencies. diff --git a/src/it/pluginClasspath/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/classpath-project-and-plugin/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/pluginClasspath/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/classpath-project-and-plugin/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/pluginClasspath/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/classpath-project-and-plugin/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java similarity index 100% rename from src/it/pluginClasspath/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java rename to src/it/classpath-project-and-plugin/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java diff --git a/src/it/advancedGenerateStubs/invoker.properties b/src/it/classpath-project-only/invoker.properties similarity index 100% rename from src/it/advancedGenerateStubs/invoker.properties rename to src/it/classpath-project-only/invoker.properties diff --git a/src/it/testDependencyCompile/pom.xml b/src/it/classpath-project-only/pom.xml similarity index 92% rename from src/it/testDependencyCompile/pom.xml rename to src/it/classpath-project-only/pom.xml index d7a4c388d..f5e45f049 100644 --- a/src/it/testDependencyCompile/pom.xml +++ b/src/it/classpath-project-only/pom.xml @@ -11,8 +11,8 @@ ../pom.xml - gmavenplus-plugin-it-groovy-test-dependency - GMavenPlus Plugin Test Groovy Dependency Test + gmavenplus-plugin-it-classpath-project-only + GMavenPlus Plugin Project-only Classpath Test diff --git a/src/it/testDependencyCompile/src/test/groovy/org/codehaus/gmavenplus/SomeTest.groovy b/src/it/classpath-project-only/src/test/groovy/org/codehaus/gmavenplus/SomeTest.groovy similarity index 100% rename from src/it/testDependencyCompile/src/test/groovy/org/codehaus/gmavenplus/SomeTest.groovy rename to src/it/classpath-project-only/src/test/groovy/org/codehaus/gmavenplus/SomeTest.groovy diff --git a/src/it/cleanClasspathGenerateStubs/invoker.properties b/src/it/cleanClasspathGenerateStubs/invoker.properties deleted file mode 100644 index 5acda441c..000000000 --- a/src/it/cleanClasspathGenerateStubs/invoker.properties +++ /dev/null @@ -1,3 +0,0 @@ -invoker.goals=clean compile -Dmaven.plugin.validation=verbose -invoker.buildResult=failure -#invoker.debug = true diff --git a/src/it/cleanClasspathGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/cleanClasspathGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index e7020ee52..000000000 --- a/src/it/cleanClasspathGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.gmavenplus - -import org.apache.maven.project.MavenProject - - -class SomeClass { - - String someMethod(MavenProject project) { - return 'Hello, world.' - } - -} diff --git a/src/it/cleanClasspathCompile/invoker.properties b/src/it/compile-classpath-isolation/invoker.properties similarity index 100% rename from src/it/cleanClasspathCompile/invoker.properties rename to src/it/compile-classpath-isolation/invoker.properties diff --git a/src/it/cleanClasspathCompile/pom.xml b/src/it/compile-classpath-isolation/pom.xml similarity index 90% rename from src/it/cleanClasspathCompile/pom.xml rename to src/it/compile-classpath-isolation/pom.xml index ee9af29fa..5cb9bf38a 100644 --- a/src/it/cleanClasspathCompile/pom.xml +++ b/src/it/compile-classpath-isolation/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-cleanClasspathCompile + gmavenplus-plugin-it-compile-classpath-isolation testing - GMavenPlus Plugin Clean Classpath Compile Test + GMavenPlus Plugin Compile Classpath Isolation Test The simplest compile use case where it would fail if the classpath were polluted with the plugin classpath. diff --git a/src/it/cleanClasspathCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/compile-classpath-isolation/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/cleanClasspathCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/compile-classpath-isolation/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/advancedGroovydoc/invoker.properties b/src/it/compile-config-script/invoker.properties similarity index 100% rename from src/it/advancedGroovydoc/invoker.properties rename to src/it/compile-config-script/invoker.properties diff --git a/src/it/configScriptCompile/pom.xml b/src/it/compile-config-script/pom.xml similarity index 96% rename from src/it/configScriptCompile/pom.xml rename to src/it/compile-config-script/pom.xml index 3a69f58c9..7695cb77d 100644 --- a/src/it/configScriptCompile/pom.xml +++ b/src/it/compile-config-script/pom.xml @@ -11,7 +11,7 @@ ../pom.xml - gmavenplus-plugin-it-configScriptCompile + gmavenplus-plugin-it-compile-config-script testing GMavenPlus Plugin Configuration Script Compile Test The simplest compile use case with a configuration script. This will fail for all Groovy versions diff --git a/src/it/configScriptCompile/src/conf/config.groovy b/src/it/compile-config-script/src/conf/config.groovy similarity index 100% rename from src/it/configScriptCompile/src/conf/config.groovy rename to src/it/compile-config-script/src/conf/config.groovy diff --git a/src/it/advancedCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/compile-config-script/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/advancedCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/compile-config-script/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/configScriptCompile/src/test/groovy/org/codehaus/gmavenplus/SomeClassTest.groovy b/src/it/compile-config-script/src/test/groovy/org/codehaus/gmavenplus/SomeClassTest.groovy similarity index 100% rename from src/it/configScriptCompile/src/test/groovy/org/codehaus/gmavenplus/SomeClassTest.groovy rename to src/it/compile-config-script/src/test/groovy/org/codehaus/gmavenplus/SomeClassTest.groovy diff --git a/src/it/astCompile/invoker.properties b/src/it/compile-default/invoker.properties similarity index 100% rename from src/it/astCompile/invoker.properties rename to src/it/compile-default/invoker.properties diff --git a/src/it/advancedCompile/pom.xml b/src/it/compile-default/pom.xml similarity index 94% rename from src/it/advancedCompile/pom.xml rename to src/it/compile-default/pom.xml index c5acfd720..62b75401a 100644 --- a/src/it/advancedCompile/pom.xml +++ b/src/it/compile-default/pom.xml @@ -11,8 +11,8 @@ ../pom.xml - gmavenplus-plugin-it-advancedCompile - GMavenPlus Plugin Advanced Compile Test + gmavenplus-plugin-it-compile-default + GMavenPlus Plugin Default Compile Test The kitchen sink of compile use cases. diff --git a/src/it/basicCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/compile-default/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 99% rename from src/it/basicCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/compile-default/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy index 4c42c0d23..6b56124f3 100644 --- a/src/it/basicCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ b/src/it/compile-default/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy @@ -3,7 +3,6 @@ package org.codehaus.gmavenplus import groovy.transform.Canonical import groovy.transform.CompileStatic - @Canonical @CompileStatic class SomeClass { diff --git a/src/it/advancedCompile/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy b/src/it/compile-default/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy similarity index 100% rename from src/it/advancedCompile/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy rename to src/it/compile-default/src/main/groovy/org/codehaus/gmavenplus/SomeOtherClass.gvy diff --git a/src/it/advancedCompile/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/compile-default/src/test/java/org/codehaus/gmavenplus/TheTest.java similarity index 100% rename from src/it/advancedCompile/src/test/java/org/codehaus/gmavenplus/TheTest.java rename to src/it/compile-default/src/test/java/org/codehaus/gmavenplus/TheTest.java diff --git a/src/it/basicCompile/invoker.properties b/src/it/compile-mixed-java-groovy/invoker.properties similarity index 100% rename from src/it/basicCompile/invoker.properties rename to src/it/compile-mixed-java-groovy/invoker.properties diff --git a/src/it/mixedCompile/pom.xml b/src/it/compile-mixed-java-groovy/pom.xml similarity index 95% rename from src/it/mixedCompile/pom.xml rename to src/it/compile-mixed-java-groovy/pom.xml index 3fbba454d..3183ea1a2 100644 --- a/src/it/mixedCompile/pom.xml +++ b/src/it/compile-mixed-java-groovy/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-mixedCompile + gmavenplus-plugin-it-compile-mixed-java-groovy testing - GMavenPlus Plugin Mixed Compile Test + GMavenPlus Plugin Mixed Java and Groovy Compile Test This tests mixed Java/Groovy compilation. This will fail for all versions of Groovy before 1.8.2. diff --git a/src/it/mixedCompile/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy b/src/it/compile-mixed-java-groovy/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy similarity index 100% rename from src/it/mixedCompile/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy rename to src/it/compile-mixed-java-groovy/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy diff --git a/src/it/mixedCompile/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy b/src/it/compile-mixed-java-groovy/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy similarity index 100% rename from src/it/mixedCompile/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy rename to src/it/compile-mixed-java-groovy/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy diff --git a/src/it/mixedCompile/src/main/java/org/codehaus/gmavenplus/java/Child.java b/src/it/compile-mixed-java-groovy/src/main/java/org/codehaus/gmavenplus/java/Child.java similarity index 100% rename from src/it/mixedCompile/src/main/java/org/codehaus/gmavenplus/java/Child.java rename to src/it/compile-mixed-java-groovy/src/main/java/org/codehaus/gmavenplus/java/Child.java diff --git a/src/it/mixedCompile/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/compile-mixed-java-groovy/src/test/java/org/codehaus/gmavenplus/TheTest.java similarity index 100% rename from src/it/mixedCompile/src/test/java/org/codehaus/gmavenplus/TheTest.java rename to src/it/compile-mixed-java-groovy/src/test/java/org/codehaus/gmavenplus/TheTest.java diff --git a/src/it/compile-parameters/invoker.properties b/src/it/compile-parameters/invoker.properties new file mode 100644 index 000000000..456c4b8c3 --- /dev/null +++ b/src/it/compile-parameters/invoker.properties @@ -0,0 +1,2 @@ +invoker.goals = clean test +#invoker.debug = true diff --git a/src/it/parametersCompile/pom.xml b/src/it/compile-parameters/pom.xml similarity index 84% rename from src/it/parametersCompile/pom.xml rename to src/it/compile-parameters/pom.xml index d1295ff7e..e647c8cce 100644 --- a/src/it/parametersCompile/pom.xml +++ b/src/it/compile-parameters/pom.xml @@ -11,12 +11,10 @@ ../pom.xml - gmavenplus-plugin-it-parametersCompile + gmavenplus-plugin-it-compile-parameters testing - GMavenPlus Plugin Parameters Compile Test - The simplest compile with parameters use case. This will fail for all Groovy versions before - 2.5.0-beta-1. - + GMavenPlus Plugin Parameter Metadata Compile Test + Verifies Groovy compilation preserves Java parameter metadata when requested. @@ -34,16 +32,17 @@ org.codehaus.gmavenplus gmavenplus-plugin - - true - compile + compileTests + + true + org.apache.maven.plugins diff --git a/src/it/compile-parameters/src/main/groovy/org/codehaus/gmavenplus/ParameterFixture.groovy b/src/it/compile-parameters/src/main/groovy/org/codehaus/gmavenplus/ParameterFixture.groovy new file mode 100644 index 000000000..6cc75a7be --- /dev/null +++ b/src/it/compile-parameters/src/main/groovy/org/codehaus/gmavenplus/ParameterFixture.groovy @@ -0,0 +1,10 @@ +package org.codehaus.gmavenplus + + +class ParameterFixture { + + String join(String firstName, String lastName) { + return "${firstName} ${lastName}" + } + +} diff --git a/src/it/compile-parameters/src/test/java/org/codehaus/gmavenplus/ParameterMetadataTest.java b/src/it/compile-parameters/src/test/java/org/codehaus/gmavenplus/ParameterMetadataTest.java new file mode 100644 index 000000000..be3813075 --- /dev/null +++ b/src/it/compile-parameters/src/test/java/org/codehaus/gmavenplus/ParameterMetadataTest.java @@ -0,0 +1,22 @@ +package org.codehaus.gmavenplus; + +import java.lang.reflect.Method; + +import org.junit.Assert; +import org.junit.Test; + + +public class ParameterMetadataTest { + + @Test + public void testParameterNamesAreAvailable() throws NoSuchMethodException { + Method method = ParameterFixture.class.getDeclaredMethod("join", String.class, String.class); + + Assert.assertTrue(method.getParameters()[0].isNamePresent()); + Assert.assertTrue(method.getParameters()[1].isNamePresent()); + Assert.assertEquals("firstName", method.getParameters()[0].getName()); + Assert.assertEquals("lastName", method.getParameters()[1].getName()); + Assert.assertEquals("Ada Lovelace", new ParameterFixture().join("Ada", "Lovelace")); + } + +} diff --git a/src/it/mixedCompileMultiModule/groovyModule/pom.xml b/src/it/compile-reactor/groovyModule/pom.xml similarity index 97% rename from src/it/mixedCompileMultiModule/groovyModule/pom.xml rename to src/it/compile-reactor/groovyModule/pom.xml index c93e125d3..24f93bb97 100644 --- a/src/it/mixedCompileMultiModule/groovyModule/pom.xml +++ b/src/it/compile-reactor/groovyModule/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule + gmavenplus-plugin-it-compile-reactor testing ../pom.xml diff --git a/src/it/mixedCompileMultiModule/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy b/src/it/compile-reactor/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy similarity index 100% rename from src/it/mixedCompileMultiModule/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy rename to src/it/compile-reactor/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy diff --git a/src/it/basicExecute/invoker.properties b/src/it/compile-reactor/invoker.properties similarity index 100% rename from src/it/basicExecute/invoker.properties rename to src/it/compile-reactor/invoker.properties diff --git a/src/it/mixedCompileMultiModule/javaModule/pom.xml b/src/it/compile-reactor/javaModule/pom.xml similarity index 94% rename from src/it/mixedCompileMultiModule/javaModule/pom.xml rename to src/it/compile-reactor/javaModule/pom.xml index a2f98c5f7..b774ec201 100644 --- a/src/it/mixedCompileMultiModule/javaModule/pom.xml +++ b/src/it/compile-reactor/javaModule/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule + gmavenplus-plugin-it-compile-reactor testing ../pom.xml diff --git a/src/it/mixedCompileMultiModule/javaModule/src/main/java/org/codehaus/gmavenplus/java/Child.java b/src/it/compile-reactor/javaModule/src/main/java/org/codehaus/gmavenplus/java/Child.java similarity index 100% rename from src/it/mixedCompileMultiModule/javaModule/src/main/java/org/codehaus/gmavenplus/java/Child.java rename to src/it/compile-reactor/javaModule/src/main/java/org/codehaus/gmavenplus/java/Child.java diff --git a/src/it/mixedCompileMultiModule/pom.xml b/src/it/compile-reactor/pom.xml similarity index 90% rename from src/it/mixedCompileMultiModule/pom.xml rename to src/it/compile-reactor/pom.xml index c8dd575ba..bc57c30a1 100644 --- a/src/it/mixedCompileMultiModule/pom.xml +++ b/src/it/compile-reactor/pom.xml @@ -11,10 +11,10 @@ ../pom.xml - gmavenplus-plugin-it-mixedCompileMultiModule + gmavenplus-plugin-it-compile-reactor testing pom - GMavenPlus Plugin Mixed Compile MultiModule Test + GMavenPlus Plugin Reactor Compile Test This tests mixed Java/Groovy compilation across modules. This will fail for all versions of Groovy before 1.8.2. diff --git a/src/it/mixedCompileMultiModule/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/compile-reactor/src/test/java/org/codehaus/gmavenplus/TheTest.java similarity index 100% rename from src/it/mixedCompileMultiModule/src/test/java/org/codehaus/gmavenplus/TheTest.java rename to src/it/compile-reactor/src/test/java/org/codehaus/gmavenplus/TheTest.java diff --git a/src/it/configScriptCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/configScriptCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index f5e054171..000000000 --- a/src/it/configScriptCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeClass { - - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/basicGenerateStubs/invoker.properties b/src/it/execute-inline-and-file/invoker.properties similarity index 100% rename from src/it/basicGenerateStubs/invoker.properties rename to src/it/execute-inline-and-file/invoker.properties diff --git a/src/it/advancedExecute/pom.xml b/src/it/execute-inline-and-file/pom.xml similarity index 97% rename from src/it/advancedExecute/pom.xml rename to src/it/execute-inline-and-file/pom.xml index 1ed0afb81..6d8b36115 100644 --- a/src/it/advancedExecute/pom.xml +++ b/src/it/execute-inline-and-file/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-advancedExecute + gmavenplus-plugin-it-execute-inline-and-file testing - GMavenPlus Plugin Execute Test + GMavenPlus Plugin Inline and File Execute Test The kitchen sink of script executions. Because this uses Grapes, it will fail for all versions of Groovy before 1.7-beta-1. diff --git a/src/it/advancedExecute/src/main/resources/groovyScripts/helloWorld.groovy b/src/it/execute-inline-and-file/src/main/resources/groovyScripts/helloWorld.groovy similarity index 100% rename from src/it/advancedExecute/src/main/resources/groovyScripts/helloWorld.groovy rename to src/it/execute-inline-and-file/src/main/resources/groovyScripts/helloWorld.groovy diff --git a/src/it/advancedExecute/src/main/resources/groovyScripts/helloWorld2.groovy b/src/it/execute-inline-and-file/src/main/resources/groovyScripts/helloWorld2.groovy similarity index 100% rename from src/it/advancedExecute/src/main/resources/groovyScripts/helloWorld2.groovy rename to src/it/execute-inline-and-file/src/main/resources/groovyScripts/helloWorld2.groovy diff --git a/src/it/advancedExecute/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/execute-inline-and-file/src/test/java/org/codehaus/gmavenplus/TheTest.java similarity index 100% rename from src/it/advancedExecute/src/test/java/org/codehaus/gmavenplus/TheTest.java rename to src/it/execute-inline-and-file/src/test/java/org/codehaus/gmavenplus/TheTest.java diff --git a/src/it/advancedExecute/test.properties b/src/it/execute-inline-and-file/test.properties similarity index 100% rename from src/it/advancedExecute/test.properties rename to src/it/execute-inline-and-file/test.properties diff --git a/src/it/multimodulePluginAndProjectClasspath/a/pom.xml b/src/it/execute-reactor-classpath/a/pom.xml similarity index 95% rename from src/it/multimodulePluginAndProjectClasspath/a/pom.xml rename to src/it/execute-reactor-classpath/a/pom.xml index 1492e4147..188ac09f7 100644 --- a/src/it/multimodulePluginAndProjectClasspath/a/pom.xml +++ b/src/it/execute-reactor-classpath/a/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath + gmavenplus-plugin-it-execute-reactor-classpath testing ../pom.xml diff --git a/src/it/multimodulePluginAndProjectClasspath/b/pom.xml b/src/it/execute-reactor-classpath/b/pom.xml similarity index 95% rename from src/it/multimodulePluginAndProjectClasspath/b/pom.xml rename to src/it/execute-reactor-classpath/b/pom.xml index 83d9a9c7b..09a84396c 100644 --- a/src/it/multimodulePluginAndProjectClasspath/b/pom.xml +++ b/src/it/execute-reactor-classpath/b/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath + gmavenplus-plugin-it-execute-reactor-classpath testing ../pom.xml diff --git a/src/it/basicGroovydoc/invoker.properties b/src/it/execute-reactor-classpath/invoker.properties similarity index 100% rename from src/it/basicGroovydoc/invoker.properties rename to src/it/execute-reactor-classpath/invoker.properties diff --git a/src/it/multimoduleProjectClasspath/pom.xml b/src/it/execute-reactor-classpath/pom.xml similarity index 88% rename from src/it/multimoduleProjectClasspath/pom.xml rename to src/it/execute-reactor-classpath/pom.xml index 6def3ce86..5dd0abbce 100644 --- a/src/it/multimoduleProjectClasspath/pom.xml +++ b/src/it/execute-reactor-classpath/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-multimoduleProjectClasspath + gmavenplus-plugin-it-execute-reactor-classpath testing - GMavenPlus Plugin Multi-Module Project Classpath Test + GMavenPlus Plugin Reactor Execute Classpath Test pom diff --git a/src/it/forkedCompile/invoker.properties b/src/it/forked-jvm-compile-and-stubs/invoker.properties similarity index 100% rename from src/it/forkedCompile/invoker.properties rename to src/it/forked-jvm-compile-and-stubs/invoker.properties diff --git a/src/it/forkedCompile/pom.xml b/src/it/forked-jvm-compile-and-stubs/pom.xml similarity index 90% rename from src/it/forkedCompile/pom.xml rename to src/it/forked-jvm-compile-and-stubs/pom.xml index d47a9a30e..dc6a7ad01 100644 --- a/src/it/forkedCompile/pom.xml +++ b/src/it/forked-jvm-compile-and-stubs/pom.xml @@ -11,8 +11,8 @@ ../pom.xml - gmavenplus-plugin-it-forkedCompile - GMavenPlus Plugin Forked Compile Test + gmavenplus-plugin-it-forked-jvm-compile-and-stubs + GMavenPlus Plugin Forked JVM Compile and Stubs Test Verifies compilation using a forked JVM via Toolchains. @@ -56,6 +56,7 @@ + generateStubs compile compileTests diff --git a/src/it/forkedCompile/src/main/groovy/Simple.groovy b/src/it/forked-jvm-compile-and-stubs/src/main/groovy/Simple.groovy similarity index 100% rename from src/it/forkedCompile/src/main/groovy/Simple.groovy rename to src/it/forked-jvm-compile-and-stubs/src/main/groovy/Simple.groovy diff --git a/src/it/forkedCompile/src/test/groovy/VersionTest.groovy b/src/it/forked-jvm-compile-and-stubs/src/test/groovy/VersionTest.groovy similarity index 100% rename from src/it/forkedCompile/src/test/groovy/VersionTest.groovy rename to src/it/forked-jvm-compile-and-stubs/src/test/groovy/VersionTest.groovy diff --git a/src/it/forkedGroovyDoc/invoker.properties b/src/it/forked-jvm-groovydoc/invoker.properties similarity index 100% rename from src/it/forkedGroovyDoc/invoker.properties rename to src/it/forked-jvm-groovydoc/invoker.properties diff --git a/src/it/forkedGroovyDoc/pom.xml b/src/it/forked-jvm-groovydoc/pom.xml similarity index 94% rename from src/it/forkedGroovyDoc/pom.xml rename to src/it/forked-jvm-groovydoc/pom.xml index c67e01054..8c10d072c 100644 --- a/src/it/forkedGroovyDoc/pom.xml +++ b/src/it/forked-jvm-groovydoc/pom.xml @@ -11,8 +11,8 @@ ../pom.xml - gmavenplus-plugin-it-forkedGroovyDoc - GMavenPlus Plugin Forked GroovyDoc Test + gmavenplus-plugin-it-forked-jvm-groovydoc + GMavenPlus Plugin Forked JVM GroovyDoc Test Verifies GroovyDoc generation using a forked JVM via Toolchains. diff --git a/src/it/forkedGroovyDoc/src/main/groovy/Simple.groovy b/src/it/forked-jvm-groovydoc/src/main/groovy/Simple.groovy similarity index 100% rename from src/it/forkedGroovyDoc/src/main/groovy/Simple.groovy rename to src/it/forked-jvm-groovydoc/src/main/groovy/Simple.groovy diff --git a/src/it/forkedCompilePluginClasspath/src/test/groovy/VersionTest.groovy b/src/it/forked-jvm-groovydoc/src/test/groovy/VersionTest.groovy similarity index 100% rename from src/it/forkedCompilePluginClasspath/src/test/groovy/VersionTest.groovy rename to src/it/forked-jvm-groovydoc/src/test/groovy/VersionTest.groovy diff --git a/src/it/forkedGroovyDoc/verify.bsh b/src/it/forked-jvm-groovydoc/verify.bsh similarity index 100% rename from src/it/forkedGroovyDoc/verify.bsh rename to src/it/forked-jvm-groovydoc/verify.bsh diff --git a/src/it/forkedCompilePluginClasspath/invoker.properties b/src/it/forkedCompilePluginClasspath/invoker.properties deleted file mode 100644 index c545afd0f..000000000 --- a/src/it/forkedCompilePluginClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals = --global-toolchains ${project.basedir}/src/it/toolchains.xml clean test - diff --git a/src/it/forkedCompilePluginClasspath/pom.xml b/src/it/forkedCompilePluginClasspath/pom.xml deleted file mode 100644 index b19f95209..000000000 --- a/src/it/forkedCompilePluginClasspath/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-forkedCompile - GMavenPlus Plugin Forked Compile Test - Verifies compilation using a forked JVM via Toolchains. - - - - @groovyGroupId@ - groovy - @groovyVersion@ - test - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - 3.2.0 - - - - toolchain - - - - - - - 17 - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - PLUGIN_ONLY - - - - - compile - compileTests - - - - - - junit - junit - @junitVersion@ - - - @groovyGroupId@ - groovy - @groovyVersion@ - - - - - - diff --git a/src/it/forkedCompilePluginClasspath/src/main/groovy/Simple.groovy b/src/it/forkedCompilePluginClasspath/src/main/groovy/Simple.groovy deleted file mode 100644 index d085b7d49..000000000 --- a/src/it/forkedCompilePluginClasspath/src/main/groovy/Simple.groovy +++ /dev/null @@ -1,6 +0,0 @@ -class Simple { - def hello() { - println "Hello from Forked Compiler!" - println "Java Version: " + System.getProperty("java.version") - } -} diff --git a/src/it/forkedCompileProjectAndPluginClasspath/invoker.properties b/src/it/forkedCompileProjectAndPluginClasspath/invoker.properties deleted file mode 100644 index c545afd0f..000000000 --- a/src/it/forkedCompileProjectAndPluginClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals = --global-toolchains ${project.basedir}/src/it/toolchains.xml clean test - diff --git a/src/it/forkedCompileProjectAndPluginClasspath/pom.xml b/src/it/forkedCompileProjectAndPluginClasspath/pom.xml deleted file mode 100644 index c9f04dff9..000000000 --- a/src/it/forkedCompileProjectAndPluginClasspath/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-forkedCompile - GMavenPlus Plugin Forked Compile Test - Verifies compilation using a forked JVM via Toolchains. - - - - junit - junit - - - @groovyGroupId@ - groovy - @groovyVersion@ - test - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - 3.2.0 - - - - toolchain - - - - - - - 17 - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - PROJECT_AND_PLUGIN - - - - - compile - compileTests - - - - - - @groovyGroupId@ - groovy - @groovyVersion@ - - - - - - diff --git a/src/it/forkedCompileProjectAndPluginClasspath/src/main/groovy/Simple.groovy b/src/it/forkedCompileProjectAndPluginClasspath/src/main/groovy/Simple.groovy deleted file mode 100644 index d085b7d49..000000000 --- a/src/it/forkedCompileProjectAndPluginClasspath/src/main/groovy/Simple.groovy +++ /dev/null @@ -1,6 +0,0 @@ -class Simple { - def hello() { - println "Hello from Forked Compiler!" - println "Java Version: " + System.getProperty("java.version") - } -} diff --git a/src/it/forkedCompileProjectAndPluginClasspath/src/test/groovy/VersionTest.groovy b/src/it/forkedCompileProjectAndPluginClasspath/src/test/groovy/VersionTest.groovy deleted file mode 100644 index 52b2bfbb9..000000000 --- a/src/it/forkedCompileProjectAndPluginClasspath/src/test/groovy/VersionTest.groovy +++ /dev/null @@ -1,8 +0,0 @@ -import org.junit.Test - -class VersionTest { - @Test - void verifyJavaVersion() { - assert Runtime.version().feature() == 17 - } -} diff --git a/src/it/forkedGroovyDoc/src/test/groovy/VersionTest.groovy b/src/it/forkedGroovyDoc/src/test/groovy/VersionTest.groovy deleted file mode 100644 index 52b2bfbb9..000000000 --- a/src/it/forkedGroovyDoc/src/test/groovy/VersionTest.groovy +++ /dev/null @@ -1,8 +0,0 @@ -import org.junit.Test - -class VersionTest { - @Test - void verifyJavaVersion() { - assert Runtime.version().feature() == 17 - } -} diff --git a/src/it/forkedStubs/invoker.properties b/src/it/forkedStubs/invoker.properties deleted file mode 100644 index fd008fd19..000000000 --- a/src/it/forkedStubs/invoker.properties +++ /dev/null @@ -1,3 +0,0 @@ -invoker.goals = --global-toolchains ${project.basedir}/src/it/toolchains.xml clean test -#invoker.debug = true -invoker.postBuildHookScript=verify diff --git a/src/it/forkedStubs/pom.xml b/src/it/forkedStubs/pom.xml deleted file mode 100644 index 9b1c27102..000000000 --- a/src/it/forkedStubs/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-forkedStubs - GMavenPlus Plugin Forked Stubs Test - Verifies stub generation using a forked JVM via Toolchains. - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.apache.maven.plugins - maven-toolchains-plugin - 3.2.0 - - - - toolchain - - - - - - - 17 - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - ${project.build.directory}/generated-sources/groovy-stubs - - - - - generateStubs - - - - - - - diff --git a/src/it/forkedStubs/src/main/groovy/Simple.groovy b/src/it/forkedStubs/src/main/groovy/Simple.groovy deleted file mode 100644 index 466cf0fe9..000000000 --- a/src/it/forkedStubs/src/main/groovy/Simple.groovy +++ /dev/null @@ -1,6 +0,0 @@ -class Simple { - def hello() { - println "Hello from Forked Stubs!" - println "Java Version: " + System.getProperty("java.version") - } -} diff --git a/src/it/forkedStubs/src/test/groovy/VersionTest.groovy b/src/it/forkedStubs/src/test/groovy/VersionTest.groovy deleted file mode 100644 index 52b2bfbb9..000000000 --- a/src/it/forkedStubs/src/test/groovy/VersionTest.groovy +++ /dev/null @@ -1,8 +0,0 @@ -import org.junit.Test - -class VersionTest { - @Test - void verifyJavaVersion() { - assert Runtime.version().feature() == 17 - } -} diff --git a/src/it/forkedStubs/verify.bsh b/src/it/forkedStubs/verify.bsh deleted file mode 100644 index d4d9b3f86..000000000 --- a/src/it/forkedStubs/verify.bsh +++ /dev/null @@ -1,26 +0,0 @@ -import java.io.*; -import java.util.regex.*; - -File buildLog = new File( basedir, "build.log" ); -if ( !buildLog.exists() ) { - throw new FileNotFoundException( "build.log missing" ); -} - -StringBuilder contentBuilder = new StringBuilder(); -BufferedReader br = new BufferedReader(new FileReader(buildLog)); -try { - String sCurrentLine; - while ((sCurrentLine = br.readLine()) != null) { - contentBuilder.append(sCurrentLine).append("\n"); - } -} finally { - br.close(); -} -String log = contentBuilder.toString(); - -Pattern p = Pattern.compile("Toolchain in gmavenplus-plugin: JDK\\[.*17.*\\]"); -Matcher m = p.matcher(log); - -if (!m.find()) { - throw new RuntimeException("Build log does not contain usage of JDK 17 toolchain."); -} diff --git a/src/it/basicGroovydocJar/invoker.properties b/src/it/groovydoc-main-and-jar/invoker.properties similarity index 100% rename from src/it/basicGroovydocJar/invoker.properties rename to src/it/groovydoc-main-and-jar/invoker.properties diff --git a/src/it/basicGroovydocJar/pom.xml b/src/it/groovydoc-main-and-jar/pom.xml similarity index 93% rename from src/it/basicGroovydocJar/pom.xml rename to src/it/groovydoc-main-and-jar/pom.xml index e4e95bb18..20db32b67 100644 --- a/src/it/basicGroovydocJar/pom.xml +++ b/src/it/groovydoc-main-and-jar/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-basicGroovyDocJar + gmavenplus-plugin-it-groovydoc-main-and-jar testing - GMavenPlus Plugin Basic GroovyDoc Jar Test + GMavenPlus Plugin Main GroovyDoc and Jar Test The simplest GroovyDoc Jar use case. This will fail for Groovy 1.5.8 and 1.6-RC-1. diff --git a/src/it/advancedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/groovydoc-main-and-jar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/advancedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/groovydoc-main-and-jar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/basicGroovydocJar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/groovydoc-main-and-jar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java similarity index 91% rename from src/it/basicGroovydocJar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java rename to src/it/groovydoc-main-and-jar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java index 5ee8ddc4a..d93173e54 100644 --- a/src/it/basicGroovydocJar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ b/src/it/groovydoc-main-and-jar/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java @@ -16,7 +16,7 @@ public void testGroovyDocExists() { boolean foundGroovydocDir = false; ZipFile zipFile = null; try { - zipFile = new ZipFile("target/gmavenplus-plugin-it-basicGroovyDocJar-testing-groovydoc.jar"); + zipFile = new ZipFile("target/gmavenplus-plugin-it-groovydoc-main-and-jar-testing-groovydoc.jar"); Enumeration e = zipFile.entries(); while (e.hasMoreElements()) { ZipEntry entry = e.nextElement(); diff --git a/src/it/groovydoc-test-and-test-jar/invoker.properties b/src/it/groovydoc-test-and-test-jar/invoker.properties new file mode 100644 index 000000000..d45f0f9e4 --- /dev/null +++ b/src/it/groovydoc-test-and-test-jar/invoker.properties @@ -0,0 +1,2 @@ +invoker.goals=clean package -Dmaven.plugin.validation=verbose +#invoker.debug = true diff --git a/src/it/basicGroovydoc/pom.xml b/src/it/groovydoc-test-and-test-jar/pom.xml similarity index 76% rename from src/it/basicGroovydoc/pom.xml rename to src/it/groovydoc-test-and-test-jar/pom.xml index 9e600bbdd..33c7e0298 100644 --- a/src/it/basicGroovydoc/pom.xml +++ b/src/it/groovydoc-test-and-test-jar/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-basicGroovyDoc + gmavenplus-plugin-it-groovydoc-test-and-test-jar testing - GMavenPlus Plugin Basic GroovyDoc Test + GMavenPlus Plugin Test GroovyDoc and Jar Test The simplest GroovyDoc use case. This will fail for Groovy 1.5.8 and 1.6-RC-1. @@ -29,6 +29,10 @@ @groovyGroupId@ groovy-groovydoc + + @groovyGroupId@ + groovy-templates + @@ -38,9 +42,16 @@ gmavenplus-plugin + generate-test-groovydoc generate-test-sources - groovydoc + groovydocTests + + + + package-test-groovydoc + + groovydocTests-jar diff --git a/src/it/basicGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/groovydoc-test-and-test-jar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/basicGroovydoc/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/groovydoc-test-and-test-jar/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/groovydoc-test-and-test-jar/src/test/groovy/org/codehaus/gmavenplus/TestDocumentation.groovy b/src/it/groovydoc-test-and-test-jar/src/test/groovy/org/codehaus/gmavenplus/TestDocumentation.groovy new file mode 100644 index 000000000..62ea20a78 --- /dev/null +++ b/src/it/groovydoc-test-and-test-jar/src/test/groovy/org/codehaus/gmavenplus/TestDocumentation.groovy @@ -0,0 +1,7 @@ +package org.codehaus.gmavenplus + +class TestDocumentation { + String message() { + 'test documentation' + } +} diff --git a/src/it/groovydoc-test-and-test-jar/src/test/java/org/codehaus/gmavenplus/GroovyDocTest.java b/src/it/groovydoc-test-and-test-jar/src/test/java/org/codehaus/gmavenplus/GroovyDocTest.java new file mode 100644 index 000000000..717e96784 --- /dev/null +++ b/src/it/groovydoc-test-and-test-jar/src/test/java/org/codehaus/gmavenplus/GroovyDocTest.java @@ -0,0 +1,13 @@ +package org.codehaus.gmavenplus; + +import java.io.File; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + +public class GroovyDocTest { + @Test + public void generatesTestDocumentation() { + assertTrue(new File("target/testgapidocs/index.html").isFile()); + } +} diff --git a/src/it/mavenPlugin/invoker.properties b/src/it/maven-plugin-consumer/invoker.properties similarity index 100% rename from src/it/mavenPlugin/invoker.properties rename to src/it/maven-plugin-consumer/invoker.properties diff --git a/src/it/mavenPlugin/module/pom.xml b/src/it/maven-plugin-consumer/module/pom.xml similarity index 93% rename from src/it/mavenPlugin/module/pom.xml rename to src/it/maven-plugin-consumer/module/pom.xml index 184c57f42..a78f815f8 100644 --- a/src/it/mavenPlugin/module/pom.xml +++ b/src/it/maven-plugin-consumer/module/pom.xml @@ -5,7 +5,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-mavenPlugin + gmavenplus-plugin-it-maven-plugin-consumer testing diff --git a/src/it/mavenPlugin/mojo/pom.xml b/src/it/maven-plugin-consumer/mojo/pom.xml similarity index 97% rename from src/it/mavenPlugin/mojo/pom.xml rename to src/it/maven-plugin-consumer/mojo/pom.xml index 829dd20cf..f5afa8c84 100644 --- a/src/it/mavenPlugin/mojo/pom.xml +++ b/src/it/maven-plugin-consumer/mojo/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-mavenPlugin + gmavenplus-plugin-it-maven-plugin-consumer testing diff --git a/src/it/mavenPlugin/mojo/src/main/groovy/org/codehaus/gmavenplus/HelloWorldMojo.groovy b/src/it/maven-plugin-consumer/mojo/src/main/groovy/org/codehaus/gmavenplus/HelloWorldMojo.groovy similarity index 100% rename from src/it/mavenPlugin/mojo/src/main/groovy/org/codehaus/gmavenplus/HelloWorldMojo.groovy rename to src/it/maven-plugin-consumer/mojo/src/main/groovy/org/codehaus/gmavenplus/HelloWorldMojo.groovy diff --git a/src/it/mavenPlugin/mojo/src/test/java/org/codehaus/gmavenplus/HelloWorldMojoTest.java b/src/it/maven-plugin-consumer/mojo/src/test/java/org/codehaus/gmavenplus/HelloWorldMojoTest.java similarity index 100% rename from src/it/mavenPlugin/mojo/src/test/java/org/codehaus/gmavenplus/HelloWorldMojoTest.java rename to src/it/maven-plugin-consumer/mojo/src/test/java/org/codehaus/gmavenplus/HelloWorldMojoTest.java diff --git a/src/it/mavenPlugin/pom.xml b/src/it/maven-plugin-consumer/pom.xml similarity index 83% rename from src/it/mavenPlugin/pom.xml rename to src/it/maven-plugin-consumer/pom.xml index e7eebb83e..9a8c99a09 100644 --- a/src/it/mavenPlugin/pom.xml +++ b/src/it/maven-plugin-consumer/pom.xml @@ -10,10 +10,10 @@ ../pom.xml - gmavenplus-plugin-it-mavenPlugin + gmavenplus-plugin-it-maven-plugin-consumer testing pom - GMavenPlus Plugin Configuration Maven Plugin Test + GMavenPlus Plugin Maven Plugin Consumer Test mojo diff --git a/src/it/mixedCompileCircular/invoker.properties b/src/it/mixedCompileCircular/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/mixedCompileCircular/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/mixedCompileCircular/pom.xml b/src/it/mixedCompileCircular/pom.xml deleted file mode 100644 index 190a0a962..000000000 --- a/src/it/mixedCompileCircular/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedCompileCircular - testing - GMavenPlus Plugin Mixed Circular Compile Test - This tests mixed Java/Groovy compilation with a circular dependency between Java and Groovy classes. - This will fail for all versions of Groovy before 1.8.2. - - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - - generateStubs - compile - - - - - ${project.basedir}/src/main/groovy - - **/*.g - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - - diff --git a/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GClass.g b/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GClass.g deleted file mode 100644 index 3af962fdb..000000000 --- a/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GClass.g +++ /dev/null @@ -1,9 +0,0 @@ -package org.codehaus.gmavenplus.groovy - -import org.codehaus.gmavenplus.java.JObject - - -class GClass { - GObject gObject = new GObject() - JObject jObject = new JObject() -} diff --git a/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GObject.g b/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GObject.g deleted file mode 100644 index a8141d69c..000000000 --- a/src/it/mixedCompileCircular/src/main/groovy/org/codehaus/gmavenplus/groovy/GObject.g +++ /dev/null @@ -1,6 +0,0 @@ -package org.codehaus.gmavenplus.groovy - -import org.codehaus.gmavenplus.java.JObject - - -class GObject { } diff --git a/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JClass.java b/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JClass.java deleted file mode 100644 index 7f61a45e4..000000000 --- a/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JClass.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.codehaus.gmavenplus.java; - -import org.codehaus.gmavenplus.groovy.GObject; - - -public class JClass { - private GObject gObject = new GObject(); - private JObject jObject = new JObject(); - - public GObject getgObject() { - return gObject; - } - - public void setgObject(GObject gObject) { - this.gObject = gObject; - } - - public JObject getjObject() { - return jObject; - } - - public void setjObject(JObject jObject) { - this.jObject = jObject; - } -} diff --git a/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JObject.java b/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JObject.java deleted file mode 100644 index 2a766ca09..000000000 --- a/src/it/mixedCompileCircular/src/main/java/org/codehaus/gmavenplus/java/JObject.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.codehaus.gmavenplus.java; - - -public class JObject { -} diff --git a/src/it/mixedCompileCircular/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/mixedCompileCircular/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index dd6fe64f5..000000000 --- a/src/it/mixedCompileCircular/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.codehaus.gmavenplus.groovy.*; -import org.codehaus.gmavenplus.java.*; -import org.junit.Assert; -import org.junit.Test; - - -public class TheTest { - - @Test - public void testYetAnotherMethod() { - JClass jClass = new JClass(); - GClass gClass = new GClass(); - Assert.assertNotNull(jClass.getgObject()); - Assert.assertNotNull(jClass.getjObject()); - Assert.assertNotNull(gClass.getgObject()); - Assert.assertNotNull(gClass.getjObject()); - } - -} diff --git a/src/it/mixedCompileMultiModule/invoker.properties b/src/it/mixedCompileMultiModule/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/mixedCompileMultiModule/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/mixedCompileMultiModule2/groovyModule/pom.xml b/src/it/mixedCompileMultiModule2/groovyModule/pom.xml deleted file mode 100644 index ef46f5542..000000000 --- a/src/it/mixedCompileMultiModule2/groovyModule/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule2 - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedCompileMultiModule-groovyModule2 - testing - GMavenPlus Plugin Mixed Compile MultiModule Test Groovy Module 2 - - - - junit - junit - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule-javaModule2 - - - @groovyGroupId@ - groovy - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - compile - - addSources - addTestSources - generateStubs - compile - generateTestStubs - - - - execute - test - - execute - - - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/mixedCompileMultiModule2/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy b/src/it/mixedCompileMultiModule2/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy deleted file mode 100644 index 73ae55493..000000000 --- a/src/it/mixedCompileMultiModule2/groovyModule/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.gmavenplus.groovy - -import org.codehaus.gmavenplus.java.Parent - - -class Child extends Parent { - - String someOtherMethod() { - someMethod() - } - -} diff --git a/src/it/mixedCompileMultiModule2/invoker.properties b/src/it/mixedCompileMultiModule2/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/mixedCompileMultiModule2/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/mixedCompileMultiModule2/javaModule/pom.xml b/src/it/mixedCompileMultiModule2/javaModule/pom.xml deleted file mode 100644 index e46ad72d3..000000000 --- a/src/it/mixedCompileMultiModule2/javaModule/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule2 - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedCompileMultiModule-javaModule2 - testing - GMavenPlus Plugin Mixed Compile MultiModule Test Java Module 2 - - - - junit - junit - - - @groovyGroupId@ - groovy - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/mixedCompileMultiModule2/javaModule/src/main/java/org/codehaus/gmavenplus/java/Parent.java b/src/it/mixedCompileMultiModule2/javaModule/src/main/java/org/codehaus/gmavenplus/java/Parent.java deleted file mode 100644 index dbd65f39e..000000000 --- a/src/it/mixedCompileMultiModule2/javaModule/src/main/java/org/codehaus/gmavenplus/java/Parent.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus.java; - - -public class Parent { - - public String someMethod() { - return "Hello, world."; - } - -} diff --git a/src/it/mixedCompileMultiModule2/pom.xml b/src/it/mixedCompileMultiModule2/pom.xml deleted file mode 100644 index 54bd81bea..000000000 --- a/src/it/mixedCompileMultiModule2/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedCompileMultiModule2 - testing - pom - GMavenPlus Plugin Mixed Compile MultiModule Test 2 - This tests mixed Java/Groovy compilation across modules. This will fail for all versions of Groovy - before 1.8.2. - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule-groovyModule2 - ${project.version} - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-mixedCompileMultiModule-javaModule2 - ${project.version} - - - - - - groovyModule - javaModule - - - diff --git a/src/it/mixedCompileMultiModule2/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/mixedCompileMultiModule2/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index 5a94573db..000000000 --- a/src/it/mixedCompileMultiModule2/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.codehaus.gmavenplus.groovy.*; -import org.codehaus.gmavenplus.java.*; -import org.junit.Assert; -import org.junit.Test; - - -public class TheTest { - - @Test - public void testAnotherMethod() { - Child child = new Child(); - Assert.assertEquals("Hello, world.", child.someOtherMethod()); - } - -} diff --git a/src/it/mixedGroovydoc/invoker.properties b/src/it/mixedGroovydoc/invoker.properties deleted file mode 100644 index 1bfdef1c7..000000000 --- a/src/it/mixedGroovydoc/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -#invoker.debug = true diff --git a/src/it/mixedGroovydoc/pom.xml b/src/it/mixedGroovydoc/pom.xml deleted file mode 100644 index af8d9b4c7..000000000 --- a/src/it/mixedGroovydoc/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedGroovyDoc - testing - GMavenPlus Plugin Mixed GroovyDoc Test - This tests mixed Java/Groovy GroovyDoc generation. This will fail for all versions of Groovy before - 1.8.2. - - - - - junit - junit - - - @groovyGroupId@ - groovy - - - @groovyGroupId@ - groovy-groovydoc - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - groovyDoc - generate-sources - - generateStubs - groovydoc - - - - removeStubs - test - - removeStubs - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy b/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy deleted file mode 100644 index af81ae6a9..000000000 --- a/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Grandchild.groovy +++ /dev/null @@ -1,20 +0,0 @@ -package org.codehaus.gmavenplus.groovy - -import org.codehaus.gmavenplus.java.Child - - -/** - * Some GroovyDoc. - */ -class Grandchild extends Child { - - /** - * Some method GroovyDoc. - * - * @return the String from the parent - */ - String yetAnotherMethod() { - return someMethod() - } - -} diff --git a/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy b/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy deleted file mode 100644 index 7c9d2896e..000000000 --- a/src/it/mixedGroovydoc/src/main/groovy/org/codehaus/gmavenplus/groovy/Parent.groovy +++ /dev/null @@ -1,18 +0,0 @@ -package org.codehaus.gmavenplus.groovy - - -/** - * Some GroovyDoc. - */ -class Parent { - - /** - * Some method GroovyDoc. - * - * @return the string "Hello, world." - */ - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/mixedGroovydoc/src/main/java/org/codehaus/gmavenplus/java/Child.java b/src/it/mixedGroovydoc/src/main/java/org/codehaus/gmavenplus/java/Child.java deleted file mode 100644 index e151b05e0..000000000 --- a/src/it/mixedGroovydoc/src/main/java/org/codehaus/gmavenplus/java/Child.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.gmavenplus.java; - -import org.codehaus.gmavenplus.groovy.Parent; - - -public class Child extends Parent { - - public String someOtherMethod() { - return someMethod(); - } - -} diff --git a/src/it/mixedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/mixedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index 11dfb429b..000000000 --- a/src/it/mixedGroovydoc/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class TheTest { - - @Test - public void testClassesExist() { - File generatedGroovyDoc1 = new File("target/gapidocs/org/codehaus/gmavenplus/groovy/Parent.html"); - File generatedGroovyDoc2 = new File("target/gapidocs/org/codehaus/gmavenplus/groovy/Grandchild.html"); - File generatedGroovyDoc3 = new File("target/gapidocs/org/codehaus/gmavenplus/java/Child.html"); - Assert.assertTrue(generatedGroovyDoc1 + " does not exist.", generatedGroovyDoc1.exists()); - Assert.assertTrue(generatedGroovyDoc1 + " is empty.", generatedGroovyDoc1.length() > 0); - Assert.assertTrue(generatedGroovyDoc2 + " does not exist.", generatedGroovyDoc2.exists()); - Assert.assertTrue(generatedGroovyDoc2 + " is empty.", generatedGroovyDoc2.length() > 0); - Assert.assertTrue(generatedGroovyDoc3 + " does not exist.", generatedGroovyDoc3.exists()); - Assert.assertTrue(generatedGroovyDoc3 + " is empty.", generatedGroovyDoc3.length() > 0); - } - - @Test - public void testOverviewSummaryExists() { - File generatedGroovyDoc = new File("target/gapidocs/overview-summary.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - } - -} diff --git a/src/it/mixedGroovydoc2/invoker.properties b/src/it/mixedGroovydoc2/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/mixedGroovydoc2/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/mixedGroovydoc2/pom.xml b/src/it/mixedGroovydoc2/pom.xml deleted file mode 100644 index a16a5ab1b..000000000 --- a/src/it/mixedGroovydoc2/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-mixedGroovyDoc2 - testing - GMavenPlus Plugin Mixed GroovyDoc 2 Test - This tests mixed Java/Groovy GroovyDoc generation. This will fail for all versions of Groovy before - 1.8.2. - - - - - junit - junit - - - @groovyGroupId@ - groovy - - - @groovyGroupId@ - groovy-groovydoc - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - generate-sources - - add-source - - - - ${project.basedir}/src/main/java2 - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - groovyDoc - generate-sources - - generateStubs - groovydoc - - - - removeStubs - test - - removeStubs - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - diff --git a/src/it/mixedGroovydoc2/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy b/src/it/mixedGroovydoc2/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy deleted file mode 100644 index fbd4f734a..000000000 --- a/src/it/mixedGroovydoc2/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy +++ /dev/null @@ -1,20 +0,0 @@ -package org.codehaus.gmavenplus.groovy - -import org.codehaus.gmavenplus.java.Parent - - -/** - * Some GroovyDoc. - */ -class Child extends Parent { - - /** - * Some method GroovyDoc. - * - * @return the String from the parent - */ - String someOtherMethod() { - someMethod() - } - -} diff --git a/src/it/mixedGroovydoc2/src/main/java/org/codehaus/gmavenplus/java/Parent.java b/src/it/mixedGroovydoc2/src/main/java/org/codehaus/gmavenplus/java/Parent.java deleted file mode 100644 index dbd65f39e..000000000 --- a/src/it/mixedGroovydoc2/src/main/java/org/codehaus/gmavenplus/java/Parent.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus.java; - - -public class Parent { - - public String someMethod() { - return "Hello, world."; - } - -} diff --git a/src/it/mixedGroovydoc2/src/main/java2/org/codehaus/gmavenplus/java/Grandchild.java b/src/it/mixedGroovydoc2/src/main/java2/org/codehaus/gmavenplus/java/Grandchild.java deleted file mode 100644 index 0759b3fed..000000000 --- a/src/it/mixedGroovydoc2/src/main/java2/org/codehaus/gmavenplus/java/Grandchild.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.codehaus.gmavenplus.groovy.Child; - - -public class Grandchild extends Child { - - public String yetAnotherMethod() { - return someMethod(); - } - -} diff --git a/src/it/mixedGroovydoc2/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/mixedGroovydoc2/src/test/java/org/codehaus/gmavenplus/TheTest.java deleted file mode 100644 index c6adc2760..000000000 --- a/src/it/mixedGroovydoc2/src/test/java/org/codehaus/gmavenplus/TheTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - -import java.io.File; - - -public class TheTest { - - @Test - public void testClassesExist() { - File generatedGroovyDoc1 = new File("target/gapidocs/org/codehaus/gmavenplus/groovy/Child.html"); - Assert.assertTrue(generatedGroovyDoc1 + " does not exist.", generatedGroovyDoc1.exists()); - Assert.assertTrue(generatedGroovyDoc1 + " is empty.", generatedGroovyDoc1.length() > 0); - File generatedGroovyDoc2 = new File("target/gapidocs/org/codehaus/gmavenplus/java/Parent.html"); - Assert.assertTrue(generatedGroovyDoc2 + " does not exist.", generatedGroovyDoc2.exists()); - Assert.assertTrue(generatedGroovyDoc2 + " is empty.", generatedGroovyDoc2.length() > 0); - File generatedGroovyDoc3 = new File("target/gapidocs/org/codehaus/gmavenplus/java/Grandchild.html"); - Assert.assertTrue(generatedGroovyDoc3 + " does not exist.", generatedGroovyDoc3.exists()); - Assert.assertTrue(generatedGroovyDoc3 + " is empty.", generatedGroovyDoc3.length() > 0); - } - - @Test - public void testOverviewSummaryExists() { - File generatedGroovyDoc = new File("target/gapidocs/overview-summary.html"); - Assert.assertTrue(generatedGroovyDoc + " does not exist.", generatedGroovyDoc.exists()); - Assert.assertTrue(generatedGroovyDoc + " is empty.", generatedGroovyDoc.length() > 0); - } - -} diff --git a/src/it/multimodulePluginAndProjectClasspath/invoker.properties b/src/it/multimodulePluginAndProjectClasspath/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/multimodulePluginAndProjectClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/multimodulePluginAndProjectClasspath/pom.xml b/src/it/multimodulePluginAndProjectClasspath/pom.xml deleted file mode 100644 index 2a59eda7a..000000000 --- a/src/it/multimodulePluginAndProjectClasspath/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath - testing - GMavenPlus Plugin Multi-Module Plugin and Project Classpath Test - pom - - - - @groovyGroupId@ - groovy - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - a - b - - - diff --git a/src/it/multimodulePluginAndProjectClasspath2/a/pom.xml b/src/it/multimodulePluginAndProjectClasspath2/a/pom.xml deleted file mode 100644 index 27e1ee6ce..000000000 --- a/src/it/multimodulePluginAndProjectClasspath2/a/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath2 - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath2-a - testing - GMavenPlus Plugin Multi-Module Plugin and Project Classpath Test 2 A Module - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - - - - - - - junit - junit - @junitVersion@ - - - - - - - diff --git a/src/it/multimodulePluginAndProjectClasspath2/b/pom.xml b/src/it/multimodulePluginAndProjectClasspath2/b/pom.xml deleted file mode 100644 index ee741d76d..000000000 --- a/src/it/multimodulePluginAndProjectClasspath2/b/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath2 - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath2-b - testing - GMavenPlus Plugin Multi-Module Plugin and Project Classpath Test 2 B Module - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - - - - - - - org.junit.jupiter - junit-jupiter - ${junit6Version} - - - - - - - diff --git a/src/it/multimodulePluginAndProjectClasspath2/invoker.properties b/src/it/multimodulePluginAndProjectClasspath2/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/multimodulePluginAndProjectClasspath2/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/multimodulePluginAndProjectClasspath2/pom.xml b/src/it/multimodulePluginAndProjectClasspath2/pom.xml deleted file mode 100644 index 14ab10fce..000000000 --- a/src/it/multimodulePluginAndProjectClasspath2/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginAndProjectClasspath2 - testing - GMavenPlus Plugin Multi-Module Plugin and Project Classpath Test 2 - pom - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - @groovyGroupId@ - groovy - @groovyVersion@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - a - b - - - diff --git a/src/it/multimodulePluginClasspath/a/pom.xml b/src/it/multimodulePluginClasspath/a/pom.xml deleted file mode 100644 index 5ae59712c..000000000 --- a/src/it/multimodulePluginClasspath/a/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginClasspath - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginClasspath-a - testing - GMavenPlus Plugin Multi-Module Plugin Classpath Test A Module - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - PLUGIN_ONLY - - - - - - - junit - junit - @junitVersion@ - - - - - - - diff --git a/src/it/multimodulePluginClasspath/b/pom.xml b/src/it/multimodulePluginClasspath/b/pom.xml deleted file mode 100644 index 9f4c0207b..000000000 --- a/src/it/multimodulePluginClasspath/b/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimodulePluginClasspath - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginClasspath-b - testing - GMavenPlus Plugin Multi-Module Plugin Classpath Test B Module - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - PLUGIN_ONLY - - - - - - - org.junit.jupiter - junit-jupiter - ${junit6Version} - - - - - - - diff --git a/src/it/multimodulePluginClasspath/invoker.properties b/src/it/multimodulePluginClasspath/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/multimodulePluginClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/multimodulePluginClasspath/pom.xml b/src/it/multimodulePluginClasspath/pom.xml deleted file mode 100644 index 96267bada..000000000 --- a/src/it/multimodulePluginClasspath/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-root - testing - ../pom.xml - - - gmavenplus-plugin-it-multimodulePluginClasspath - testing - GMavenPlus Plugin Multi-Module Plugin and Project Classpath Test - pom - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - @groovyGroupId@ - groovy - @groovyVersion@ - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - a - b - - - diff --git a/src/it/multimoduleProjectClasspath/a/pom.xml b/src/it/multimoduleProjectClasspath/a/pom.xml deleted file mode 100644 index 3b9edab73..000000000 --- a/src/it/multimoduleProjectClasspath/a/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimoduleProjectClasspath - testing - ../pom.xml - - - gmavenplus-plugin-it-multimoduleProjectClasspath-a - testing - GMavenPlus Plugin Multi-Module Project Classpath Test A Module - - - - junit - junit - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - PROJECT_ONLY - - - - - - - - - diff --git a/src/it/multimoduleProjectClasspath/b/pom.xml b/src/it/multimoduleProjectClasspath/b/pom.xml deleted file mode 100644 index 56e232788..000000000 --- a/src/it/multimoduleProjectClasspath/b/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - 4.0.0 - - - org.codehaus.gmavenplus - gmavenplus-plugin-it-multimoduleProjectClasspath - testing - ../pom.xml - - - gmavenplus-plugin-it-multimoduleProjectClasspath-b - testing - GMavenPlus Plugin Multi-Module Project Classpath Test B Module - - - - org.junit.jupiter - junit-jupiter - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - test - - execute - - - - - PROJECT_ONLY - - - - - - - - - diff --git a/src/it/multimoduleProjectClasspath/invoker.properties b/src/it/multimoduleProjectClasspath/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/multimoduleProjectClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/parametersCompile/invoker.properties b/src/it/parametersCompile/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/parametersCompile/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/parametersCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/parametersCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index 45e36b2e8..000000000 --- a/src/it/parametersCompile/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,8 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeClass { - - void someMethod(String param1, String param2) {} - -} diff --git a/src/it/parametersCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/parametersCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java deleted file mode 100644 index 2b9c9a952..000000000 --- a/src/it/parametersCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.codehaus.gmavenplus; - -import groovy.lang.GroovySystem; -import org.junit.Assert; -import org.junit.Test; - -import java.lang.reflect.Method; -import java.lang.reflect.Parameter; -import java.util.Arrays; -import java.util.List; - - -public class SomeClassTest { - - @Test - public void testSomeMethod() throws NoSuchMethodException { - Method method = SomeClass.class.getDeclaredMethod("someMethod", String.class, String.class); - List parameterNames = Arrays.asList(method.getParameters()); - - Assert.assertEquals(2, parameterNames.size()); - - if (GroovySystem.getVersion().startsWith("1.5") - || GroovySystem.getVersion().startsWith("1.6") - || GroovySystem.getVersion().startsWith("1.7") - || GroovySystem.getVersion().startsWith("1.8") - || GroovySystem.getVersion().startsWith("1.9") - || GroovySystem.getVersion().startsWith("2.0") - || GroovySystem.getVersion().startsWith("2.1") - || GroovySystem.getVersion().startsWith("2.2") - || GroovySystem.getVersion().startsWith("2.3") - || GroovySystem.getVersion().startsWith("2.4")) { - Assert.assertEquals("arg0", parameterNames.get(0).getName()); - Assert.assertEquals("arg1", parameterNames.get(1).getName()); - } else { - Assert.assertEquals("param1", parameterNames.get(0).getName()); - Assert.assertEquals("param2", parameterNames.get(1).getName()); - } - } - -} diff --git a/src/it/pluginAndProjectClasspath/invoker.properties b/src/it/pluginAndProjectClasspath/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/pluginAndProjectClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/pluginClasspath/invoker.properties b/src/it/pluginClasspath/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/pluginClasspath/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/configScriptCompile/invoker.properties b/src/it/shaded-groovy/invoker.properties similarity index 100% rename from src/it/configScriptCompile/invoker.properties rename to src/it/shaded-groovy/invoker.properties diff --git a/src/it/shadedGroovy/pom.xml b/src/it/shaded-groovy/pom.xml similarity index 95% rename from src/it/shadedGroovy/pom.xml rename to src/it/shaded-groovy/pom.xml index 4e7d31634..17fa55fb4 100644 --- a/src/it/shadedGroovy/pom.xml +++ b/src/it/shaded-groovy/pom.xml @@ -11,7 +11,7 @@ ../pom.xml - gmavenplus-plugin-it-shadedGroovy + gmavenplus-plugin-it-shaded-groovy testing pom GMavenPlus Plugin Shaded Groovy Test diff --git a/src/it/shadedGroovy/testModule/pom.xml b/src/it/shaded-groovy/testModule/pom.xml similarity index 96% rename from src/it/shadedGroovy/testModule/pom.xml rename to src/it/shaded-groovy/testModule/pom.xml index ee36f5bde..55d5d78eb 100644 --- a/src/it/shadedGroovy/testModule/pom.xml +++ b/src/it/shaded-groovy/testModule/pom.xml @@ -6,7 +6,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-shadedGroovy + gmavenplus-plugin-it-shaded-groovy testing ../pom.xml diff --git a/src/it/advancedGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/shaded-groovy/testModule/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy similarity index 100% rename from src/it/advancedGenerateStubs/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy rename to src/it/shaded-groovy/testModule/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy diff --git a/src/it/basicCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/shaded-groovy/testModule/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java similarity index 100% rename from src/it/basicCompile/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java rename to src/it/shaded-groovy/testModule/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java diff --git a/src/it/shadedGroovy/uberModule/pom.xml b/src/it/shaded-groovy/uberModule/pom.xml similarity index 95% rename from src/it/shadedGroovy/uberModule/pom.xml rename to src/it/shaded-groovy/uberModule/pom.xml index 298c1c19c..3c700677c 100644 --- a/src/it/shadedGroovy/uberModule/pom.xml +++ b/src/it/shaded-groovy/uberModule/pom.xml @@ -5,7 +5,7 @@ org.codehaus.gmavenplus - gmavenplus-plugin-it-shadedGroovy + gmavenplus-plugin-it-shaded-groovy testing ../pom.xml diff --git a/src/it/shadedGroovy/invoker.properties b/src/it/shadedGroovy/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/shadedGroovy/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/shadedGroovy/testModule/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy b/src/it/shadedGroovy/testModule/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy deleted file mode 100644 index f5e054171..000000000 --- a/src/it/shadedGroovy/testModule/src/main/groovy/org/codehaus/gmavenplus/SomeClass.groovy +++ /dev/null @@ -1,10 +0,0 @@ -package org.codehaus.gmavenplus - - -class SomeClass { - - String someMethod() { - return "Hello, world." - } - -} diff --git a/src/it/shadedGroovy/testModule/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java b/src/it/shadedGroovy/testModule/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java deleted file mode 100644 index c5b485711..000000000 --- a/src/it/shadedGroovy/testModule/src/test/java/org/codehaus/gmavenplus/SomeClassTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.codehaus.gmavenplus; - -import org.junit.Assert; -import org.junit.Test; - - -public class SomeClassTest { - - @Test - public void testSomeMethod() { - SomeClass someClass = new SomeClass(); - Assert.assertEquals("Hello, world.", someClass.someMethod()); - } - -} diff --git a/src/it/stubs-classpath-isolation/invoker.properties b/src/it/stubs-classpath-isolation/invoker.properties new file mode 100644 index 000000000..dbe2149e3 --- /dev/null +++ b/src/it/stubs-classpath-isolation/invoker.properties @@ -0,0 +1,3 @@ +invoker.goals = clean compile +invoker.buildResult = failure +#invoker.debug = true diff --git a/src/it/cleanClasspathGenerateStubs/pom.xml b/src/it/stubs-classpath-isolation/pom.xml similarity index 67% rename from src/it/cleanClasspathGenerateStubs/pom.xml rename to src/it/stubs-classpath-isolation/pom.xml index 87d8b4e37..c491ba177 100644 --- a/src/it/cleanClasspathGenerateStubs/pom.xml +++ b/src/it/stubs-classpath-isolation/pom.xml @@ -11,18 +11,12 @@ ../pom.xml - gmavenplus-plugin-it-cleanClasspathGenerateStubs + gmavenplus-plugin-it-stubs-classpath-isolation testing - GMavenPlus Plugin Clean Classpath Generate Stubs Test - The simplest generate stubs use case where it would fail if the classpath were polluted with the plugin - classpath. This will fail for all versions of Groovy before 1.8.2. - + GMavenPlus Plugin Stub Classpath Isolation Test + Verifies stub generation fails when project-only classpath isolation hides plugin dependencies. - - junit - junit - @groovyGroupId@ groovy @@ -38,7 +32,7 @@ generateStubs - removeStubs + generateTestStubs diff --git a/src/it/stubs-classpath-isolation/src/main/groovy/org/codehaus/gmavenplus/MainStubFixture.groovy b/src/it/stubs-classpath-isolation/src/main/groovy/org/codehaus/gmavenplus/MainStubFixture.groovy new file mode 100644 index 000000000..2a3d1297b --- /dev/null +++ b/src/it/stubs-classpath-isolation/src/main/groovy/org/codehaus/gmavenplus/MainStubFixture.groovy @@ -0,0 +1,11 @@ +package org.codehaus.gmavenplus + +import org.apache.maven.project.MavenProject + + +class MainStubFixture { + + void acceptProject(MavenProject project) { + } + +} diff --git a/src/it/stubs-classpath-isolation/src/test/groovy/org/codehaus/gmavenplus/TestStubFixture.groovy b/src/it/stubs-classpath-isolation/src/test/groovy/org/codehaus/gmavenplus/TestStubFixture.groovy new file mode 100644 index 000000000..d827ae20f --- /dev/null +++ b/src/it/stubs-classpath-isolation/src/test/groovy/org/codehaus/gmavenplus/TestStubFixture.groovy @@ -0,0 +1,11 @@ +package org.codehaus.gmavenplus + +import org.apache.maven.project.MavenProject + + +class TestStubFixture { + + void acceptProject(MavenProject project) { + } + +} diff --git a/src/it/mixedCompile2/invoker.properties b/src/it/stubs-cleanup/invoker.properties similarity index 72% rename from src/it/mixedCompile2/invoker.properties rename to src/it/stubs-cleanup/invoker.properties index 01482d231..ad2234238 100644 --- a/src/it/mixedCompile2/invoker.properties +++ b/src/it/stubs-cleanup/invoker.properties @@ -1,2 +1 @@ invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true diff --git a/src/it/basicGenerateStubs/pom.xml b/src/it/stubs-cleanup/pom.xml similarity index 58% rename from src/it/basicGenerateStubs/pom.xml rename to src/it/stubs-cleanup/pom.xml index a27381904..41510584d 100644 --- a/src/it/basicGenerateStubs/pom.xml +++ b/src/it/stubs-cleanup/pom.xml @@ -11,17 +11,11 @@ ../pom.xml - gmavenplus-plugin-it-basicGenerateStubs + gmavenplus-plugin-it-stubs-cleanup testing - GMavenPlus Plugin Basic Generate Stubs Test - The simplest generate stubs use case. This will fail for all versions of Groovy before 1.8.2. - + GMavenPlus Plugin Test Stubs Cleanup Test - - junit - junit - @groovyGroupId@ groovy @@ -36,20 +30,26 @@ - generateStubs + generateTestStubs + removeTestStubs + + + + assert-test-stubs-removed + test + + execute + + + + + - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - diff --git a/src/it/stubs-cleanup/src/test/groovy/org/codehaus/gmavenplus/CleanupFixture.groovy b/src/it/stubs-cleanup/src/test/groovy/org/codehaus/gmavenplus/CleanupFixture.groovy new file mode 100644 index 000000000..3db9e9af0 --- /dev/null +++ b/src/it/stubs-cleanup/src/test/groovy/org/codehaus/gmavenplus/CleanupFixture.groovy @@ -0,0 +1,7 @@ +package org.codehaus.gmavenplus + +class CleanupFixture { + String value() { + 'cleanup' + } +} diff --git a/src/it/mixedCompile/invoker.properties b/src/it/stubs-main-and-test/invoker.properties similarity index 100% rename from src/it/mixedCompile/invoker.properties rename to src/it/stubs-main-and-test/invoker.properties diff --git a/src/it/mixedCompile2/pom.xml b/src/it/stubs-main-and-test/pom.xml similarity index 96% rename from src/it/mixedCompile2/pom.xml rename to src/it/stubs-main-and-test/pom.xml index 9872f50e0..eddeb8a64 100644 --- a/src/it/mixedCompile2/pom.xml +++ b/src/it/stubs-main-and-test/pom.xml @@ -11,9 +11,9 @@ ../pom.xml - gmavenplus-plugin-it-mixedCompile2 + gmavenplus-plugin-it-stubs-main-and-test testing - GMavenPlus Plugin Mixed Compile Test 2 + GMavenPlus Plugin Main and Test Stubs Test This tests mixed Java/Groovy compilation. This will fail for all versions of Groovy before 1.8.2. diff --git a/src/it/mixedCompile2/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy b/src/it/stubs-main-and-test/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy similarity index 100% rename from src/it/mixedCompile2/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy rename to src/it/stubs-main-and-test/src/main/groovy/org/codehaus/gmavenplus/groovy/Child.groovy diff --git a/src/it/mixedCompile2/src/main/java/org/codehaus/gmavenplus/java/Grandchild.java b/src/it/stubs-main-and-test/src/main/java/org/codehaus/gmavenplus/java/Grandchild.java similarity index 100% rename from src/it/mixedCompile2/src/main/java/org/codehaus/gmavenplus/java/Grandchild.java rename to src/it/stubs-main-and-test/src/main/java/org/codehaus/gmavenplus/java/Grandchild.java diff --git a/src/it/mixedCompile2/src/main/java/org/codehaus/gmavenplus/java/Parent.java b/src/it/stubs-main-and-test/src/main/java/org/codehaus/gmavenplus/java/Parent.java similarity index 100% rename from src/it/mixedCompile2/src/main/java/org/codehaus/gmavenplus/java/Parent.java rename to src/it/stubs-main-and-test/src/main/java/org/codehaus/gmavenplus/java/Parent.java diff --git a/src/it/mixedCompile2/src/test/java/org/codehaus/gmavenplus/TheTest.java b/src/it/stubs-main-and-test/src/test/java/org/codehaus/gmavenplus/TheTest.java similarity index 100% rename from src/it/mixedCompile2/src/test/java/org/codehaus/gmavenplus/TheTest.java rename to src/it/stubs-main-and-test/src/test/java/org/codehaus/gmavenplus/TheTest.java diff --git a/src/it/testDependencyCompile/invoker.properties b/src/it/testDependencyCompile/invoker.properties deleted file mode 100644 index 01482d231..000000000 --- a/src/it/testDependencyCompile/invoker.properties +++ /dev/null @@ -1,2 +0,0 @@ -invoker.goals=clean test -Dmaven.plugin.validation=verbose -#invoker.debug = true