Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

Commit 7af9a64

Browse files
author
Emmanuel Hugonnet
committed
Fixes the bug #60 : mime type is case sensitive for file extension
git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@343 a8e77078-a1c7-4fa5-b8fc-53c5178a176c
1 parent 4013de7 commit 7af9a64

File tree

2 files changed

+42
-2
lines changed

2 files changed

+42
-2
lines changed

src/main/java/com/silverpeas/openoffice/Launcher.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ public static void main(String[] args) throws OfficeNotFoundException {
8989
}
9090
}
9191

92-
private static MsOfficeType getContentType(String url)
92+
protected static MsOfficeType getContentType(String url)
9393
throws MalformedURLException {
9494
String fileName = new URL(url).getFile();
95-
String contentType = mimeTypes.getContentType(fileName);
95+
String contentType = mimeTypes.getContentType(fileName.toLowerCase());
9696
return MsOfficeType.valueOfMimeType(contentType);
9797
}
9898
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* To change this template, choose Tools | Templates
3+
* and open the template in the editor.
4+
*/
5+
package com.silverpeas.openoffice;
6+
7+
import com.silverpeas.openoffice.util.MsOfficeType;
8+
import org.junit.Test;
9+
import static junit.framework.Assert.*;
10+
11+
/**
12+
*
13+
* @author ehugonnet
14+
*/
15+
public class MimeTypesTest {
16+
17+
@Test
18+
public void testMsDoc() throws Exception {
19+
assertEquals(MsOfficeType.WORD, Launcher.getContentType("file:///HelloWorld.doc"));
20+
assertEquals(MsOfficeType.WORD, Launcher.getContentType("file:///HelloWorld.DOC"));
21+
assertEquals(MsOfficeType.WORD, Launcher.getContentType("file:///hello world.doc"));
22+
assertEquals(MsOfficeType.WORD, Launcher.getContentType("file:///HelloWorld.dOcx"));
23+
assertEquals(MsOfficeType.WORD, Launcher.getContentType("file:///HelloWorld.docm"));
24+
}
25+
26+
@Test
27+
public void testMsExcel() throws Exception {
28+
assertEquals(MsOfficeType.EXCEL, Launcher.getContentType("file:///HelloWorld.xls"));
29+
assertEquals(MsOfficeType.EXCEL, Launcher.getContentType("file:///HelloWorld.XLS"));
30+
assertEquals(MsOfficeType.EXCEL, Launcher.getContentType("file:///hello world.xls"));
31+
assertEquals(MsOfficeType.EXCEL, Launcher.getContentType("file:///HelloWorld.xLsx"));
32+
}
33+
34+
@Test
35+
public void testMsPowerpoint() throws Exception {
36+
assertEquals(MsOfficeType.POWERPOINT, Launcher.getContentType("file:///HelloWorld.ppt"));
37+
assertEquals(MsOfficeType.POWERPOINT, Launcher.getContentType("file:///HelloWorld.PPT"));
38+
assertEquals(MsOfficeType.POWERPOINT, Launcher.getContentType("file:///hello world.PPtx"));
39+
}
40+
}

0 commit comments

Comments
 (0)