Author: fgiust Date: Sun Sep 17 08:03:55 2006 New Revision: 447074 URL: http://svn.apache.org/viewvc?view=rev&rev=447074 Log: reorganize tests, move expected files into the "expected" dir
Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.settings/org.eclipse.jdt.core.prefs - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/expected/.settings/.component - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/.settings/org.eclipse.jdt.core.prefs - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.component - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.project.facet.core.xml - copied, changed from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.project.facet.core.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/.settings/org.eclipse.jdt.core.prefs - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/.settings/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/.settings/org.eclipse.jdt.core.prefs - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/expected/.classpath - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/expected/.project - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/expected/.wtpmodules - copied unchanged from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/wtpmodules Removed: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-1/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-10/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-12/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-13/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-14/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-15/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-16/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-18/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-19/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-2/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.component maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.project.facet.core.xml maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-21/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-22/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-3/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-4/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/settings maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-5/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-6/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-7/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-8/wtpmodules maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/project maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-9/wtpmodules Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java?view=diff&rev=447074&r1=447073&r2=447074 ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AbstractEclipsePluginTestCase.java Sun Sep 17 08:03:55 2006 @@ -131,48 +131,6 @@ "org.apache.maven.plugins:maven-eclipse-plugin:eclipse" } ), eventMonitor, new ConsoleDownloadMonitor(), properties, basedir ); - File projectExpectedFile = new File( basedir, "project" ); - if ( projectExpectedFile.exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), projectExpectedFile, new File( projectOutputDir, - ".project" ) ); - } - - File classpathExpectedFile = new File( basedir, "classpath" ); - if ( classpathExpectedFile.exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), classpathExpectedFile, new File( projectOutputDir, - ".classpath" ) ); - } - - File wtpModulesExpectedFile = new File( basedir, "wtpmodules" ); - if ( wtpModulesExpectedFile.exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), wtpModulesExpectedFile, - new File( projectOutputDir, ".wtpmodules" ) ); - } - - if ( new File( basedir, "settings" ).exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), new File( basedir, "settings" ), - new File( projectOutputDir, ".settings/org.eclipse.jdt.core.prefs" ) ); - } - - File componentExpectedFile = new File( basedir, "component" ); - if ( componentExpectedFile.exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), componentExpectedFile, - new File( projectOutputDir, ".settings/.component" ) ); - } - - // WTP15 - File component15ExpectedFile = new File( basedir, "org.eclipse.wst.common.component" ); - if ( component15ExpectedFile.exists() ) - { - assertFileEquals( localRepositoryDir.getCanonicalPath(), component15ExpectedFile, - new File( projectOutputDir, ".settings/org.eclipse.wst.common.component" ) ); - } - compareDirectoryContent( basedir, projectOutputDir, "" ); compareDirectoryContent( basedir, projectOutputDir, ".settings/" ); Copied: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.project.facet.core.xml (from r447069, maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.project.facet.core.xml) URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.project.facet.core.xml?view=diff&rev=447074&p1=maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.project.facet.core.xml&r1=447069&p2=maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.project.facet.core.xml&r2=447074 ============================================================================== --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/org.eclipse.wst.common.project.facet.core.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-20/expected/.settings/org.eclipse.wst.common.project.facet.core.xml Sun Sep 17 08:03:55 2006 @@ -1,6 +1,6 @@ <faceted-project> <fixed facet="jst.java"/> - <fixed facet="jst.utility"/> - <installed facet="jst.utility" version="1.0"/> + <fixed facet="jst.web"/> + <installed facet="jst.web" version="2.4"/> <installed facet="jst.java" version="1.4"/> </faceted-project>