From fcc05bf9b7e84bdf18774c26319da47ae31f0452 Mon Sep 17 00:00:00 2001 From: Julian Kast Date: Mon, 26 Oct 2020 11:36:01 -0400 Subject: Unit test were created during 5.0 development. For the hotfix, modifications need to be made to allow test to work. --- .../smartdevicelink/managers/ManagerUtilityTests.java | 18 +++++++++--------- .../com/smartdevicelink/test/rpc/RPCStructTests.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java index fe7d402b9..724e30220 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/ManagerUtilityTests.java @@ -1,6 +1,6 @@ package com.smartdevicelink.managers; -import androidx.test.ext.junit.runners.AndroidJUnit4; +import android.support.test.runner.AndroidJUnit4; import com.smartdevicelink.proxy.rpc.ImageField; import com.smartdevicelink.proxy.rpc.TextField; @@ -96,13 +96,13 @@ public class ManagerUtilityTests { public void testHasTextFieldOfName() { WindowCapability capability = new WindowCapability(); List textFieldList = new ArrayList<>(); - textFieldList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8)); + textFieldList.add(new TextField(TextFieldName.mainField1, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(textFieldList); assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1)); assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3)); - textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8)); + textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(textFieldList); assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1)); assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3)); @@ -113,7 +113,7 @@ public class ManagerUtilityTests { assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1)); assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3)); - textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.UTF_8, 500, 8)); + textFieldList.add(new TextField(TextFieldName.alertText3, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(textFieldList); assertFalse(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.mainField1)); assertTrue(ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(capability, TextFieldName.alertText3)); @@ -164,22 +164,22 @@ public class ManagerUtilityTests { //Single line List singleLineList = new ArrayList<>(); - singleLineList.add(new TextField(TextFieldName.mainField1, CharacterSet.UTF_8, 500, 8)); + singleLineList.add(new TextField(TextFieldName.mainField1, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(singleLineList); maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability); assertEquals(1, maxNumerOfLines); - singleLineList.add(new TextField(TextFieldName.mainField2, CharacterSet.UTF_8, 500, 8)); + singleLineList.add(new TextField(TextFieldName.mainField2, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(singleLineList); maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability); assertEquals(2, maxNumerOfLines); - singleLineList.add(new TextField(TextFieldName.mainField3, CharacterSet.UTF_8, 500, 8)); + singleLineList.add(new TextField(TextFieldName.mainField3, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(singleLineList); maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability); assertEquals(3, maxNumerOfLines); - singleLineList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8)); + singleLineList.add(new TextField(TextFieldName.mainField4, CharacterSet.CID2SET, 500, 8)); capability.setTextFields(singleLineList); maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability); assertEquals(4, maxNumerOfLines); @@ -194,7 +194,7 @@ public class ManagerUtilityTests { maxNumerOfLines = ManagerUtility.WindowCapabilityUtility.getMaxNumberOfMainFieldLines(capability); assertEquals(0, maxNumerOfLines); - nullList.add(new TextField(TextFieldName.mainField4, CharacterSet.UTF_8, 500, 8)); + nullList.add(new TextField(TextFieldName.mainField4, CharacterSet.CID2SET, 500, 8)); assertNotNull(nullList); capability.setTextFields(nullList); assertNotNull(capability); diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCStructTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCStructTests.java index 970c3c8ba..e759e8f84 100644 --- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCStructTests.java +++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCStructTests.java @@ -1,6 +1,6 @@ package com.smartdevicelink.test.rpc; -import androidx.test.ext.junit.runners.AndroidJUnit4; +import android.support.test.runner.AndroidJUnit4; import com.smartdevicelink.proxy.RPCStruct; -- cgit v1.2.1