Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3171)

Unified Diff: chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java

Issue 2007553005: Remove flaky assertion in DexLoaderTest#testPreviouslyLoadedFromLocalDataDir (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
diff --git a/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java b/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
index 024483d42550e79b03109a4afcf2ab3807bb4365..1e77656b4ab66fced3d13a2deb9f8088f3a7bf47 100644
--- a/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
+++ b/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
@@ -18,7 +18,6 @@ import android.test.suitebuilder.annotation.MediumTest;
import dalvik.system.DexFile;
import org.chromium.base.FileUtils;
-import org.chromium.base.test.util.FlakyTest;
import org.chromium.content.browser.test.util.CallbackHelper;
import org.chromium.webapk.shell_apk.test.dex_optimizer.IDexOptimizerService;
@@ -26,6 +25,9 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+/**
+ * Tests for {@link DexLoader}.
+ */
public class DexLoaderTest extends InstrumentationTestCase {
/**
* Package of APK to load dex file from and package which provides DexOptimizerService.
@@ -177,9 +179,8 @@ public class DexLoaderTest extends InstrumentationTestCase {
/**
* Test that {@link DexLoader#load()} does not extract the dex file from the APK if the dex file
* was extracted in a previous call to {@link DexLoader#load()}
- * @MediumTest
*/
- @FlakyTest(message = "crbug.com/613116")
+ @MediumTest
public void testPreviouslyLoadedFromLocalDataDir() {
assertTrue(mLocalDexDir.mkdir());
@@ -210,8 +211,7 @@ public class DexLoaderTest extends InstrumentationTestCase {
assertNotNull(loader);
assertTrue(canLoadCanaryClass(loader));
- // We should not have modified any files and have used the already extracted dex file.
- assertTrue(localDexDirMonitor.mReadPaths.contains(DEX_ASSET_NAME));
+ // We should not have modified any files.
assertTrue(localDexDirMonitor.mModifiedPaths.isEmpty());
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698