Merge pull request #564 from smartdevicelink/bugfix/test-updates

Fix failing tests and add artwork imagerpc clone test

Author: crokita

tests/managers/file/SdlFileTests.js

@@ -71,9 +71,13 @@ module.exports = function (appClient) {
                 .setTemplateImage(true);
             Validator.assertTrue(file.equals(file2));
 
+            // forcibly create the image rpc
+            file.getImageRPC();
+
             const fileClone = file.clone();
             Validator.assertTrue(file !== fileClone);
             Validator.assertTrue(file.equals(file2));
+            Validator.assertNotEquals(file._imageRPC, fileClone._imageRPC);
 
             fileClone.setName('something else');
             fileClone.setFilePath('./goes_nowhere.txt');

tests/managers/screen/TextAndGraphicUpdateOperationTests.js

@@ -1005,7 +1005,7 @@ module.exports = function (appClient) {
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField2Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField3Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField4Type());
-            Validator.assertEquals(configuration, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
+            Validator.assertEquals(configurationOld, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
 
             versionStub.restore();
             fileStub.restore();
@@ -1052,7 +1052,7 @@ module.exports = function (appClient) {
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField2Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField3Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField4Type());
-            Validator.assertEquals(configuration, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
+            Validator.assertEquals(configurationOld, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
 
             versionStub.restore();
         });
@@ -1097,7 +1097,7 @@ module.exports = function (appClient) {
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField2Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField3Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField4Type());
-            Validator.assertEquals(configuration, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
+            Validator.assertEquals(configurationOld, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
 
             versionStub.restore();
         });
@@ -1142,7 +1142,7 @@ module.exports = function (appClient) {
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField2Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField3Type());
             Validator.assertNull(textAndGraphicUpdateOperation._getCurrentScreenData().getTextField4Type());
-            Validator.assertEquals(configuration, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
+            Validator.assertEquals(configurationOld, textAndGraphicUpdateOperation._getCurrentScreenData().getTemplateConfiguration());
 
             versionStub.restore();
         });