commit 01a60395cdba8df0e306d1f692d4677799485b6f
author Antonio Cortes <antoniocortes@google.com> Wed Mar 22 13:00:02 2017 -0700
committer Antonio Cortes <antoniocortes@google.com> Thu Mar 23 08:44:51 2017 -0700
tree 84bf0ae9b79e3644b61c6cc76914f6b190d0e739
parent 7837d8d872331dce3c68facc81affd684db929bf

Updating VMS interfaces to use VmsLayer.

Test: runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/VmsPublisherClientServiceTest.java
Test: runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
Test: runtest -x packages/services/Car/tests/carservice_test/src/com/android/car/test/VmsSubscriberManagerTest.java
Test: runtest -x packages/services/Car/tests/carservice_unit_test/src/com/android/car/VmsRoutingTest.java
Bug: 36214569
Change-Id: Iee5a0595ba5bb175d9b1b6189d15902fd222a967

tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java

diff --git a/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java b/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
index b215ffb..401adb2 100644
--- a/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
+++ b/tests/carservice_test/src/com/android/car/test/VmsPublisherSubscriberTest.java
@@ -39,8 +39,9 @@
 
 @FutureFeature
 public class VmsPublisherSubscriberTest extends MockedCarTestBase {
-    public static final int LAYER_ID = 88;
-    public static final int LAYER_VERSION = 19;
+    private static final int LAYER_ID = 88;
+    private static final int LAYER_VERSION = 19;
+    public static final VmsLayer LAYER = new VmsLayer(LAYER_ID, LAYER_VERSION);
     public static final byte[] PAYLOAD = new byte[]{2, 3, 5, 7, 11, 13, 17};
 
     private HalHandler mHalHandler;
@@ -103,11 +104,10 @@
                 Car.VMS_SUBSCRIBER_SERVICE);
         TestListener listener = new TestListener();
         vmsSubscriberManager.setListener(listener);
-        vmsSubscriberManager.subscribe(LAYER_ID, LAYER_VERSION);
+        vmsSubscriberManager.subscribe(LAYER);
 
         assertTrue(mSubscriberSemaphore.tryAcquire(2L, TimeUnit.SECONDS));
-        assertEquals(LAYER_ID, listener.getLayerId());
-        assertEquals(LAYER_VERSION, listener.getLayerVersion());
+        assertEquals(LAYER, listener.getLayer());
         assertTrue(Arrays.equals(PAYLOAD, listener.getPayload()));
     }
 
@@ -115,17 +115,14 @@
     }
 
     private class TestListener implements VmsSubscriberManager.VmsSubscriberClientListener {
-        private int mLayerId;
-        private int mLayerVersion;
+        private VmsLayer mLayer;
         private byte[] mPayload;
 
         @Override
-        public void onVmsMessageReceived(int layerId, int layerVersion, byte[] payload) {
-            assertEquals(LAYER_ID, layerId);
-            assertEquals(LAYER_VERSION, layerVersion);
+        public void onVmsMessageReceived(VmsLayer layer, byte[] payload) {
+            assertEquals(LAYER, layer);
             assertTrue(Arrays.equals(PAYLOAD, payload));
-            mLayerId = layerId;
-            mLayerVersion = layerVersion;
+            mLayer = layer;
             mPayload = payload;
             mSubscriberSemaphore.release();
         }
@@ -137,12 +134,8 @@
             //  and update VmsPublisherClientMockService
         }
 
-        public int getLayerId() {
-            return mLayerId;
-        }
-
-        public int getLayerVersion() {
-            return mLayerVersion;
+        public VmsLayer getLayer() {
+            return mLayer;
         }
 
         public byte[] getPayload() {