Cleanup code and modify tests

Remove whitespace and unused imports
Change logic of tests based on #1776 feedback
Rename testConstructingSoftButtonObjectWithNonEmptyStateList() to testConstructSoftButtonObjectWithNonEmptyStateList() to match naming of related tests

Author: noah-livio

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java

@@ -33,7 +33,6 @@
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.test.Validator;
 
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,14 +57,11 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import android.database.sqlite.SQLiteCantOpenDatabaseException;
-
 /**
  * This is a unit test class for the SmartDeviceLink library manager class :
  * {@link SoftButtonManager}
  */
 @RunWith(AndroidJUnit4.class)
-//@RunWith(JUnit4.class)
 public class SoftButtonManagerTests {
 
     private SoftButtonManager softButtonManager;
@@ -414,48 +410,55 @@ public void testSoftButtonStateEquals() {
     @Test
     public void testConstructSoftButtonObjectWithEmptyStateList() {
         List<SoftButtonState> stateList = new ArrayList<>();
-        SoftButtonObject softButtonObject1 = new SoftButtonObject("hello_there", stateList, "general_kenobi", null);
-        assertNull(softButtonObject1.getStates());
+        SoftButtonObject softButtonObject = new SoftButtonObject("hello_there", stateList, "general_kenobi", null);
+        assertNull(softButtonObject.getStates());
     }
 
     /**
      * Test constructing SoftButtonObject with an nonempty state list
      */
     @Test
-    public void testConstructingSoftButtonObjectWithNonEmptyStateList() {
+    public void testConstructSoftButtonObjectWithNonEmptyStateList() {
         List<SoftButtonState> stateList = new ArrayList<>();
         SoftButtonState softButtonState = new SoftButtonState("general_kenobi", "General Kenobi", null);
         stateList.add(softButtonState);
-        SoftButtonObject softButtonObject2 = new SoftButtonObject("hello_there_again", stateList, "general_kenobi", null);
-        assertEquals(stateList, softButtonObject2.getStates());
+        SoftButtonObject softButtonObject = new SoftButtonObject("hello_there", stateList, "general_kenobi", null);
+        assertEquals(stateList, softButtonObject.getStates());
     }
 
     /**
      * Test assigning an empty state list to existing SoftButtonObject
      */
     @Test
     public void testAssignEmptyStateListToSoftButtonObject() {
-        List<SoftButtonState> stateList = new ArrayList<>();
-        SoftButtonState softButtonState = new SoftButtonState("object1-state1", "o1s1", null);
+        List<SoftButtonState> nonEmptyStateList = new ArrayList<>();
+        List<SoftButtonState> emptyStateList = new ArrayList<>();
+        SoftButtonState softButtonState = new SoftButtonState("general_kenobi", "General Kenobi", null);
+        nonEmptyStateList.add(softButtonState);
 
-        SoftButtonObject softButtonObject = new SoftButtonObject("hi", softButtonState, null);
+        SoftButtonObject softButtonObject = new SoftButtonObject("hello_there", nonEmptyStateList, "general_kenobi", null);
 
-        softButtonObject.setStates(stateList);
-        assertNotEquals(stateList, softButtonObject.getStates());
+        softButtonObject.setStates(emptyStateList);
+        assertEquals(nonEmptyStateList, softButtonObject.getStates());
     }
 
     /**
      * Test assigning a nonempty state list to existing SoftButtonObject
      */
     @Test
     public void testAssignNonEmptyStateListToSoftButtonObject() {
-        List<SoftButtonState> stateList = new ArrayList<>();
-        SoftButtonState softButtonState = new SoftButtonState("object1-state1", "o1s1", null);
+        List<SoftButtonState> stateList1 = new ArrayList<>();
+        SoftButtonState softButtonState1 = new SoftButtonState("hello_there", "Hello there", null);
+        stateList1.add(softButtonState1);
 
-        SoftButtonObject softButtonObject = new SoftButtonObject("hi", softButtonState, null);
+        List<SoftButtonState> stateList2 = new ArrayList<>();
+        SoftButtonState softButtonState2 = new SoftButtonState("general_kenobi", "General Kenobi", null);
+        stateList2.add(softButtonState2);
 
-        stateList.add(softButtonState);
-        softButtonObject.setStates(stateList);
-        assertEquals(stateList, softButtonObject.getStates());
+        SoftButtonObject softButtonObject = new SoftButtonObject("general_kenobi", stateList1, "general_kenobi", null);
+
+        softButtonObject.setStates(stateList2);
+
+        assertEquals(stateList2, softButtonObject.getStates());
     }
 }

base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonObject.java

@@ -32,13 +32,11 @@
 package com.smartdevicelink.managers.screen;
 
 import androidx.annotation.NonNull;
-
 import com.smartdevicelink.managers.file.filetypes.SdlArtwork;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
 import com.smartdevicelink.proxy.rpc.OnButtonPress;
 import com.smartdevicelink.proxy.rpc.SoftButton;
 import com.smartdevicelink.util.DebugTool;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -406,5 +404,4 @@ public SoftButtonObject clone() {
         }
         return null;
     }
-
 }