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

Commit 8c5a24d1 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove dependency on com.google.android.collect classes 

In preparation for building android.legacy.test library against
the SDK this removes a dependency on internal classes.

Bug: 30188076
Test: make checkbuild
Change-Id: I9ea3827ab5db167c8cbddad25f0815c942681092
parent 9588b607

test-runner/src/android/test/AndroidTestRunner.java

+4 −4
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ import android.app.Instrumentation; 
import android.content.Context;

import android.os.PerformanceCollector.PerformanceResultsWriter;



import com.google.android.collect.Lists;



import java.util.ArrayList;

import junit.framework.Test;

import junit.framework.TestCase;

import junit.framework.TestListener;
@@ -48,7 +47,7 @@ public class AndroidTestRunner extends BaseTestRunner { 
    private Context mContext;

    private boolean mSkipExecution = false;



    private List<TestListener> mTestListeners = Lists.newArrayList();

    private List<TestListener> mTestListeners = new ArrayList<>();

    private Instrumentation mInstrumentation;

    private PerformanceResultsWriter mPerfWriter;
@@ -58,7 +57,8 @@ public class AndroidTestRunner extends BaseTestRunner { 


        if (shouldRunSingleTestMethod(testMethodName, testClass)) {

            TestCase testCase = buildSingleTestMethod(testClass, testMethodName);

            mTestCases = Lists.newArrayList(testCase);

            mTestCases = new ArrayList<>();

            mTestCases.add(testCase);

            mTestClassName = testClass.getSimpleName();

        } else {

            setTest(getTest(testClass), testClass);

test-runner/src/android/test/ClassPathPackageInfo.java

+3 −4
Original line number Diff line number Diff line
@@ -16,9 +16,8 @@ 


package android.test;



import com.google.android.collect.Sets;



import java.util.Collections;

import java.util.HashSet;

import java.util.Set;



/**
@@ -44,7 +43,7 @@ public class ClassPathPackageInfo { 
    }



    public Set<ClassPathPackageInfo> getSubpackages() {

        Set<ClassPathPackageInfo> info = Sets.newHashSet();

        Set<ClassPathPackageInfo> info = new HashSet<>();

        for (String name : subpackageNames) {

            info.add(source.getPackageInfo(name));

        }
@@ -52,7 +51,7 @@ public class ClassPathPackageInfo { 
    }



    public Set<Class<?>> getTopLevelClassesRecursive() {

        Set<Class<?>> set = Sets.newHashSet();

        Set<Class<?>> set = new HashSet<>();

        addTopLevelClassesTo(set);

        return set;

    }

test-runner/src/android/test/ClassPathPackageInfoSource.java

+5 −5
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
package android.test;



import android.util.Log;

import com.google.android.collect.Maps;

import com.google.android.collect.Sets;

import dalvik.system.DexFile;



import java.io.File;

import java.io.IOException;

import java.util.Enumeration;

import java.util.HashMap;

import java.util.HashSet;

import java.util.Map;

import java.util.Set;

import java.util.TreeSet;
@@ -57,7 +57,7 @@ public class ClassPathPackageInfoSource { 
    private static String[] apkPaths;



    // A cache of jar file contents

    private final Map<File, Set<String>> jarFiles = Maps.newHashMap();

    private final Map<File, Set<String>> jarFiles = new HashMap<>();

    private ClassLoader classLoader;



    ClassPathPackageInfoSource() {
@@ -76,7 +76,7 @@ public class ClassPathPackageInfoSource { 
    private ClassPathPackageInfo createPackageInfo(String packageName) {

        Set<String> subpackageNames = new TreeSet<String>();

        Set<String> classNames = new TreeSet<String>();

        Set<Class<?>> topLevelClasses = Sets.newHashSet();

        Set<Class<?>> topLevelClasses = new HashSet<>();

        findClasses(packageName, classNames, subpackageNames);

        for (String className : classNames) {

            if (className.endsWith(".R") || className.endsWith(".Manifest")) {
@@ -248,7 +248,7 @@ public class ClassPathPackageInfoSource { 
            throws IOException {

        Set<String> entryNames = jarFiles.get(jarFile);

        if (entryNames == null) {

            entryNames = Sets.newHashSet();

            entryNames = new HashSet<>();

            ZipFile zipFile = new ZipFile(jarFile);

            Enumeration<? extends ZipEntry> entries = zipFile.entries();

            while (entries.hasMoreElements()) {

test-runner/src/android/test/DatabaseTestUtils.java

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


package android.test;



import com.google.android.collect.Sets;



import android.database.sqlite.SQLiteDatabase;

import android.database.Cursor;



import java.util.HashSet;

import java.util.Set;



/**
@@ -42,7 +41,7 @@ public class DatabaseTestUtils { 
    }



    private static Set<String> getSchemaSet(SQLiteDatabase db) {

        Set<String> schemaSet = Sets.newHashSet();

        Set<String> schemaSet = new HashSet<>();



        Cursor entityCursor = db.rawQuery("SELECT sql FROM sqlite_master", null);

        try {

test-runner/src/android/test/IsolatedContext.java

+3 −4
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.test;



import com.google.android.collect.Lists;



import android.accounts.AccountManager;

import android.accounts.AccountManagerCallback;

import android.accounts.AccountManagerFuture;
@@ -38,6 +36,7 @@ import android.os.Handler; 


import java.io.File;

import java.io.IOException;

import java.util.ArrayList;

import java.util.concurrent.TimeUnit;

import java.util.List;
@@ -55,7 +54,7 @@ public class IsolatedContext extends ContextWrapper { 
    private ContentResolver mResolver;

    private final MockAccountManager mMockAccountManager;



    private List<Intent> mBroadcastIntents = Lists.newArrayList();

    private List<Intent> mBroadcastIntents = new ArrayList<>();



    public IsolatedContext(

            ContentResolver resolver, Context targetContext) {
@@ -67,7 +66,7 @@ public class IsolatedContext extends ContextWrapper { 
    /** Returns the list of intents that were broadcast since the last call to this method. */

    public List<Intent> getAndClearBroadcastIntents() {

        List<Intent> intents = mBroadcastIntents;

        mBroadcastIntents = Lists.newArrayList();

        mBroadcastIntents = new ArrayList<>();

        return intents;

    }