You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:22:57 UTC

[sling-org-apache-sling-commons-mime] 22/47: SLING-305 - APT default servlet and related tests

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.commons.mime-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-mime.git

commit fac9f3b49304e0afc728df68105d2369a229b5b7
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Mar 4 15:17:03 2008 +0000

    SLING-305 - APT default servlet and related tests
    
    git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/commons/mime@633511 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/resources/META-INF/mime.types             |  2 +-
 .../mime/internal/MimeTypeServiceImplTest.java     | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/META-INF/mime.types b/src/main/resources/META-INF/mime.types
index 47f77c8..77ec120 100644
--- a/src/main/resources/META-INF/mime.types
+++ b/src/main/resources/META-INF/mime.types
@@ -98,7 +98,7 @@ model/vrml                     vrml wrl
 text/any                       any
 text/css                       css
 text/html                      html htm
-text/plain                     txt asc log text
+text/plain                     txt asc log text apt
 text/richtext                  rtx
 text/rtf                       rtf
 text/sgml                      sgml sgm
diff --git a/src/test/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImplTest.java b/src/test/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImplTest.java
index f621cd3..a4b6db3 100644
--- a/src/test/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImplTest.java
+++ b/src/test/java/org/apache/sling/commons/mime/internal/MimeTypeServiceImplTest.java
@@ -39,6 +39,8 @@ public class MimeTypeServiceImplTest extends TestCase {
 
     private static final String TXT = "txt";
 
+    private static final String APT = "apt";
+
     private static final String TEXT_PLAIN = "text/plain";
 
     private MimeTypeServiceImpl service;
@@ -65,12 +67,13 @@ public class MimeTypeServiceImplTest extends TestCase {
 
     public void testTxtMapping() throws Exception {
 
-        this.service.registerMimeType(TEXT_PLAIN, TXT, LOG);
+        this.service.registerMimeType(TEXT_PLAIN, TXT, LOG, APT);
 
-        assertEquals(TEXT_PLAIN, this.service.getMimeType("file." + TXT));
-        assertEquals(TEXT_PLAIN, this.service.getMimeType(TXT));
-        assertEquals(TEXT_PLAIN, this.service.getMimeType("file." + LOG));
-        assertEquals(TEXT_PLAIN, this.service.getMimeType(LOG));
+        final String [] exts = { TXT, LOG, APT };
+        for(String ext : exts) {
+            assertEquals("Extension " + ext + " (1)", TEXT_PLAIN, this.service.getMimeType("file." + ext));
+            assertEquals("Extension " + ext + " (2)", TEXT_PLAIN, this.service.getMimeType(ext));
+        }
 
         assertEquals(TEXT_PLAIN,
             this.service.getMimeType(("file." + TXT).toUpperCase()));
@@ -91,10 +94,11 @@ public class MimeTypeServiceImplTest extends TestCase {
         try {
             this.service.registerMimeType(ins);
 
-            assertEquals(TEXT_PLAIN, this.service.getMimeType("file." + TXT));
-            assertEquals(TEXT_PLAIN, this.service.getMimeType(TXT));
-            assertEquals(TEXT_PLAIN, this.service.getMimeType("file." + LOG));
-            assertEquals(TEXT_PLAIN, this.service.getMimeType(LOG));
+            final String [] exts = { TXT, LOG, APT };
+            for(String ext : exts) {
+                assertEquals("Extension " + ext + " (1)", TEXT_PLAIN, this.service.getMimeType("file." + ext));
+                assertEquals("Extension " + ext + " (2)", TEXT_PLAIN, this.service.getMimeType(ext));
+            }
 
             assertEquals(TEXT_PLAIN,
                 this.service.getMimeType(("file." + TXT).toUpperCase()));

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.