Enable version-compat-test with previous released version
Bug: 134372941
Test: ./media2/session/version-compat-tests/runtest.sh 4
Change-Id: I0e50ae3c676710b9b509550d55defbfc74de4a72
diff --git a/media/version-compat-tests/runtest.sh b/media/version-compat-tests/runtest.sh
index f6321ea..7084c42 100755
--- a/media/version-compat-tests/runtest.sh
+++ b/media/version-compat-tests/runtest.sh
@@ -56,8 +56,8 @@
./gradlew $SERVICE_MODULE_NAME:assembleDebugAndroidTest || { echo "Build failed. Aborting."; exit 1; }
echo "Installing the test apks"
- adb $DEVICE_SERIAL install -r "../../out/dist/$CLIENT_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
- adb $DEVICE_SERIAL install -r "../../out/dist/$SERVICE_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
+ adb $DEVICE_SERIAL install -r "../../out/dist/apks/$CLIENT_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
+ adb $DEVICE_SERIAL install -r "../../out/dist/apks/$SERVICE_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
echo "Running the tests"
local test_command="adb $DEVICE_SERIAL shell am instrument -w -e debug false -e client_version $CLIENT_VERSION -e service_version $SERVICE_VERSION"
diff --git a/media2/session/version-compat-tests/previous/client/build.gradle b/media2/session/version-compat-tests/previous/client/build.gradle
index e116b94..b36a3c0 100644
--- a/media2/session/version-compat-tests/previous/client/build.gradle
+++ b/media2/session/version-compat-tests/previous/client/build.gradle
@@ -22,7 +22,7 @@
}
dependencies {
- androidTestImplementation(project(":media2:media2-session"))
+ androidTestImplementation("androidx.media2:media2-session:1.0.0-beta02")
androidTestImplementation(project(":support-media2-test-common"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/media2/session/version-compat-tests/previous/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java b/media2/session/version-compat-tests/previous/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
index e37fc04..adbc5e7 100644
--- a/media2/session/version-compat-tests/previous/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
+++ b/media2/session/version-compat-tests/previous/client/src/androidTest/java/androidx/media2/test/client/tests/MediaControllerCallbackTest.java
@@ -942,41 +942,6 @@
assertTrue(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
}
- @Test
- public void testOnSubtitleData() throws InterruptedException {
- prepareLooper();
-
- MediaFormat format = new MediaFormat();
- format.setString(MediaFormat.KEY_LANGUAGE, "und");
- format.setString(MediaFormat.KEY_MIME, SubtitleData.MIMETYPE_TEXT_CEA_608);
- MediaMetadata metadata = new MediaMetadata.Builder()
- .putString(MediaMetadata.METADATA_KEY_MEDIA_ID, "onSubtitleData").build();
- final MediaItem testItem = new MediaItem.Builder().setMetadata(metadata).build();
- final TrackInfo testTrack = new TrackInfo(1, testItem, TrackInfo.MEDIA_TRACK_TYPE_SUBTITLE,
- format);
- final SubtitleData testData = new SubtitleData(123, 456,
- new byte[] { 7, 8, 9, 0, 1, 2, 3, 4, 5, 6 });
-
- final CountDownLatch latch = new CountDownLatch(1);
- final MediaController.ControllerCallback callback =
- new MediaController.ControllerCallback() {
- @Override
- public void onSubtitleData(@NonNull MediaController controller,
- @NonNull MediaItem item, @NonNull TrackInfo track,
- @NonNull SubtitleData data) {
- MediaTestUtils.assertMediaIdEquals(testItem, item);
- assertEquals(testTrack, track);
- assertEquals(testData, data);
- latch.countDown();
- }
- };
-
- MediaController controller = createController(mRemoteSession2.getToken(), true, null,
- callback);
- mRemoteSession2.getMockPlayer().notifySubtitleData(testItem, testTrack, testData);
- assertTrue(latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
- }
-
private void testControllerAfterSessionIsClosed(String id) throws InterruptedException {
// This cause session service to be died.
mRemoteSession2.close();
diff --git a/media2/session/version-compat-tests/previous/service/build.gradle b/media2/session/version-compat-tests/previous/service/build.gradle
index 339fe7f..cb5a4cf 100644
--- a/media2/session/version-compat-tests/previous/service/build.gradle
+++ b/media2/session/version-compat-tests/previous/service/build.gradle
@@ -22,7 +22,7 @@
}
dependencies {
- androidTestImplementation(project(":media2:media2-session"))
+ androidTestImplementation("androidx.media2:media2-session:1.0.0-beta02")
androidTestImplementation(project(":support-media2-test-common"))
androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
diff --git a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockPlayer.java b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockPlayer.java
index ffb892d..99e05ba 100644
--- a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockPlayer.java
+++ b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockPlayer.java
@@ -20,6 +20,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.concurrent.ListenableFuture;
import androidx.core.util.Pair;
import androidx.media.AudioAttributesCompat;
import androidx.media2.common.MediaItem;
@@ -28,8 +29,6 @@
import androidx.media2.common.SubtitleData;
import androidx.media2.common.VideoSize;
-import com.google.common.util.concurrent.ListenableFuture;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
diff --git a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockRemotePlayer.java b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockRemotePlayer.java
index c0109ee..c97b2e9 100644
--- a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockRemotePlayer.java
+++ b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/MockRemotePlayer.java
@@ -16,13 +16,12 @@
package androidx.media2.test.service;
+import androidx.concurrent.ListenableFuture;
import androidx.media.AudioAttributesCompat;
import androidx.media2.common.MediaItem;
import androidx.media2.common.MediaMetadata;
import androidx.media2.session.RemoteSessionPlayer;
-import com.google.common.util.concurrent.ListenableFuture;
-
import java.util.List;
import java.util.concurrent.CountDownLatch;
diff --git a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/SyncListenableFuture.java b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/SyncListenableFuture.java
index d081002..9222cb2 100644
--- a/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/SyncListenableFuture.java
+++ b/media2/session/version-compat-tests/previous/service/src/androidTest/java/androidx/media2/test/service/SyncListenableFuture.java
@@ -18,11 +18,10 @@
import static androidx.media2.common.SessionPlayer.PlayerResult.RESULT_SUCCESS;
+import androidx.concurrent.ListenableFuture;
import androidx.media2.common.MediaItem;
import androidx.media2.common.SessionPlayer;
-import com.google.common.util.concurrent.ListenableFuture;
-
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.TimeUnit;
diff --git a/media2/session/version-compat-tests/runtest.sh b/media2/session/version-compat-tests/runtest.sh
index b015445..e0d7b53 100755
--- a/media2/session/version-compat-tests/runtest.sh
+++ b/media2/session/version-compat-tests/runtest.sh
@@ -36,10 +36,9 @@
echo ""
echo "Version combination number:"
echo " 1. Client-ToT / Service-ToT"
-# TODO: These will be supported when stable version of media2 is released.
-# echo " 2. Client-ToT / Service-Latest release"
-# echo " 3. Client-Latest release / Service-ToT"
-# echo " 4. Run all of the above"
+ echo " 2. Client-ToT / Service-Latest release"
+ echo " 3. Client-Latest release / Service-ToT"
+ echo " 4. Run all of the above"
echo ""
echo "Option:"
echo " -t <class/method>: Only run the specific test class/method."
@@ -57,8 +56,8 @@
./gradlew $SERVICE_MODULE_NAME:assembleDebugAndroidTest || { echo "Build failed. Aborting."; exit 1; }
echo "Installing the test apks"
- adb $DEVICE_SERIAL install -r "../../out/dist/$CLIENT_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
- adb $DEVICE_SERIAL install -r "../../out/dist/$SERVICE_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
+ adb $DEVICE_SERIAL install -r "../../out/dist/apks/$CLIENT_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
+ adb $DEVICE_SERIAL install -r "../../out/dist/apks/$SERVICE_MODULE_NAME.apk" || { echo "Apk installation failed. Aborting."; exit 1; }
echo "Running the tests"
local test_command="adb $DEVICE_SERIAL shell am instrument -w -e debug false -e client_version $CLIENT_VERSION -e service_version $SERVICE_VERSION"
@@ -90,7 +89,7 @@
fi
case ${1} in
- 1)
+ 1|2|3|4)
VERSION_COMBINATION=${1}
shift
;;
@@ -127,28 +126,27 @@
SERVICE_VERSION="tot"
runTest
;;
-# TODO: These will be supported when stable version of media2 is released.
-# 2)
-# CLIENT_VERSION="tot"
-# SERVICE_VERSION="previous"
-# runTest
-# ;;
-# 3)
-# CLIENT_VERSION="previous"
-# SERVICE_VERSION="tot"
-# runTest
-# ;;
-# 4)
-# CLIENT_VERSION="tot"
-# SERVICE_VERSION="tot"
-# runTest
-#
-# CLIENT_VERSION="tot"
-# SERVICE_VERSION="previous"
-# runTest
-#
-# CLIENT_VERSION="previous"
-# SERVICE_VERSION="tot"
-# runTest
-# ;;
+ 2)
+ CLIENT_VERSION="tot"
+ SERVICE_VERSION="previous"
+ runTest
+ ;;
+ 3)
+ CLIENT_VERSION="previous"
+ SERVICE_VERSION="tot"
+ runTest
+ ;;
+ 4)
+ CLIENT_VERSION="tot"
+ SERVICE_VERSION="tot"
+ runTest
+
+ CLIENT_VERSION="tot"
+ SERVICE_VERSION="previous"
+ runTest
+
+ CLIENT_VERSION="previous"
+ SERVICE_VERSION="tot"
+ runTest
+ ;;
esac
