Bumps source API version and quote unquoute fixes weird order of operations parsing differences between 256 and 258

Author: jamessimone

force-app/repository/QueryTest.cls

@@ -105,22 +105,22 @@ private class QueryTest {
 
   @IsTest
   static void itShouldAllowNestedAndStatements() {
-    String expected = '(LastName = :bindVar0 OR LastName = :bindVar1 OR (FirstName = :bindVar2 AND (LastName != :bindVar3 OR LastName != :bindVar4)))';
-
-    Assert.areEqual(
-      expected,
-      Query.orQuery(
-          new List<Query>{
-            Query.equals(Contact.LastName, 'asd'),
-            Query.equals(Contact.LastName, 'asb'),
-            Query.andQuery(
-              Query.equals(Contact.FirstName, 'John'),
-              Query.orQuery(Query.notEquals(Contact.LastName, 'a'), Query.notEquals(Contact.LastName, 'b'))
-            )
-          }
+    String regexExpected = '\\(LastName = :bindVar\\d OR LastName = :bindVar\\d OR \\(FirstName = :bindVar\\d AND \\(LastName != :bindVar\\d OR LastName != :bindVar\\d\\)\\)\\)';
+    // String expected = '(LastName = :bindVar0 OR LastName = :bindVar1 OR (FirstName = :bindVar2 AND (LastName != :bindVar3 OR LastName != :bindVar4)))';
+
+    Query output = Query.orQuery(
+      new List<Query>{
+        Query.equals(Contact.LastName, 'asd'),
+        Query.equals(Contact.LastName, 'asb'),
+        Query.andQuery(
+          Query.equals(Contact.FirstName, 'John'),
+          Query.orQuery(Query.notEquals(Contact.LastName, 'a'), Query.notEquals(Contact.LastName, 'b'))
         )
-        .toString()
+      }
     );
+
+    Assert.areEqual(true, Pattern.compile(regexExpected).matcher(output.toString()).matches());
+    // Assert.areEqual(expected, output.toString());
   }
 
   @IsTest
@@ -203,10 +203,12 @@ private class QueryTest {
       )
     );
 
-    Assert.areEqual(
-      'AccountId IN (SELECT Id FROM Account WHERE (AnnualRevenue = :bindVar0 AND Industry = :bindVar1 AND (NumberOfEmployees = :bindVar2 OR Site = :bindVar3)))',
-      subquery.toString()
-    );
+    String regex = 'AccountId IN \\(SELECT Id FROM Account WHERE \\(AnnualRevenue = :bindVar\\d AND Industry = :bindVar\\d AND \\(NumberOfEmployees = :bindVar\\d OR Site = :bindVar\\d\\)\\)\\)';
+    Assert.areEqual(true, Pattern.compile(regex).matcher(subquery.toString()).matches());
+    // Assert.areEqual(
+    //   'AccountId IN (SELECT Id FROM Account WHERE (AnnualRevenue = :bindVar0 AND Industry = :bindVar1 AND (NumberOfEmployees = :bindVar2 OR Site = :bindVar3)))',
+    //   subquery.toString()
+    // );
   }
 
   @IsTest

sfdx-project.json

@@ -10,5 +10,5 @@
   ],
   "namespace": "",
   "sfdcLoginUrl": "https://login.salesforce.com",
-  "sourceApiVersion": "62.0"
+  "sourceApiVersion": "64.0"
 }