epugh 2004/11/24 09:22:07
Modified: src/test/org/apache/turbine/services/mimetype
FulcrumMimetypeComponentTest.java
Log:
Fix test to run in ECM..
Revision Changes Path
1.2 +7 -7
jakarta-turbine-2/src/test/org/apache/turbine/services/mimetype/FulcrumMimetypeComponentTest.java
Index: FulcrumMimetypeComponentTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/mimetype/FulcrumMimetypeComponentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FulcrumMimetypeComponentTest.java 19 Nov 2003 14:10:41 -0000 1.1
+++ FulcrumMimetypeComponentTest.java 24 Nov 2004 17:22:07 -0000 1.2
@@ -58,7 +58,7 @@
import org.apache.fulcrum.mimetype.MimeTypeService;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.util.TurbineConfig;
/**
@@ -76,11 +76,11 @@
}
public void testComponent() throws Exception
{
- MerlinComponentService merlin =
- (MerlinComponentService)
TurbineServices.getInstance().getService(
- MerlinComponentService.SERVICE_NAME);
- MimeTypeService mimeTypeService =
- (MimeTypeService) merlin.lookup("/fulcrum/mimetype");
+ AvalonComponentService acs =
+ (AvalonComponentService)
TurbineServices.getInstance().getService(
+ AvalonComponentService.SERVICE_NAME);
+ MimeTypeService mimeTypeService = (MimeTypeService)
acs.lookup(MimeTypeService.class.getName());
+
Locale locale = new Locale("en", "US");
String s = mimeTypeService.getCharSet(locale);
assertEquals("ISO-8859-1", s);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
