From 555aa8a7fddbd823d7941bb8e3328fee5b366f77 Mon Sep 17 00:00:00 2001 From: "Venkatarama NG. Avadhani" Date: Thu, 5 Nov 2020 16:37:08 +0530 Subject: [PATCH 1/2] HDMICEC: Add equals test for DeviceConfig Add equals test for nested class class DeviceConfig in HdmiUtils. Bug: 168713324 Test: atest HdmiUtilsTest#testEqualsDeviceConfig Change-Id: I702a24494ef28752bb764e0843b969ae3b45b6f4 Merged-In: I702a24494ef28752bb764e0843b969ae3b45b6f4 --- .../android/server/hdmi/HdmiUtilsTest.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiUtilsTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiUtilsTest.java index 51b513f1d77b5..7bcfeb6656db9 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiUtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiUtilsTest.java @@ -125,6 +125,35 @@ public class HdmiUtilsTest { .testEquals(); } + @Test + public void testEqualsDeviceConfig() { + String name = "Name"; + + CodecSad expectedCodec1 = new CodecSad(Constants.AUDIO_CODEC_LPCM, "011a03"); + CodecSad expectedCodec2 = new CodecSad(Constants.AUDIO_CODEC_DD, "0d0506"); + CodecSad expectedCodec3 = new CodecSad(Constants.AUDIO_CODEC_LPCM, "010203"); + CodecSad expectedCodec4 = new CodecSad(Constants.AUDIO_CODEC_DD, "040506"); + + List list1 = new ArrayList(); + list1.add(expectedCodec1); + list1.add(expectedCodec2); + list1.add(expectedCodec3); + + List list1Duplicate = new ArrayList(list1); + + List list2 = new ArrayList(list1); + list2.add(expectedCodec4); + + new EqualsTester() + .addEqualityGroup( + new HdmiUtils.DeviceConfig(name, list1), + new HdmiUtils.DeviceConfig(name, list1Duplicate)) + .addEqualityGroup(new HdmiUtils.DeviceConfig(name, list2)) + .addEqualityGroup(new HdmiUtils.DeviceConfig("my" + name, list1)) + .addEqualityGroup(new HdmiUtils.DeviceConfig("my" + name, list2)) + .testEquals(); + } + @Test public void parseSampleXML() { List config = new ArrayList<>(); From 161e9b74a1fa5ecb43950582cff87ab2548220cb Mon Sep 17 00:00:00 2001 From: "Venkatarama NG. Avadhani" Date: Thu, 5 Nov 2020 18:51:40 +0530 Subject: [PATCH 2/2] HDMICEC: Add equals test for HdmiCecMessage Bug: 168713324 Test: atest HdmiCecMessageTest#testEqualsHdmiCecMessage Change-Id: I31ddbed919ccf7a52824a0252c8d1db35bb6ebd9 Merged-In: I31ddbed919ccf7a52824a0252c8d1db35bb6ebd9 --- .../server/hdmi/HdmiCecMessageTest.java | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageTest.java diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageTest.java new file mode 100755 index 0000000000000..036d08412e7ca --- /dev/null +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecMessageTest.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2018 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.server.hdmi; + +import androidx.test.filters.SmallTest; + +import com.google.common.testing.EqualsTester; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; + +/** Tests for {@link HdmiCecMessage} class. */ +@SmallTest +@RunWith(JUnit4.class) +public class HdmiCecMessageTest { + + @Test + public void testEqualsHdmiCecMessage() { + int source = 0; + int destination = 1; + int opcode = 0x7f; + byte[] params1 = {0x00, 0x1a, 0x2b, 0x3c}; + byte[] params2 = {0x00, 0x1a, 0x2b, 0x3c, 0x4d}; + + new EqualsTester() + .addEqualityGroup( + new HdmiCecMessage(source, destination, opcode, params1), + new HdmiCecMessage(source, destination, opcode, params1)) + .addEqualityGroup(new HdmiCecMessage(source, destination, opcode, params2)) + .addEqualityGroup(new HdmiCecMessage(source + 1, destination, opcode, params1)) + .addEqualityGroup(new HdmiCecMessage(source, destination + 1, opcode, params1)) + .addEqualityGroup(new HdmiCecMessage(source, destination, opcode + 1, params1)) + .testEquals(); + } +}