From c061da352d2ac65a15dfd3ab80bff0e27618af39 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Sat, 11 Oct 2008 18:41:20 +0000 Subject: [PATCH] o Migrated test for MPLUGIN-105 into automated IT suite git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@703706 13f79535-47bb-0310-9956-ffa450edef68 --- maven-plugin-plugin/pom.xml | 4 - maven-plugin-plugin/src/it/java-basic/pom.xml | 4 + .../src/it/plugin-report-failure-it/pom.xml | 38 --------- .../src/test/java/PluginReportCrashTest.java | 33 -------- .../test/resources/PluginReportCrash/pom.xml | 23 ----- .../its/mng3473/mng_3473_mojo/MyMojo.java | 81 ------------------ .../src/it/plugin-report/invoker.properties | 1 + .../src/it/plugin-report/pom.xml | 83 +++++++++++++++++++ .../src/main/java/org/MyMojo.java | 65 +++++++++++++++ .../src/it/plugin-report/verify.bsh | 36 ++++++++ 10 files changed, 189 insertions(+), 179 deletions(-) delete mode 100644 maven-plugin-plugin/src/it/plugin-report-failure-it/pom.xml delete mode 100644 maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/java/PluginReportCrashTest.java delete mode 100644 maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/pom.xml delete mode 100644 maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/src/main/java/org/apache/maven/its/mng3473/mng_3473_mojo/MyMojo.java create mode 100644 maven-plugin-plugin/src/it/plugin-report/invoker.properties create mode 100644 maven-plugin-plugin/src/it/plugin-report/pom.xml create mode 100644 maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java create mode 100644 maven-plugin-plugin/src/it/plugin-report/verify.bsh diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml index f4ca104..a6db565 100644 --- a/maven-plugin-plugin/pom.xml +++ b/maven-plugin-plugin/pom.xml @@ -273,10 +273,6 @@ true ${project.build.directory}/it - - - plugin-report-failure-it/* - setup.bsh verify.bsh ${project.build.directory}/local-repo diff --git a/maven-plugin-plugin/src/it/java-basic/pom.xml b/maven-plugin-plugin/src/it/java-basic/pom.xml index 071f8d0..651823b 100644 --- a/maven-plugin-plugin/src/it/java-basic/pom.xml +++ b/maven-plugin-plugin/src/it/java-basic/pom.xml @@ -34,6 +34,10 @@ under the License. java-based mojo sources, install the plugin, and then use it. + + UTF-8 + + org.apache.maven diff --git a/maven-plugin-plugin/src/it/plugin-report-failure-it/pom.xml b/maven-plugin-plugin/src/it/plugin-report-failure-it/pom.xml deleted file mode 100644 index 86f75c5..0000000 --- a/maven-plugin-plugin/src/it/plugin-report-failure-it/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - 4.0.0 - org.apache.maven.its - maven-integration-test-sample - 1.0-SNAPSHOT - Maven Integration Tests - - - org.apache.maven.shared - maven-verifier - 1.0 - - - org.apache.maven.its - maven-integration-test-helper - 1.0-SNAPSHOT - - - junit - junit - 3.8.1 - test - - - - - - apache.snapshots - http://people.apache.org/repo/m2-snapshot-repository - - false - - - true - - - - diff --git a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/java/PluginReportCrashTest.java b/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/java/PluginReportCrashTest.java deleted file mode 100644 index 38a06d6..0000000 --- a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/java/PluginReportCrashTest.java +++ /dev/null @@ -1,33 +0,0 @@ - - -import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase; -import org.apache.maven.it.Verifier; -import org.apache.maven.it.util.ResourceExtractor; - -import java.io.File; - -/** - * Tests that the PluginDescriptor.getArtifacts() call returns all of the dependencies of the plugin, - * not just those that made it past the filter excluding Maven's core artifacts. - */ -public class PluginReportCrashTest - extends AbstractMavenIntegrationTestCase -{ - public void testPluginReport() - throws Exception - { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/PluginReportCrash" ); - - Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - - verifier.executeGoal( "org.apache.maven.plugins:maven-plugin-plugin:2.3:report" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - - verifier = new Verifier( testDir.getAbsolutePath() ); - - verifier.executeGoal( "org.apache.maven.plugins:maven-plugin-plugin:2.4:report" ); - verifier.verifyErrorFreeLog(); - verifier.resetStreams(); - } -} diff --git a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/pom.xml b/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/pom.xml deleted file mode 100644 index ba6ef94..0000000 --- a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - 4.0.0 - org.apache.maven.its.pluginreportcrash - mng-pluginreportcrash-mojo - maven-plugin - 0.0.1-SNAPSHOT - PluginReportCrash - http://maven.apache.org - - - org.apache.maven - maven-plugin-api - 2.0 - - - junit - junit - 3.8.1 - test - - - diff --git a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/src/main/java/org/apache/maven/its/mng3473/mng_3473_mojo/MyMojo.java b/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/src/main/java/org/apache/maven/its/mng3473/mng_3473_mojo/MyMojo.java deleted file mode 100644 index b4ed2ad..0000000 --- a/maven-plugin-plugin/src/it/plugin-report-failure-it/src/test/resources/PluginReportCrash/src/main/java/org/apache/maven/its/mng3473/mng_3473_mojo/MyMojo.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.apache.maven.its.mng3473.mng_3473_mojo; - -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; - -/** - * Goal which touches a timestamp file. - * - * @goal touch - * - * @phase process-sources - */ -public class MyMojo - extends AbstractMojo -{ - /** - * Location of the file. - * @parameter expression="${project.build.directory}" - * @required - */ - private File outputDirectory; - - public void execute() - throws MojoExecutionException - { - File f = outputDirectory; - - if ( !f.exists() ) - { - f.mkdirs(); - } - - File touch = new File( f, "touch.txt" ); - - FileWriter w = null; - try - { - w = new FileWriter( touch ); - - w.write( "touch.txt" ); - } - catch ( IOException e ) - { - throw new MojoExecutionException( "Error creating file " + touch, e ); - } - finally - { - if ( w != null ) - { - try - { - w.close(); - } - catch ( IOException e ) - { - // ignore - } - } - } - } -} diff --git a/maven-plugin-plugin/src/it/plugin-report/invoker.properties b/maven-plugin-plugin/src/it/plugin-report/invoker.properties new file mode 100644 index 0000000..88bfb6d --- /dev/null +++ b/maven-plugin-plugin/src/it/plugin-report/invoker.properties @@ -0,0 +1 @@ +invoker.goals = clean site diff --git a/maven-plugin-plugin/src/it/plugin-report/pom.xml b/maven-plugin-plugin/src/it/plugin-report/pom.xml new file mode 100644 index 0000000..19b1d8a --- /dev/null +++ b/maven-plugin-plugin/src/it/plugin-report/pom.xml @@ -0,0 +1,83 @@ + + + + + + 4.0.0 + + org.apache.maven.its + plugin-report + 1.0 + maven-plugin + + MPLUGIN-105 + + Test basic site generation to guard against regression of MPLUGIN-105. + + + + UTF-8 + + + + + org.apache.maven + maven-plugin-api + 2.0 + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + @project.version@ + + + org.apache.maven.plugins + maven-site-plugin + 2.0-beta-7 + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.0.1 + + + + index + + + + + + org.apache.maven.plugins + maven-plugin-plugin + @project.version@ + + + + diff --git a/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java b/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java new file mode 100644 index 0000000..d48417e --- /dev/null +++ b/maven-plugin-plugin/src/it/plugin-report/src/main/java/org/MyMojo.java @@ -0,0 +1,65 @@ +package org; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import org.apache.maven.plugin.AbstractMojo; + +/** + * Does nothing. + * + * @goal noop + * @phase process-sources + * @requiresDependencyResolution test + * @requiresDirectInvocation true + * @requiresOnline + * @inheritByDefault false + * @execute phase="compile" + * @aggregator + * @since 1.0 + * + * @deprecated You don't use test goals, do you? + */ +public class MyMojo + extends AbstractMojo +{ + + /** + * This is a test. + * + * @parameter + * @required + */ + private String required; + + /** + * This is a test. + * + * @parameter expression="${string}" default-value="${project.version}" + * @deprecated Just testing. + * @since 1.1 + */ + private String string; + + public void execute() + { + // intentional do nothing + } + +} diff --git a/maven-plugin-plugin/src/it/plugin-report/verify.bsh b/maven-plugin-plugin/src/it/plugin-report/verify.bsh new file mode 100644 index 0000000..08a534b --- /dev/null +++ b/maven-plugin-plugin/src/it/plugin-report/verify.bsh @@ -0,0 +1,36 @@ +import java.io.*; +import java.util.*; +import java.util.regex.*; + +try +{ + File siteDir = new File( basedir, "target/site" ); + System.out.println( "Checking for existence of site directory: " + siteDir ); + if ( !siteDir.isDirectory() ) + { + System.out.println( "FAILED!" ); + return false; + } + + String[] expectedFiles = { + "noop-mojo.html", + "plugin-info.html", + }; + for ( String path : expectedFiles ) + { + File file = new File( siteDir, path ); + System.out.println( "Checking for existence of doc file: " + file ); + if ( !file.isFile() ) + { + System.out.println( "FAILED!" ); + return false; + } + } +} +catch( Throwable t ) +{ + t.printStackTrace(); + return false; +} + +return true;