Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebbb02c4 authored by Tobias Thierer's avatar Tobias Thierer
Browse files

Inline calls to MimeUtils, step 2. 

CL http://r.android.com/952541 (commit bf56d87d)
inlined a call to MimeUtils in DocumentsUI but missed ones in tests.
This CL inlines the test uses.

Test: Treehugger together with http://r.android.com/952542
Bug: 120171727
Change-Id: I91d45e6cac72ac753963d5f4dd2ba2a72054a094
Merged-In: If62ee1a628feb909cd7b30ecf6e61f6845112d82
parent bf56d87d

tests/common/com/android/documentsui/testing/TestModel.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.documentsui.base.DocumentInfo; 
import com.android.documentsui.base.Features;

import com.android.documentsui.roots.RootCursorWrapper;



import libcore.net.MimeUtils;

import libcore.net.MimeMap;



import java.util.Random;
@@ -130,7 +130,7 @@ public class TestModel extends Model { 


        while(i != -1) {

            name = name.substring(i + 1);

            String type = MimeUtils.guessMimeTypeFromExtension(name);

            String type = MimeMap.getDefault().guessMimeTypeFromExtension(name);

            if (type != null) {

                return type;

            }

tests/unit/com/android/documentsui/FileTypeMapTest.java

+3 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.support.test.InstrumentationRegistry; 
import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;



import libcore.net.MimeUtils;

import libcore.net.MimeMap;



import org.junit.Before;

import org.junit.Test;
@@ -112,7 +112,8 @@ public class FileTypeMapTest { 
    }



    private String getExtensionTypeFromMime(@StringRes int formatStringId, String mime) {

        final String extension = MimeUtils.guessExtensionFromMimeType(mime).toUpperCase();

        MimeMap mimeMap = MimeMap.getDefault();

        final String extension = mimeMap.guessExtensionFromMimeType(mime).toUpperCase();

        return getExtensionTypeFromExtension(formatStringId, extension);

    }