Return-Path: Delivered-To: apmail-maven-m2-dev-archive@www.apache.org Received: (qmail 24144 invoked from network); 25 Jun 2004 18:43:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 25 Jun 2004 18:43:51 -0000 Received: (qmail 24987 invoked by uid 500); 25 Jun 2004 18:43:58 -0000 Delivered-To: apmail-maven-m2-dev-archive@maven.apache.org Received: (qmail 24904 invoked by uid 500); 25 Jun 2004 18:43:57 -0000 Mailing-List: contact m2-dev-help@maven.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: List-Id: "Maven 2 Developers List" Reply-To: "Maven 2 Developers List" Delivered-To: mailing list m2-dev@maven.apache.org Received: (qmail 24757 invoked by uid 500); 25 Jun 2004 18:43:56 -0000 Delivered-To: apmail-maven-components-cvs@apache.org Received: (qmail 24740 invoked by uid 99); 25 Jun 2004 18:43:56 -0000 X-ASF-Spam-Status: No, hits=0.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.27.1) with SMTP; Fri, 25 Jun 2004 11:43:55 -0700 Received: (qmail 24010 invoked by uid 1162); 25 Jun 2004 18:43:40 -0000 Date: 25 Jun 2004 18:43:40 -0000 Message-ID: <20040625184340.24009.qmail@minotaur.apache.org> From: jvanzyl@apache.org To: maven-components-cvs@apache.org Subject: cvs commit: maven-components/maven-plugin/src/test/java/org/apache/maven/plugin/generator AbstractGeneratorTestCase.java PluginDescriptorGeneratorTest.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jvanzyl 2004/06/25 11:43:40 Modified: maven-plugin/src/test/java/org/apache/maven/plugin/generator AbstractGeneratorTestCase.java PluginDescriptorGeneratorTest.java Log: o validator must run Revision Changes Path 1.5 +3 -1 maven-components/maven-plugin/src/test/java/org/apache/maven/plugin/generator/AbstractGeneratorTestCase.java Index: AbstractGeneratorTestCase.java =================================================================== RCS file: /home/cvs/maven-components/maven-plugin/src/test/java/org/apache/maven/plugin/generator/AbstractGeneratorTestCase.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- AbstractGeneratorTestCase.java 24 Jun 2004 16:36:16 -0000 1.4 +++ AbstractGeneratorTestCase.java 25 Jun 2004 18:43:40 -0000 1.5 @@ -49,6 +49,8 @@ String pom = new File( basedir, "src/test/resources/source/pom.xml" ).getPath(); generator.execute( sourceDirectory, destinationDirectory, pom ); + + validate(); } // ---------------------------------------------------------------------- 1.7 +6 -12 maven-components/maven-plugin/src/test/java/org/apache/maven/plugin/generator/PluginDescriptorGeneratorTest.java Index: PluginDescriptorGeneratorTest.java =================================================================== RCS file: /home/cvs/maven-components/maven-plugin/src/test/java/org/apache/maven/plugin/generator/PluginDescriptorGeneratorTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- PluginDescriptorGeneratorTest.java 24 Jun 2004 16:36:16 -0000 1.6 +++ PluginDescriptorGeneratorTest.java 25 Jun 2004 18:43:40 -0000 1.7 @@ -43,30 +43,24 @@ MojoDescriptor mojoDescriptor = (MojoDescriptor) pluginDescriptor.getMojos().get( 0 ); - assertEquals( "compiler", mojoDescriptor.getId() ); + assertEquals( "idea:ideaOne", mojoDescriptor.getId() ); - assertEquals( "org.apache.maven.plugin.idea.IdeaPlugin", mojoDescriptor.getImplementation() ); + assertEquals( "org.apache.maven.plugin.idea.IdeaMojoOne", mojoDescriptor.getImplementation() ); assertEquals( "singleton", mojoDescriptor.getInstantiationStrategy() ); // ---------------------------------------------------------------------- - // Goals - // ---------------------------------------------------------------------- - - assertEquals( "compile", mojoDescriptor.getGoal() ); - - // ---------------------------------------------------------------------- // Parameters // ---------------------------------------------------------------------- List parameters = mojoDescriptor.getParameters(); - assertEquals( 4, parameters.size() ); + assertEquals( 1, parameters.size() ); Parameter pd = (Parameter) mojoDescriptor.getParameters().get( 0 ); - assertEquals( "sourceDirectory", pd.getName() ); + assertEquals( "project", pd.getName() ); - assertEquals( "#project.build.sourceDirectory", pd.getExpression() ); + assertEquals( "#project", pd.getExpression() ); } }