Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed flaky test

Browse Source 
Change-Id: I88a39a8eb4fd6da6dc5b156aa475330299ffb9b9
Fixes: 62568528
Test: runtest systemui
This commit is contained in:
Lucas Dupin
2017-06-13 10:47:15 -07:00
parent c02e6c396e
commit 1cd133a4d0
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
View File

@@ -18,32 +18,35 @@ package com.android.systemui.colorextraction;
import static org.junit.Assert.assertEquals;
import android.app.WallpaperColors;
import android.app.WallpaperManager;
import android.graphics.Color;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import com.android.systemui.SysuiTestCase;
import com.google.android.colorextraction.ColorExtractor;
import com.google.android.colorextraction.types.Tonal;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.List;
/**
* Tests color extraction generation.
*/
@Ignore
@SmallTest
@RunWith(AndroidJUnit4.class)
public class SysuiColorExtractorTests extends SysuiTestCase {
private static int[] sWhich = new int[] {
private static int[] sWhich = new int[]{
WallpaperManager.FLAG_SYSTEM,
WallpaperManager.FLAG_LOCK};
private static int[] sTypes = new int[] {
private static int[] sTypes = new int[]{
ColorExtractor.TYPE_NORMAL,
ColorExtractor.TYPE_DARK,
ColorExtractor.TYPE_EXTRA_DARK};
@@ -55,6 +58,7 @@ public class SysuiColorExtractorTests extends SysuiTestCase {
fallbackColors.setSecondaryColor(ColorExtractor.FALLBACK_COLOR);
SysuiColorExtractor extractor = new SysuiColorExtractor(getContext(), new Tonal(), false);
simulateEvent(extractor);
extractor.setWallpaperVisible(false);
for (int which : sWhich) {
@@ -79,6 +83,7 @@ public class SysuiColorExtractorTests extends SysuiTestCase {
outGradientColorsExtraDark.set(colors);
return true;
}, false);
simulateEvent(extractor);
extractor.setWallpaperVisible(true);
for (int which : sWhich) {
@@ -88,4 +93,12 @@ public class SysuiColorExtractorTests extends SysuiTestCase {
}
}
}
}
private void simulateEvent(SysuiColorExtractor extractor) {
// Let's fake a color event
List<Pair<Color, Integer>> dummyColors = new ArrayList<>();
dummyColors.add(new Pair<>(Color.valueOf(Color.BLACK), 1));
extractor.onColorsChanged(new WallpaperColors(dummyColors),
WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
}
}