commit 5730951a8565f4b841ea3333daac0c2eca7b155e
author Oliver Woodman <olly@google.com> Fri Dec 04 15:24:20 2020 +0000
committer Oliver Woodman <olly@google.com> Tue Jan 26 17:05:43 2021 +0000
tree 367e78eca30936c57e9f25debabba59f317924ac
parent 5e5fe82935670c9e9348de52621c16529d5a1831

CTS test for API to add SOC manufacturer and model

Bug: 158284209
Test: atest android.os.cts.BuildTest
Change-Id: I47a2f8dd24361c025aacd44d7b394b2cce27d7cc

tests/tests/os/src/android/os/cts/BuildTest.java

diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index 45fcee9..5a0ec1a 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -218,6 +218,10 @@
         Pattern.compile("^([0-9A-Za-z.,_-]+)$");
     private static final Pattern PRODUCT_PATTERN =
         Pattern.compile("^([0-9A-Za-z._-]+)$");
+    private static final Pattern SOC_MANUFACTURER_PATTERN =
+        Pattern.compile("^([0-9A-Za-z ]+)$");
+    private static final Pattern SOC_MODEL_PATTERN =
+        Pattern.compile("^([0-9A-Za-z ._/+-]+)$");
     private static final Pattern SERIAL_NUMBER_PATTERN =
         Pattern.compile("^([0-9A-Za-z]{6,20})$");
     private static final Pattern SKU_PATTERN =
@@ -249,6 +253,12 @@
 
         assertNotEmpty(Build.MODEL);
 
+        assertEquals(Build.SOC_MANUFACTURER, Build.SOC_MANUFACTURER.trim());
+        assertTrue(SOC_MANUFACTURER_PATTERN.matcher(Build.SOC_MANUFACTURER).matches());
+
+        assertEquals(Build.SOC_MODEL, Build.SOC_MODEL.trim());
+        assertTrue(SOC_MODEL_PATTERN.matcher(Build.SOC_MODEL).matches());
+
         assertTrue(PRODUCT_PATTERN.matcher(Build.PRODUCT).matches());
 
         assertTrue(SERIAL_NUMBER_PATTERN.matcher(Build.SERIAL).matches());