widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fail Test if LoadOfflineLicense() Helper Fails" into mnc-dev

Browse Source
This commit is contained in:
John "Juce" Bruce
2015-06-19 18:17:55 +00:00
committed by Android (Google) Code Review
parent 89682556ad 57fd014f6d
commit b0cfa834f1
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -765,7 +765,7 @@ class Session {
} }
void open() { void open() {
EXPECT_TRUE(!open_); EXPECT_FALSE(open_);
session_status_ = OEMCrypto_OpenSession(&session_id_); session_status_ = OEMCrypto_OpenSession(&session_id_);
if (OEMCrypto_SUCCESS == session_status_) { if (OEMCrypto_SUCCESS == session_status_) {
open_ = true; open_ = true;
@@ -5532,6 +5532,11 @@ TEST_P(UsageTableTestWithMAC, ReloadOfflineLicense) {
Session s; Session s;
LoadOfflineLicense(s, pst); LoadOfflineLicense(s, pst);
// If there are errors in LoadOfflineLicense, that function will exit but this
// test will continue. The session will be left open and in an unknown state.
// Best just to abort in that case.
ASSERT_FALSE(s.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
s.open(); // Offline license can be reused. s.open(); // Offline license can be reused.
s.GenerateTestSessionKeys(); s.GenerateTestSessionKeys();
// We will reuse the encrypted and signed message, so we don't call // We will reuse the encrypted and signed message, so we don't call
@@ -5560,6 +5565,11 @@ TEST_P(UsageTableTestWithMAC, BadReloadOfflineLicense) {
Session s; Session s;
LoadOfflineLicense(s, pst); LoadOfflineLicense(s, pst);
// If there are errors in LoadOfflineLicense, that function will exit but this
// test will continue. The session will be left open and in an unknown state.
// Best just to abort in that case.
ASSERT_FALSE(s.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
// Offline license with new mac keys should fail. // Offline license with new mac keys should fail.
Session s2; Session s2;
s2.open(); s2.open();
@@ -5631,6 +5641,11 @@ TEST_P(UsageTableTestWithMAC, DeactivateOfflineLicense) {
Session s; Session s;
LoadOfflineLicense(s, pst); LoadOfflineLicense(s, pst);
// If there are errors in LoadOfflineLicense, that function will exit but this
// test will continue. The session will be left open and in an unknown state.
// Best just to abort in that case.
ASSERT_FALSE(s.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
s.open(); s.open();
s.GenerateTestSessionKeys(); s.GenerateTestSessionKeys();
s.LoadTestKeys(pst, new_mac_keys_); // Reload the license s.LoadTestKeys(pst, new_mac_keys_); // Reload the license
@@ -5697,6 +5712,13 @@ TEST_F(UsageTableTest, TimingTest) {
LoadOfflineLicense(s3, pst3); LoadOfflineLicense(s3, pst3);
time_t loaded3 = time(NULL); time_t loaded3 = time(NULL);
// If there are errors in LoadOfflineLicense, that function will exit but this
// test will continue. The sessions will be left open and in an unknown state.
// Best just to abort in that case.
ASSERT_FALSE(s1.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
ASSERT_FALSE(s2.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
ASSERT_FALSE(s3.isOpen()) << "LoadOfflineLicense() failed. Aborting.";
sleep(kLongSleep); sleep(kLongSleep);
s1.open(); s1.open();
s1.GenerateTestSessionKeys(); s1.GenerateTestSessionKeys();