diff options
| -rw-r--r-- | core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java | 8 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/view/textclassifier/logging/SmartSelectionEventTrackerTest.java | 43 |
2 files changed, 48 insertions, 3 deletions
diff --git a/core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java b/core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java index b530ddfe86d6..f74c7fc69a7e 100644 --- a/core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java +++ b/core/java/android/view/textclassifier/logging/SmartSelectionEventTracker.java @@ -27,6 +27,7 @@ import android.view.textclassifier.TextClassification; import android.view.textclassifier.TextClassifier; import android.view.textclassifier.TextSelection; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; @@ -551,10 +552,11 @@ public final class SmartSelectionEventTracker { return new SelectionEvent(start, end, actionType, entityType, versionTag); } - private static String getVersionInfo(String signature) { - final int start = signature.indexOf("|"); + @VisibleForTesting + public static String getVersionInfo(String signature) { + final int start = signature.indexOf("|") + 1; final int end = signature.indexOf("|", start); - if (start >= 0 && end >= start) { + if (start >= 1 && end >= start) { return signature.substring(start, end); } return ""; diff --git a/core/tests/coretests/src/android/view/textclassifier/logging/SmartSelectionEventTrackerTest.java b/core/tests/coretests/src/android/view/textclassifier/logging/SmartSelectionEventTrackerTest.java new file mode 100644 index 000000000000..321a7f21c307 --- /dev/null +++ b/core/tests/coretests/src/android/view/textclassifier/logging/SmartSelectionEventTrackerTest.java @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2019 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 android.view.textclassifier.logging; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SmallTest; + +import com.google.common.truth.Truth; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class SmartSelectionEventTrackerTest { + + @Test + public void getVersionInfo_valid() { + String signature = "a|702|b"; + String versionInfo = SmartSelectionEventTracker.SelectionEvent.getVersionInfo(signature); + Truth.assertThat(versionInfo).isEqualTo("702"); + } + + @Test + public void getVersionInfo_invalid() { + String signature = "|702"; + String versionInfo = SmartSelectionEventTracker.SelectionEvent.getVersionInfo(signature); + Truth.assertThat(versionInfo).isEmpty(); + } +} |