geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r424385 - in /geronimo/sandbox/svkmerge/m2migration/modules/system: pom.xml src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
Date Fri, 21 Jul 2006 16:50:22 GMT
Author: jdillon
Date: Fri Jul 21 09:50:21 2006
New Revision: 424385

URL: http://svn.apache.org/viewvc?rev=424385&view=rev
Log:
(GERONIMO-2212) Include xerces deps incase the host jdk uses a parser (like crimson) that
does not support attributes
Enable all tests
Remove <testResources> it is not needed, schema will get picked up from classes
Assert that plugin list is not null

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml?rev=424385&r1=424384&r2=424385&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/pom.xml Fri Jul 21 09:50:21 2006
@@ -73,7 +73,25 @@
             <groupId>concurrent</groupId>
             <artifactId>concurrent</artifactId>
         </dependency>
-
+        
+        <!-- Test Dependencies -->
+        
+        <!--
+        NOTE: Need to include Xerces for tests in case Crimson (or another parser)
+              gets picked up that does not support attributes
+        -->
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xmlParserAPIs</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
     
     <build>
@@ -99,41 +117,7 @@
             </resource>
         </resources>
         
-        <testResources>
-            <testResource>
-                <directory>${pom.basedir}src/test-data</directory>
-            </testResource>
-            
-            <testResource>
-                <directory>${pom.basedir}src/schema</directory>
-                <targetPath>META-INF/schema</targetPath>
-            </testResource>
-        </testResources>
-
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>java.io.tmpdir</name>
-                            <value>${pom.basedir}/target/tmp</value>
-                        </property>
-                    </systemProperties>
-                    
-                    <excludes>
-                        <exclude>**/Abstract*.java</exclude>
-                        
-                        <!--
-                           | FIXME: This test was disabled because it is failing in non-obvious
ways
-                           |        and requires someone with more insight to resolve
-                         -->
-                        <exclude>**/PluginInstallerTest.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-            
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java?rev=424385&r1=424384&r2=424385&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/system/src/test/org/apache/geronimo/system/plugin/PluginInstallerTest.java
Fri Jul 21 09:50:21 2006
@@ -75,6 +75,8 @@
 
     public void testParsing() throws Exception {
         PluginList list = installer.listPlugins(testRepo, null, null);
+        assertNotNull(list);
+        
         assertEquals(1, list.getRepositories().length);
         assertEquals(fakeRepo, list.getRepositories()[0]);
         assertTrue(list.getPlugins().length > 0);



Mime
View raw message