This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.commons.contentdetection-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-contentdetection.git
commit cc7c9078925443b4fe9ef97df1e97a53931f7bd7 Author: Bertrand Delacretaz <[email protected]> AuthorDate: Mon Jun 1 09:18:59 2015 +0000 SLING-4757 - new tests for commons.contentdetection, contributed by Petr Shypila, thanks! git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/contentdetection@1682844 13f79535-47bb-0310-9956-ffa450edef68 --- .../ContentAwareMimeTypeServiceImplTest.java | 66 +++++++++++++++++++++- .../internal/FileNameExtractorImplTest.java | 26 ++++++++- 2 files changed, 87 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java b/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java index ece1156..6a31bb1 100644 --- a/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java +++ b/src/test/java/org/apache/sling/commons/contentdetection/internal/ContentAwareMimeTypeServiceImplTest.java @@ -44,8 +44,6 @@ public class ContentAwareMimeTypeServiceImplTest extends EasyMockSupport { private Detector mockDetector = EasyMock.createMock(Detector.class); - private Metadata mockMetadata = EasyMock.createMock(Metadata.class); - private MimeTypeService mockMimeTypeService = EasyMock.createMock(MimeTypeService.class); @TestSubject @@ -87,6 +85,32 @@ public class ContentAwareMimeTypeServiceImplTest extends EasyMockSupport { } @Test + public void testGetMimeTypeByString(){ + String mimeTypeName = "testName"; + String mimetype = "mimeType"; + + EasyMock.expect(mockMimeTypeService.getMimeType(mimeTypeName)).andReturn(mimetype); + EasyMock.replay(mockMimeTypeService); + + String another = contentAwareMimeTypeService.getMimeType(mimeTypeName); + Assert.assertEquals(mimetype, another); + EasyMock.verify(mockMimeTypeService); + } + + @Test + public void testGetExtension(){ + String mimeTypeName = "testName"; + String extension = "java"; + + EasyMock.expect(mockMimeTypeService.getExtension(mimeTypeName)).andReturn(extension); + EasyMock.replay(mockMimeTypeService); + + String another = contentAwareMimeTypeService.getExtension(mimeTypeName); + Assert.assertEquals(extension, another); + EasyMock.verify(mockMimeTypeService); + } + + @Test public void testGetMimeTypeWithNullContent() throws IOException { //Initializations String filename = "test.txt"; @@ -106,7 +130,43 @@ public class ContentAwareMimeTypeServiceImplTest extends EasyMockSupport { EasyMock.verify(mockMimeTypeService); } + @Test + public void testRegisterNewMymeType() { + final String mimeTypeName = "test"; + final String[] mimeTypeExtensions = new String[]{"pict", "apt", "z"}; + + /* The only thing ContentAwareMimeTypeServiceImpl#registerMimeType(String name, String... ext) + * method does is calls MimeTypeService registerMimeType(String name, String[] ext) method. + * So we Mock it and expect that it will be called. + */ + mockMimeTypeService.registerMimeType(mimeTypeName, mimeTypeExtensions); + EasyMock.expectLastCall(); + EasyMock.replay(mockMimeTypeService); + + contentAwareMimeTypeService.registerMimeType(mimeTypeName, mimeTypeExtensions); + + EasyMock.verify(mockMimeTypeService); + } + + @Test + public void testRegisterMimeType() throws IOException { + byte[] byteArray = new byte[]{}; + InputStream content = new ByteArrayInputStream(byteArray); + + /* The only thing ContentAwareMimeTypeServiceImpl#registerMimeType(InputStream i) + * method does is calls MimeTypeService#registerMimeType(InputStream i) method. + * So we Mock it and expect that it will be called. + */ + mockMimeTypeService.registerMimeType(content); + EasyMock.expectLastCall(); + EasyMock.replay(mockMimeTypeService); + + contentAwareMimeTypeService.registerMimeType(content); + + EasyMock.verify(mockMimeTypeService); + } + @After public void tearDown() { } -} +} \ No newline at end of file diff --git a/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java b/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java index c00cb5a..b7d9f6e 100644 --- a/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java +++ b/src/test/java/org/apache/sling/commons/contentdetection/internal/FileNameExtractorImplTest.java @@ -17,17 +17,39 @@ package org.apache.sling.commons.contentdetection.internal; -import junit.framework.TestCase; import org.apache.sling.commons.contentdetection.FileNameExtractor; import org.junit.Assert; +import org.junit.Test; -public class FileNameExtractorImplTest extends TestCase { +public class FileNameExtractorImplTest { FileNameExtractor fileNameExtractor = new FileNameExtractorImpl(); + @Test public void testExtract() throws Exception { String rawPath = "http://midches.com/images/uploads/default/demo.jpg#anchor?query=test";; String expectedFileName = "demo.jpg"; Assert.assertEquals(expectedFileName, fileNameExtractor.extract(rawPath)); } + + @Test + public void testExtractForBackslash() throws Exception { + String rawPath = "C:\\Test windows%path\\demo.jpg"; + String expectedFileName = "demo.jpg"; + Assert.assertEquals(expectedFileName, fileNameExtractor.extract(rawPath)); + } + + @Test + public void testBackslashPath() throws Exception { + String rawPath = "C:\\Test windows%path\\demo.jpg"; + String expectedFileName = "demo.jpg"; + Assert.assertEquals(expectedFileName, fileNameExtractor.extract(rawPath)); + } + + @Test + public void testDecodedURL(){ + String rawPath = "http://example.com/demo%20test.jpg?test=true";; + String expectedFileName = "demo test.jpg"; + Assert.assertEquals(expectedFileName, fileNameExtractor.extract(rawPath)); + } } \ No newline at end of file -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
![http://midches.com/images/uploads/default/demo.jpg#anchor?query=test"](http://midches.com/images/uploads/default/demo.jpg#anchor?query=test"){kind=link}
![http://example.com/demo%20test.jpg?test=true"](http://example.com/demo%20test.jpg?test=true"){kind=link}