commit 53ea013e41bf673c5a0d7913896c2fd45541e848
author gitbuildkicker <android-build@google.com> Tue Jan 24 10:01:45 2017 -0800
committer gitbuildkicker <android-build@google.com> Tue Jan 24 10:01:45 2017 -0800
tree 71cb4a5b1837e9c03b041fc99a497f8fa5521b7d
parent 6678d3147a102a86d7f27c3e9f765b530bea3d53
parent 15a9d5ee0c7c9666a02f6af6e5f6f368d281d6e1

merge in nougat-cts-release history after reset to nougat-cts-dev

tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java

diff --git a/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java b/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
index 24040b4..04c3900 100644
--- a/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
+++ b/tests/tests/mediastress/preconditions/tests/src/android/mediastress/cts/preconditions/MediaPreparerTest.java
@@ -48,8 +48,8 @@
                 "/sdcard").once();
         EasyMock.replay(mMockDevice);
         mMediaPreparer.setMountPoint(mMockDevice);
-        assertEquals(mMediaPreparer.baseDeviceShortDir, "/sdcard/test/bbb_short/");
-        assertEquals(mMediaPreparer.baseDeviceFullDir, "/sdcard/test/bbb_full/");
+        assertEquals(mMediaPreparer.mBaseDeviceShortDir, "/sdcard/test/bbb_short/");
+        assertEquals(mMediaPreparer.mBaseDeviceFullDir, "/sdcard/test/bbb_full/");
     }
 
     public void testCopyMediaFiles() throws Exception {