You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/10/20 15:08:38 UTC
cvs commit: jakarta-turbine-fulcrum/mimetype/impl/src/test/org/apache/fulcrum/mimetype MimetypeTest.java
epugh 2004/10/20 06:08:38
Modified: mimetype/impl/xdocs changes.xml
mimetype/impl project.xml maven.xml
mimetype/impl/src/test/org/apache/fulcrum/mimetype
MimetypeTest.java
Added: mimetype/impl/src/test TestRoleConfig.xml
TestComponentConfig.xml
Log:
Update tests to use TestContainer.
Revision Changes Path
1.4 +3 -0 jakarta-turbine-fulcrum/mimetype/impl/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/impl/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 30 Jun 2004 13:35:53 -0000 1.3
+++ changes.xml 20 Oct 2004 13:08:38 -0000 1.4
@@ -8,6 +8,9 @@
<body>
<release version="1.0.4" date="in cvs">
<action dev="epugh" type="update">
+ Reimplement test based on TestContainer
+ </action>
+ <action dev="epugh" type="update">
Update to use Merlin 3.3.0
</action>
<action dev="epugh" type="add">
1.1 jakarta-turbine-fulcrum/mimetype/impl/src/test/TestRoleConfig.xml
Index: TestRoleConfig.xml
===================================================================
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.fulcrum.mimetype.MimeTypeService"
shorthand="mimetype"
default-class="org.apache.fulcrum.mimetype.DefaultMimeTypeService"/>
</role-list>
1.1 jakarta-turbine-fulcrum/mimetype/impl/src/test/TestComponentConfig.xml
Index: TestComponentConfig.xml
===================================================================
<componentConfig>
<mimetype/>
</componentConfig>
1.5 +8 -2 jakarta-turbine-fulcrum/mimetype/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 30 Jun 2004 13:35:41 -0000 1.4
+++ project.xml 20 Oct 2004 13:08:38 -0000 1.5
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<project>
- <extend>${basedir}/../../merlin-project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>fulcrum-mimetype-impl</id>
<name>Fulcrum Mimetype Component</name>
<currentVersion>1.0.4</currentVersion>
@@ -9,7 +9,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>fulcrum</groupId>
@@ -17,6 +17,12 @@
<version>1.0.4</version>
</dependency>
+ <!-- Needed only for testing -->
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4-dev</version>
+ </dependency>
</dependencies>
</project>
1.2 +2 -2 jakarta-turbine-fulcrum/mimetype/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 13 Nov 2003 20:28:29 -0000 1.1
+++ maven.xml 20 Oct 2004 13:08:38 -0000 1.2
@@ -1,7 +1,7 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
+ <!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
- </preGoal>
+ </preGoal-->
</project>
1.4 +5 -11 jakarta-turbine-fulcrum/mimetype/impl/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java
Index: MimetypeTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/mimetype/impl/src/test/org/apache/fulcrum/mimetype/MimetypeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimetypeTest.java 13 Apr 2004 02:24:07 -0000 1.3
+++ MimetypeTest.java 20 Oct 2004 13:08:38 -0000 1.4
@@ -56,7 +56,7 @@
import java.io.File;
import java.util.Locale;
-import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
+import org.apache.fulcrum.testcontainer.BaseUnitTest;
import org.apache.fulcrum.mimetype.util.MimeType;
import org.apache.fulcrum.mimetype.util.MimeTypeMapperTest;
@@ -69,7 +69,7 @@
* @author Daniel Rall
* @version $Id$
*/
-public class MimetypeTest extends AbstractMerlinTestCase
+public class MimetypeTest extends BaseUnitTest
{
private MimeTypeService mimeTypeService = null;
@@ -86,14 +86,8 @@
public void setUp() throws Exception
{
super.setUp();
- try
- {
- mimeTypeService = (MimeTypeService) resolve("/test/mimetype");
- }
- catch (Throwable e)
- {
- fail(e.getMessage());
- }
+ mimeTypeService = (MimeTypeService) resolve(MimeTypeService.class.getName());
+
mimeTypeService.setContentType(MimeTypeMapperTest.MIME_TYPE + ' ' +
MimeTypeMapperTest.KNOWN_EXTENSIONS);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org