commit b0324b44ecec50074733ac3e0aad6a80a324e4c0
author Pavel Maltsev <pavelm@google.com> Tue Sep 27 21:00:41 2016 -0700
committer Pavel Maltsev <pavelm@google.com> Fri Sep 30 11:25:20 2016 -0700
tree acd56d1235530bc19515596266f36fb3c9be5392
parent 5d873a0ab1f5d97a13709d0e663540425a25befb

Add on-property-set listener to VNS

Change-Id: Id0b0fb15f42e1af0ca4899ea625bcc77f1320db7
Fix: b/31656523

tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java

diff --git a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
index 7059f7d..531b3d4 100644
--- a/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
+++ b/tests/libvehiclenetwork-java-test/src/com/android/car/vehiclenetwork/libtest/VehicleNetworkMockedTest.java
@@ -21,6 +21,7 @@
 import android.util.Log;
 
 import com.android.car.vehiclenetwork.VehicleNetwork;
+import com.android.car.vehiclenetwork.VehicleNetwork.SubscribeFlags;
 import com.android.car.vehiclenetwork.VehicleNetwork.VehicleNetworkHalMock;
 import com.android.car.vehiclenetwork.VehicleNetwork.VehicleNetworkListener;
 import com.android.car.vehiclenetwork.VehicleNetworkConsts;
@@ -343,6 +344,48 @@
         mVehicleNetwork.unsubscribe(PROPERTY);
     }
 
+    public void testSubscribe_OnPropertySet() throws Exception {
+        final int PROPERTY = CUSTOM_PROPERTY_ZONED_INT32_VEC3;
+        final int ZONE = VehicleZone.VEHICLE_ZONE_ROW_1_LEFT;
+        final int[] VALUES = new int[] {10, 20, 30};
+        mVehicleNetwork.startMocking(mVehicleHalMock);
+        mVehicleNetwork.subscribe(PROPERTY, 0, ZONE, SubscribeFlags.SET_CALL);
+
+        mVehicleNetwork.setZonedIntVectorProperty(PROPERTY, ZONE, VALUES);
+
+        VehiclePropValue expectedValue = VehiclePropValueUtil.createZonedIntVectorValue(
+                PROPERTY, ZONE, VALUES, 0);
+
+        assertTrue(mListener.waitForOnPropertySet(TIMEOUT_MS, expectedValue));
+
+        mVehicleNetwork.injectEvent(expectedValue);
+        // Not subscribed to HAL events. No notifications expected here.
+        assertFalse(mListener.waitForEvent(TIMEOUT_MS, expectedValue));
+
+        mVehicleNetwork.unsubscribe(PROPERTY);
+    }
+
+    public void testSubscribe_HalEventAndOnPropertySet() throws Exception {
+        final int PROPERTY = CUSTOM_PROPERTY_ZONED_INT32_VEC3;
+        final int ZONE = VehicleZone.VEHICLE_ZONE_ROW_1_LEFT;
+        final int[] VALUES = new int[] {10, 20, 30};
+        mVehicleNetwork.startMocking(mVehicleHalMock);
+        mVehicleNetwork.subscribe(PROPERTY, 0, ZONE,
+                SubscribeFlags.SET_CALL | SubscribeFlags.HAL_EVENT);
+
+        mVehicleNetwork.setZonedIntVectorProperty(PROPERTY, ZONE, VALUES);
+
+        VehiclePropValue expectedValue = VehiclePropValueUtil.createZonedIntVectorValue(
+                PROPERTY, ZONE, VALUES, 0);
+
+        assertTrue(mListener.waitForOnPropertySet(TIMEOUT_MS, expectedValue));
+
+        mVehicleNetwork.injectEvent(expectedValue);
+        assertTrue(mListener.waitForEvent(TIMEOUT_MS, expectedValue));
+
+        mVehicleNetwork.unsubscribe(PROPERTY);
+    }
+
     public void testGetPropertyFailsForCustom() {
         try {
             mVehicleNetwork.getProperty(CUSTOM_PROPERTY_INT32);
@@ -366,10 +409,12 @@
         int mErrorProperty;
         int mErrorOperation;
         VehiclePropValues mValuesReceived;
+        VehiclePropValue mPropertySetValue;
 
         private final Semaphore mRestartWait = new Semaphore(0);
         private final Semaphore mErrorWait = new Semaphore(0);
         private final Semaphore mEventWait = new Semaphore(0);
+        private final Semaphore mOnPropertySetWait = new Semaphore(0);
 
         @Override
         public void onVehicleNetworkEvents(VehiclePropValues values) {
@@ -403,6 +448,12 @@
             mRestartWait.release();
         }
 
+        @Override
+        public void onPropertySet(VehiclePropValue value) {
+            mPropertySetValue = value;
+            mOnPropertySetWait.release();
+        }
+
         public boolean waitForHalRestartAndAssert(long timeoutMs, boolean expectedInMocking)
                 throws Exception {
             if (!mRestartWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
@@ -423,6 +474,17 @@
                     VehiclePropValueUtil.toString(mValuesReceived.getValues(0)));
             return true;
         }
+
+        public boolean waitForOnPropertySet(long timeoutMs, VehiclePropValue expected)
+                throws InterruptedException {
+            if (!mOnPropertySetWait.tryAcquire(timeoutMs, TimeUnit.MILLISECONDS)) {
+                Log.w(TAG, "Timed out waiting for onPropertySet.");
+                return false;
+            }
+            assertEquals(VehiclePropValueUtil.toString(expected),
+                    VehiclePropValueUtil.toString(mPropertySetValue));
+            return true;
+        }
     }
 
     private interface VehiclePropertyHandler {