2 files changed, 2 insertions, 36 deletions
diff --git a/tests/unit/src/com/android/tv/util/FakeClock.java b/tests/unit/src/com/android/tv/util/FakeClock.java
deleted file mode 100644
index a4ab2e4f..00000000
--- a/tests/unit/src/com/android/tv/util/FakeClock.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.tv.util;
-
-public class FakeClock implements Clock {
-    private long mCurrentTimeMillis;
-
-    public FakeClock() {
-        mCurrentTimeMillis = System.currentTimeMillis();
-    }
-
-    public void setCurrentTimeMillis(long time) {
-        mCurrentTimeMillis = time;
-    }
-
-    @Override
-    public long currentTimeMillis() {
-        return mCurrentTimeMillis;
-    }
-}
diff --git a/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java b/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
index 601ed661..afcb812a 100644
--- a/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
+++ b/tests/unit/src/com/android/tv/util/UtilsTest_GetMultiAudioString.java
@@ -37,8 +37,8 @@ public class UtilsTest_GetMultiAudioString extends AndroidTestCase {
                 Utils.getMultiAudioString(context, createAudioTrackInfo("eng"), false));
         assertEquals("Unknown language",
                 Utils.getMultiAudioString(context, createAudioTrackInfo(null), false));
-        // TODO: Check whether the following tests are expected.
-        assertEquals("", Utils.getMultiAudioString(context, createAudioTrackInfo(""), false));
+        assertEquals("Unknown language",
+                Utils.getMultiAudioString(context, createAudioTrackInfo(""), false));
         assertEquals("abc", Utils.getMultiAudioString(context, createAudioTrackInfo("abc"), false));
     }