maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aherit...@apache.org
Subject svn commit: r595476 [6/6] - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/osgiplugin/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven...
Date Thu, 15 Nov 2007 22:22:02 GMT
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java?rev=595476&r1=595475&r2=595476&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
Thu Nov 15 14:21:55 2007
@@ -44,9 +44,10 @@
      */
     public void testParseDependencies()
     {
-        Dependency[] deps = mojo.parseDependencies( "org.eclipse.ui;bundle-version=\"[3.2.0,4.0.0)\","
-            + "org.eclipse.ui.console;resolution:=\"optional\";bundle-version=\"[3.1.100,4.0.0)\",org.eclipse.help;"
-            + "bundle-version=\"[3.2.0,4.0.0)\",org.eclipse.core.expressions;bundle-version=\"[3.2.0,4.0.0)\""
);
+        Dependency[] deps =
+            mojo.parseDependencies( "org.eclipse.ui;bundle-version=\"[3.2.0,4.0.0)\","
+                + "org.eclipse.ui.console;resolution:=\"optional\";bundle-version=\"[3.1.100,4.0.0)\",org.eclipse.help;"
+                + "bundle-version=\"[3.2.0,4.0.0)\",org.eclipse.core.expressions;bundle-version=\"[3.2.0,4.0.0)\""
);
 
         assertEquals( 4, deps.length );
         assertEquals( "org.eclipse.ui", deps[0].getArtifactId() );
@@ -64,8 +65,8 @@
      */
     public void testParseDependenciesWithQualifier()
     {
-        Dependency[] deps = mojo
-            .parseDependencies( "org.eclipse.ui;bundle-version=\"[3.2.0.0,4.0.0.0)\","
+        Dependency[] deps =
+            mojo.parseDependencies( "org.eclipse.ui;bundle-version=\"[3.2.0.0,4.0.0.0)\","
                 + "org.eclipse.ui.console;resolution:=\"optional\";bundle-version=\"[3.1.100.0,4.0.0.0)\",org.eclipse.help;"
                 + "bundle-version=\"[3.2.0.1,4.0.0.2)\",org.eclipse.core.expressions;bundle-version=\"[3.2.0.0,4.0.0.0)\""
);
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=595476&r1=595475&r2=595476&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Thu Nov 15 14:21:55 2007
@@ -46,18 +46,13 @@
         testProject( "project-rad-1", new Properties(), "rad-clean", "rad" );
     }
 
-/* TODO: fix failing test
-    public void testProject2()
-        throws Exception
-    {
-        testProject( "project-rad-2", new Properties(), "rad-clean", "rad" );
-        File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF"
);
-        File expectedManifest =
-            getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF"
);
-        assertFileEquals( localRepositoryDirectory.getCanonicalPath(), expectedManifest,
generatedManifest );
-
-    }
-*/
+    /*
+     * TODO: fix failing test public void testProject2() throws Exception { testProject(
"project-rad-2", new
+     * Properties(), "rad-clean", "rad" ); File generatedManifest = getTestFile( PROJECTS_BASEDIR
+
+     * "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" ); File expectedManifest = getTestFile(
PROJECTS_BASEDIR +
+     * "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" ); assertFileEquals(
+     * localRepositoryDirectory.getCanonicalPath(), expectedManifest, generatedManifest );
}
+     */
 
     public void testProject3()
         throws Exception
@@ -131,10 +126,18 @@
                     new File( basedir, "project-rad-1/maven-core-98.0.jar" ).exists() );
 
         Xpp3Dom applicationXml =
-            Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir,
"project-rad-1/META-INF/application.xml" ) ), "UTF-8" ) );
+            Xpp3DomBuilder.build( new InputStreamReader(
+                                                         new FileInputStream(
+                                                                              new File( basedir,
+                                                                                        "project-rad-1/META-INF/application.xml"
) ),
+                                                         "UTF-8" ) );
 
         Xpp3Dom modulesmapsXml =
-            Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir,
"project-rad-1/META-INF/.modulemaps" ) ), "UTF-8" ) );
+            Xpp3DomBuilder.build( new InputStreamReader(
+                                                         new FileInputStream(
+                                                                              new File( basedir,
+                                                                                        "project-rad-1/META-INF/.modulemaps"
) ),
+                                                         "UTF-8" ) );
 
         assertNotNull( modulesmapsXml );
 
@@ -151,7 +154,10 @@
         assertEquals( "project-rad-5_3.jar", ejbModule.getChild( "ejb" ).getValue() );
 
         Xpp3Dom websettings =
-            Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir,
"project-rad-2/.websettings" ) ), "UTF-8" ) );
+            Xpp3DomBuilder.build( new InputStreamReader(
+                                                         new FileInputStream( new File( basedir,
+                                                                                        "project-rad-2/.websettings"
) ),
+                                                         "UTF-8" ) );
 
         assertEquals( "project-rad-5_4.jar",
                       websettings.getChild( "lib-modules" ).getChild( "lib-module" ).getChild(
"jar" ).getValue() );
@@ -218,7 +224,8 @@
 
         File application = new File( basedir, "project-rad-1/META-INF/application.xml" );
 
-        Xpp3Dom applicationXml = Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream(
application ), "UTF-8" ) );
+        Xpp3Dom applicationXml =
+            Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( application
), "UTF-8" ) );
 
         Xpp3Dom[] children = applicationXml.getChildren( "module" );
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java?rev=595476&r1=595475&r2=595476&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriterUnitTest.java
Thu Nov 15 14:21:55 2007
@@ -65,10 +65,10 @@
 
         new File( basedir, maskedOutputDir ).mkdirs();
 
-        EclipseSourceDir dir = new EclipseSourceDir( "src/main/resources", "target/classes",
true, false, null, null,
-                                                     false );
-        EclipseSourceDir testDir = new EclipseSourceDir( "src/test/resources", "target/classes/test-resources",
true,
-                                                         true, null, null, false );
+        EclipseSourceDir dir =
+            new EclipseSourceDir( "src/main/resources", "target/classes", true, false, null,
null, false );
+        EclipseSourceDir testDir =
+            new EclipseSourceDir( "src/test/resources", "target/classes/test-resources",
true, true, null, null, false );
 
         EclipseSourceDir[] dirs = { dir, testDir };
 
@@ -92,8 +92,8 @@
 
         XPath testResourcePath = XPath.newInstance( "//classpathentry[@path='src/test/resources']"
);
 
-        assertTrue( "test resources (minus custom output dir) classpath entry not found.",
testResourcePath
-            .selectSingleNode( doc ) != null );
+        assertTrue( "test resources (minus custom output dir) classpath entry not found.",
+                    testResourcePath.selectSingleNode( doc ) != null );
 
         XPath stdOutputPath = XPath.newInstance( "//classpathentry[@kind='output' &&
@path='target/classes']" );
 

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java?rev=595476&r1=595475&r2=595476&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java
Thu Nov 15 14:21:55 2007
@@ -23,17 +23,17 @@
     extends TestCase
 {
     private static File basedir = new File( System.getProperty( "basedir", "." ) );
-    
+
     public void testLoadFormatter()
         throws Exception
     {
         File testStyleFile = new File( basedir, "src/test/resources/projects/workspace-02/code-styles.xml"
);
-        
+
         EclipseCodeFormatterProfile formatter = new EclipseCodeFormatterProfile();
         formatter.init( testStyleFile.toURL(), null );
-        
+
         assertEquals( "format-1", formatter.getProfileName() );
-        
-        //see integration test on workspace-02 for content validation
+
+        // see integration test on workspace-02 for content validation
     }
 }



Mime
View raw message