Allow for different OS line ending encodings in StaticResources

developerforce · Aug 30, 2023 · 20b1208 · 20b1208
1 parent dd9a4c5
commit 20b1208
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/force-app/main/default/classes/CsvToJsonConversionTest.cls b/force-app/main/default/classes/CsvToJsonConversionTest.cls
@@ -27,7 +27,7 @@ public with sharing class CsvToJsonConversionTest {
             System.assertNotEquals(null, c.MailingStreet);
 
             if(c.FirstName=='Donette' && c.LastName=='Foller') {
-                System.assertEquals('34 Center St\n#42', c.MailingStreet);
+                Assert.isTrue(c.MailingStreet == '34 Center St\n#42' || c.MailingStreet == '34 Center St\r\n#42');
             }
         }
     }

diff --git a/force-app/main/default/classes/CsvToObjectTest.cls b/force-app/main/default/classes/CsvToObjectTest.cls
@@ -25,7 +25,8 @@ public with sharing class CsvToObjectTest {
             Assert.isNotNull(c.Address);
 
             if(c.FirstName=='Donette' && c.LastName=='Foller') {
-                Assert.areEqual('34 Center St\n#42', c.Address);
+                // The line ending characters of the OS that uploaded the StaticResource can affect the encoding
+                Assert.isTrue(c.Address == '34 Center St\n#42' || c.Address == '34 Center St\r\n#42');
             }
         }
     }