From 0da49a8c394c4c68c5ccd4cf5a7813d5f1f6c275 Mon Sep 17 00:00:00 2001 From: Tom Gagne Date: Thu, 5 Sep 2024 18:03:32 -0400 Subject: [PATCH] fix syntax errors preventing compilation probably the result of a bad merge --- .../force-app/main/default/classes/ModifyFlowMetadata.cls | 6 +----- .../main/default/classes/fbc_FormulaEvaluatorTest.cls | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls b/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls index 5913505c8..8227cc1ab 100644 --- a/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls +++ b/flow_action_components/CloneAndTweak/force-app/main/default/classes/ModifyFlowMetadata.cls @@ -10,11 +10,7 @@ global with sharing class ModifyFlowMetadata { for (Request curRequest: requestList ){ try{ Result curResult = new Result(); -<<<<<<< Updated upstream usf3.MetadataService.Flow flow = Test.isRunningTest() ? ModifyFlowMetadataTest.genereateFlowForTest() : usf3.MetadataUtils.getFlowMetadataFromName(curRequest.flowName)[0]; -======= - usf3.MetadataService.Flow flow = Test.isRunningTest() ? ModifyFlowMetadataTest.genereateFlowForTest() : usf3.MetadataUtils.GetFlowMetadataFromName(curRequest.flowName)[0]; ->>>>>>> Stashed changes if(String.isNotEmpty(curRequest.entityPath1)) { modifyFlow(flow, curRequest.entityPath1, curRequest.value1); @@ -289,4 +285,4 @@ global with sharing class ModifyFlowMetadata { return flowName.replaceAll('[^a-zA-Z0-9]+', '_'); } public class InvocableActionException extends Exception{} -} \ No newline at end of file +} diff --git a/flow_process_components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls b/flow_process_components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls index 103da8e1b..03028512c 100644 --- a/flow_process_components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls +++ b/flow_process_components/FlowBaseComponents/force-app/main/default/classes/fbc_FormulaEvaluatorTest.cls @@ -2,8 +2,6 @@ public with sharing class fbc_FormulaEvaluatorTest { @IsTest static void parseFormulaTest() { - - static void parseFormulaTest() { Profile pfile = [select id from profile where Name='System Administrator' limit 1]; User usr = new User( alias='utest', email='unitTester@UT.org', emailencodingkey='UTF-8',FirstName = 'beta',lastname='Tester',