1 files changed, 18 insertions, 18 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
index 7c66ba6c7..3a73e425f 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/HMIPermissionsTests.java
@@ -3,7 +3,7 @@ package com.smartdevicelink.test.rpc.datatypes;
 import com.smartdevicelink.proxy.rpc.HMIPermissions;
 import com.smartdevicelink.proxy.rpc.enums.HMILevel;
 import com.smartdevicelink.test.JsonUtils;
-import com.smartdevicelink.test.Test;
+import com.smartdevicelink.test.TestValues;
 
 import junit.framework.TestCase;
 
@@ -25,8 +25,8 @@ public class HMIPermissionsTests extends TestCase{
     public void setUp(){
         msg = new HMIPermissions();
 
-        msg.setAllowed(Test.GENERAL_HMILEVEL_LIST);
-        msg.setUserDisallowed(Test.GENERAL_HMILEVEL_LIST);
+        msg.setAllowed(TestValues.GENERAL_HMILEVEL_LIST);
+        msg.setUserDisallowed(TestValues.GENERAL_HMILEVEL_LIST);
     }
 
     /**
@@ -38,33 +38,33 @@ public class HMIPermissionsTests extends TestCase{
         List<HMILevel> disallowed = msg.getUserDisallowed();
 
         // Valid Tests
-        assertEquals(Test.MATCH, Test.GENERAL_HMILEVEL_LIST.size(), allowed.size());
-        assertEquals(Test.MATCH, Test.GENERAL_HMILEVEL_LIST.size(), disallowed.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), allowed.size());
+        assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.size(), disallowed.size());
         
-        for(int i = 0; i < Test.GENERAL_HMILEVEL_LIST.size(); i++){
-            assertEquals(Test.MATCH, Test.GENERAL_HMILEVEL_LIST.get(i), allowed.get(i));
+        for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), allowed.get(i));
         }
-        for(int i = 0; i < Test.GENERAL_HMILEVEL_LIST.size(); i++){
-            assertEquals(Test.MATCH, Test.GENERAL_HMILEVEL_LIST.get(i), disallowed.get(i));
+        for(int i = 0; i < TestValues.GENERAL_HMILEVEL_LIST.size(); i++){
+            assertEquals(TestValues.MATCH, TestValues.GENERAL_HMILEVEL_LIST.get(i), disallowed.get(i));
         }
         
         // Invalid/Null Tests
         HMIPermissions msg = new HMIPermissions();
-        assertNotNull(Test.NOT_NULL, msg);
+        assertNotNull(TestValues.NOT_NULL, msg);
 
-        assertNull(Test.NULL, msg.getAllowed());
-        assertNull(Test.NULL, msg.getUserDisallowed());
+        assertNull(TestValues.NULL, msg.getAllowed());
+        assertNull(TestValues.NULL, msg.getUserDisallowed());
     }
 
     public void testJson(){
         JSONObject reference = new JSONObject();
 
         try{
-            reference.put(HMIPermissions.KEY_ALLOWED, Test.JSON_HMILEVELS);
-            reference.put(HMIPermissions.KEY_USER_DISALLOWED, Test.JSON_HMILEVELS);
+            reference.put(HMIPermissions.KEY_ALLOWED, TestValues.JSON_HMILEVELS);
+            reference.put(HMIPermissions.KEY_USER_DISALLOWED, TestValues.JSON_HMILEVELS);
 
             JSONObject underTest = msg.serializeJSON();
-            assertEquals(Test.MATCH, reference.length(), underTest.length());
+            assertEquals(TestValues.MATCH, reference.length(), underTest.length());
 
             Iterator<?> iterator = reference.keys();
             while(iterator.hasNext()){
@@ -72,13 +72,13 @@ public class HMIPermissionsTests extends TestCase{
                 List<String> referenceList = JsonUtils.readStringListFromJsonObject(reference, key);
                 List<String> underTestList = JsonUtils.readStringListFromJsonObject(underTest, key);
 
-                assertEquals(Test.MATCH, referenceList.size(), underTestList.size());
+                assertEquals(TestValues.MATCH, referenceList.size(), underTestList.size());
                 for(int i = 0; i < referenceList.size(); i++){
-                    assertEquals(Test.MATCH, referenceList.get(i), underTestList.get(i));
+                    assertEquals(TestValues.MATCH, referenceList.get(i), underTestList.get(i));
                 }
             }
         } catch(JSONException e){
-        	fail(Test.JSON_FAIL);
+        	fail(TestValues.JSON_FAIL);
         }
     }
 }
\ No newline at end of file