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

Commit 4605635a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Skip some tests prevent affecting build and test health""

parents b2b46082 1786ace0

tests/unit/com/android/documentsui/sorting/SortDimensionTest.java

+2 −4
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import androidx.test.runner.AndroidJUnit4; 
import com.android.documentsui.R;

import com.android.documentsui.sorting.SortDimension.SortCapability;

import com.android.documentsui.sorting.SortDimension.SortDirection;

//import com.android.documentsui.testing.Parcelables;

import com.android.documentsui.testing.Parcelables;



import org.junit.Before;

import org.junit.Test;
@@ -83,10 +83,8 @@ public class SortDimensionTest { 
        mDimension.mSortDirection = DEFAULT_DIRECTION;

        assertEquals(ALTERNATIVE_DIRECTION, mDimension.getNextDirection());

    }



    /* ToDo Add it back after found solution

    @Test

    public void testParceling() {

        Parcelables.assertParcelable(mDimension, 0);

    } */

    }

}

tests/unit/com/android/documentsui/sorting/SortModelTest.java

+2 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import androidx.test.runner.AndroidJUnit4; 
import com.android.documentsui.R;

import com.android.documentsui.sorting.SortModel.UpdateListener;

import com.android.documentsui.sorting.SortModel.UpdateType;

//import com.android.documentsui.testing.Parcelables;

import com.android.documentsui.testing.Parcelables;



import org.junit.Before;

import org.junit.Test;
@@ -206,7 +206,6 @@ public class SortModelTest { 
        }

    }



    /* ToDo Add it back after found solution

    @Test

    public void testParceling() {

        mModel.setDefaultDimension(DIMENSION_1.getId());
@@ -219,7 +218,7 @@ public class SortModelTest { 
    @Test

    public void testParceling_NoSortedDimension() {

        Parcelables.assertParcelable(mModel, 0);

    } */

    }



    private @Nullable SortDimension getSortedDimension() {

        final int sortedDimensionId = mModel.getSortedDimensionId();

tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java

+1 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public class DarkThemeUiTest extends ThemeUiTestBase { 
        mTheme = getThemeByUiMode(mTargetContext, Configuration.UI_MODE_NIGHT_YES);

    }



    /* ToDo Add it back after found solution

    @Test

    public void themeNightModeEnable_actionBarColorShouldBeDark() {

        assertTheme(R.styleable.ActionBarView, R.styleable.ActionBarView_android_colorBackground,
@@ -86,7 +85,7 @@ public class DarkThemeUiTest extends ThemeUiTestBase { 
    public void themeNightModeEnable_statusBarColorShouldBeDark() {

        assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,

                mTheme.getResources().getColor(R.color.app_background_color, mTheme));

    } */

    }



    @Test

    public void appCompatThemeNightModeEnable_colorPrimaryShouldBeThemeable() {

tests/unit/com/android/documentsui/ui/ThemeUiTest.java

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.documentsui.ui;



import android.content.res.Configuration;

//import android.graphics.Color;

import android.graphics.Color;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -42,7 +42,6 @@ public class ThemeUiTest extends ThemeUiTestBase { 
        mTheme = getThemeByUiMode(mTargetContext, Configuration.UI_MODE_NIGHT_NO);

    }



    /* ToDo Add it back after found solution

    @Test

    public void themeNightModeDisable_actionBarColorShouldBeLight() {

        assertTheme(R.styleable.ActionBarView, R.styleable.ActionBarView_android_colorBackground,
@@ -83,7 +82,7 @@ public class ThemeUiTest extends ThemeUiTestBase { 
    public void themeNightModeDisable_statusBarColorShouldBeLight() {

        assertTheme(R.styleable.SystemWindow, R.styleable.SystemWindow_android_statusBarColor,

                Color.WHITE);

    } */

    }



    @Test

    public void appCompatThemeNightModeDisable_colorPrimaryShouldBeThemeable() {