[Expense tests] Re-enable reviewed APIs and consolidate Expense fixes

.github/AL-Go-Settings.json

@@ -15,6 +15,7 @@
   "repoVersion": "30.0",
   "memoryLimit": "16G",
   "numberOfTenantsForTesting": 4,
+  "enableCleanTestCodeunitExecution": true,
   "maxTestAppReruns": 2,
   "failOn": "newWarning",
   "workspaceCompilation": {

src/Apps/W1/ExpenseAgent/app/src/Travel Request/Codeunits/TravelRequestApproval.Codeunit.al

@@ -6,7 +6,6 @@ namespace Microsoft.ExpenseAgent;
 
 using Microsoft.Finance.SpendRequest;
 using System.Telemetry;
-using System.Text;
 
 codeunit 7133 "Travel Request Approval"
 {
@@ -318,13 +317,17 @@ codeunit 7133 "Travel Request Approval"
     var
         ExpenseApprovalSetup: Record "Expense Approval Setup";
         ExpenseAgentSetup: Record "Expense Agent Setup";
-        SelectionFilterManagement: Codeunit SelectionFilterManagement;
-        RecRef: RecordRef;
+        AssignedFilter: TextBuilder;
     begin
         ExpenseApprovalSetup.SetCurrentKey("Approver No.");
         ExpenseApprovalSetup.SetRange("Approver No.", ApproverExpenseUserNo);
-        RecRef.GetTable(ExpenseApprovalSetup);
-        RequestedForFilter := SelectionFilterManagement.GetSelectionFilter(RecRef, ExpenseApprovalSetup.FieldNo("Expense User No."));
+        ExpenseApprovalSetup.SetLoadFields("Expense User No.");
+        // Ranges between setup rows could include expense users without any approval setup.
+        if ExpenseApprovalSetup.FindSet() then
+            repeat
+                AppendSubmitterFilter(AssignedFilter, ExpenseApprovalSetup."Expense User No.");
+            until ExpenseApprovalSetup.Next() = 0;
+        RequestedForFilter := AssignedFilter.ToText();
 
         ExpenseAgentSetup.GetRecordOnce();
         if ExpenseAgentSetup."Default Approver No." = ApproverExpenseUserNo then
@@ -337,7 +340,6 @@ codeunit 7133 "Travel Request Approval"
     local procedure AppendDefaultSubmitters(var RequestedForFilter: Text)
     var
         ExpenseUser: Record "Expense User";
-        SelectionFilterManagement: Codeunit SelectionFilterManagement;
         DefaultFilter: TextBuilder;
     begin
         if RequestedForFilter <> '' then
@@ -348,14 +350,23 @@ codeunit 7133 "Travel Request Approval"
         ExpenseUser.SetLoadFields("No.");
         if ExpenseUser.FindSet() then
             repeat
-                if DefaultFilter.Length > 0 then
-                    DefaultFilter.Append('|');
-                DefaultFilter.Append(SelectionFilterManagement.AddQuotes(ExpenseUser."No."));
+                AppendSubmitterFilter(DefaultFilter, ExpenseUser."No.");
             until ExpenseUser.Next() = 0;
 
         RequestedForFilter := DefaultFilter.ToText();
     end;
 
+    local procedure AppendSubmitterFilter(var SubmitterFilter: TextBuilder; ExpenseUserNo: Code[20])
+    var
+        ExpenseUserFilter: Record "Expense User";
+    begin
+        // Serialize an exact value so filter operators in user numbers remain literal.
+        ExpenseUserFilter.SetRange("No.", ExpenseUserNo);
+        if SubmitterFilter.Length > 0 then
+            SubmitterFilter.Append('|');
+        SubmitterFilter.Append(ExpenseUserFilter.GetFilter("No."));
+    end;
+
     var
         FeatureTelemetry: Codeunit "Feature Telemetry";
         ExpenseActivityLogMgt: Codeunit "Expense Activity Log Mgt.";

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseActivityLogAPITest.Codeunit.al

@@ -22,7 +22,6 @@ codeunit 148343 "Expense Activity Log API Test"
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
         LibrarySetupStorage: Codeunit "Library - Setup Storage";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ServiceNameTok: Label 'expenseActivityLogEntries', Locked = true;
         ExpenseReportsServiceNameTok: Label 'expenseReports', Locked = true;
@@ -476,19 +475,23 @@ codeunit 148343 "Expense Activity Log API Test"
         RequestBody.WriteTo(RequestText);
         ReportURL := LibraryGraphMgt.CreateTargetURLWithSubpage(
             Format(SubmitterExpenseUser.SystemId), Page::"Expense Users API", ExpenseUsersServiceNameTok, ExpenseReportsServiceNameTok);
-        ReportURL += '(' + LibraryGraphMgt.StripBrackets(Format(ExpenseReportHeader.SystemId)) + ')';
+        ReportURL := LibraryGraphMgt.AppendPathToTargetURL(
+            ReportURL, '(' + LibraryGraphMgt.StripBrackets(Format(ExpenseReportHeader.SystemId)) + ')');
         Commit();
 
         // [WHEN] The standard submission action is requested through the submitting user.
-        LibraryGraphMgt.PostToWebServiceAndCheckResponseCode(ReportURL + '/' + SubmitWithCommentActionTok, RequestText, ResponseText, 200);
+        Clear(ResponseText);
+        LibraryGraphMgt.PostToWebServiceAndCheckResponseCode(
+            LibraryGraphMgt.AppendPathToTargetURL(ReportURL, '/' + SubmitWithCommentActionTok), RequestText, ResponseText, 200);
 
         // [THEN] Exactly one structured snapshot is visible without a new callback or capability.
         ExpenseActivityLogEntry.SetRange("Subject System ID", ExpenseReportHeader.SystemId);
         ExpenseActivityLogEntry.SetRange("Event Type", ExpenseActivityLogEntry."Event Type"::PolicyEvaluated);
         Assert.RecordCount(ExpenseActivityLogEntry, 1);
         ExpenseActivityLogEntry.FindFirst();
         Clear(ResponseText);
-        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(ResponseText, ReportURL + '/' + ServiceNameTok, 200);
+        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(
+            ResponseText, LibraryGraphMgt.AppendPathToTargetURL(ReportURL, '/' + ServiceNameTok), 200);
         VerifyPolicyCategoryCode(ResponseText, ExpenseCategory.Code);
         ResponseText := LowerCase(ResponseText);
         Assert.AreNotEqual(0, StrPos(ResponseText, '"eventtype":"policyevaluated"'), 'The event type must identify the policy snapshot.');
@@ -502,7 +505,8 @@ codeunit 148343 "Expense Activity Log API Test"
         HistoryURL := LibraryGraphMgt.CreateTargetURLWithSubpage(
             Format(SubmitterExpenseUser.SystemId), Page::"Expense Users API", ExpenseUsersServiceNameTok, ServiceNameTok);
         Clear(ResponseText);
-        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(ResponseText, HistoryURL + '?$filter=historyActorRole eq ''Submitter''', 200);
+        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(
+            ResponseText, LibraryGraphMgt.AppendQueryParameterToTargetURL(HistoryURL, '$filter=historyActorRole eq ''Submitter'''), 200);
 
         // [THEN] The real submitter sees the agent snapshot in the complete timeline.
         Assert.AreNotEqual(0, StrPos(LowerCase(ResponseText), LowerCase(LibraryGraphMgt.StripBrackets(Format(ExpenseActivityLogEntry.SystemId)))), 'The submitter timeline must contain the snapshot.');
@@ -511,7 +515,8 @@ codeunit 148343 "Expense Activity Log API Test"
         HistoryURL := LibraryGraphMgt.CreateTargetURLWithSubpage(
             Format(ApproverExpenseUser.SystemId), Page::"Expense Users API", ExpenseUsersServiceNameTok, ServiceNameTok);
         Clear(ResponseText);
-        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(ResponseText, HistoryURL + '?$filter=historyActorRole eq ''Approver''', 200);
+        LibraryGraphMgt.GetFromWebServiceAndCheckResponseCode(
+            ResponseText, LibraryGraphMgt.AppendQueryParameterToTargetURL(HistoryURL, '$filter=historyActorRole eq ''Approver'''), 200);
 
         // [THEN] The agent event must not grant approver participation.
         Assert.AreEqual(0, StrPos(LowerCase(ResponseText), LowerCase(LibraryGraphMgt.StripBrackets(Format(ExpenseReportHeader.SystemId)))), 'The agent snapshot must not grant approver history access.');
@@ -803,7 +808,9 @@ codeunit 148343 "Expense Activity Log API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense Activity Log API Test");
         LibraryERMCountryData.UpdateGeneralLedgerSetup();
         if not ExpenseAgentSetup.Get() then begin

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseAgentSetupAPITest.Codeunit.al

@@ -64,6 +64,9 @@ codeunit 148333 "Expense Agent Setup API Test"
         if IsInitialized then
             exit;
 
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense Agent Setup API Test");
         LibraryExpense.SetupNumberSeriesInExpenseMgmt();
         IsInitialized := true;

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseCapabilitiesAPITest.Codeunit.al

@@ -18,7 +18,6 @@ codeunit 148318 "Expense Capabilities API Test"
         LibraryExpenseAgent: Codeunit "Library - Expense Agent";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ServiceNameTok: Label 'expenseCapabilities', Locked = true;
         ActivityLogCapabilityNameTok: Label 'activityLog', Locked = true;
@@ -104,8 +103,6 @@ codeunit 148318 "Expense Capabilities API Test"
         TargetURL: Text;
         ResponseText: Text;
     begin
-        // Excluded in BCApps CI until authenticated OData execution in a dedicated test company
-        // with disabled isolation is available; then remove this method's DisabledTest.json entry.
         // [SCENARIO] Travel requests are advertised when the supporting APIs are installed.
         Initialize();
 
@@ -248,7 +245,9 @@ codeunit 148318 "Expense Capabilities API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense Capabilities API Test");
         IsInitialized := true;
         Commit();

src/Apps/W1/ExpenseAgent/test/src/API/ExpensePerDiemLocationsTest.Codeunit.al

@@ -17,7 +17,6 @@ codeunit 148349 "Expense PerDiem Locations Test"
         LibraryUtility: Codeunit "Library - Utility";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
 
     [Test]
@@ -82,11 +81,14 @@ codeunit 148349 "Expense PerDiem Locations Test"
 
     local procedure Initialize()
     begin
+        LibraryGraphMgt.SetLicenseSafeWorkDate();
         LibraryTestInitialize.OnTestInitialize(Codeunit::"Expense PerDiem Locations Test");
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense PerDiem Locations Test");
         IsInitialized := true;
         Commit();

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseProjectsAPITest.Codeunit.al

@@ -24,7 +24,6 @@ codeunit 148331 "Expense Projects API Test"
         LibraryHumanResource: Codeunit "Library - Human Resource";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ExpenseUsersServiceNameTok: Label 'expenseUsers', Locked = true;
         ProjectsServiceNameTok: Label 'expenseProjects', Locked = true;
@@ -723,7 +722,9 @@ codeunit 148331 "Expense Projects API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense Projects API Test");
         if not ExpenseAgentSetup.Get() then begin
             ExpenseAgentSetup.Init();

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseUsersAPITest.Codeunit.al

@@ -21,7 +21,6 @@ codeunit 148315 "Expense Users API Test"
         LibraryUtility: Codeunit "Library - Utility";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ServiceNameTok: Label 'expenseUsers', Locked = true;
         EmployeesServiceNameTok: Label 'employees', Locked = true;
@@ -125,7 +124,9 @@ codeunit 148315 "Expense Users API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense Users API Test");
         if not ExpenseAgentSetup.Get() then begin
             ExpenseAgentSetup.Init();

src/Apps/W1/ExpenseAgent/test/src/API/ExpenseVATSpecAPITest.Codeunit.al

@@ -11,6 +11,7 @@ codeunit 148348 "Expense VAT Spec. API Test"
 {
     Subtype = Test;
     TestType = IntegrationTest;
+    RequiredTestIsolation = Disabled;
     TestPermissions = Disabled;
 
     var
@@ -19,7 +20,6 @@ codeunit 148348 "Expense VAT Spec. API Test"
         LibraryERM: Codeunit "Library - ERM";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ServiceNameTok: Label 'expenseVATSpecifications', Locked = true;
 
@@ -89,7 +89,9 @@ codeunit 148348 "Expense VAT Spec. API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Expense VAT Spec. API Test");
         LibraryExpense.SetupNumberSeriesInExpenseMgmt();
         LibraryERM.CreateVATBusinessPostingGroup(VATBusinessPostingGroup);

src/Apps/W1/ExpenseAgent/test/src/API/PoliciesToEvaluateAPITest.Codeunit.al

@@ -18,7 +18,6 @@ codeunit 148345 "Policies To Evaluate API Test"
         LibraryExpense: Codeunit "Library - Expense";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ExpenseReportLinesServiceNameTok: Label 'expenseReportLines', Locked = true;
 
@@ -117,7 +116,9 @@ codeunit 148345 "Policies To Evaluate API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Policies To Evaluate API Test");
         LibraryERMCountryData.CreateVATData();
         LibraryERMCountryData.UpdateGeneralPostingSetup();

src/Apps/W1/ExpenseAgent/test/src/API/PolicyEvaluationsAPITest.Codeunit.al

@@ -18,7 +18,6 @@ codeunit 148344 "Policy Evaluations API Test"
         LibraryExpense: Codeunit "Library - Expense";
         LibraryGraphMgt: Codeunit "Library - Graph Mgt";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ServiceNameTok: Label 'expensePolicyEvaluations', Locked = true;
         BadRequestResponseErr: Label 'Response code is 400', Locked = true;
@@ -121,7 +120,9 @@ codeunit 148344 "Policy Evaluations API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Policy Evaluations API Test");
         LibraryERMCountryData.CreateVATData();
         LibraryERMCountryData.UpdateGeneralPostingSetup();

src/Apps/W1/ExpenseAgent/test/src/API/TravelRequestsAPITest.Codeunit.al

@@ -10,12 +10,6 @@ using Microsoft.Finance.GeneralLedger.Setup;
 using Microsoft.Finance.SpendRequest;
 using Microsoft.HumanResources.Employee;
 
-// These HTTP tests remain excluded in Expense_Agent_Tests.DisabledTest.json until the
-// authentication prerequisite provides an authenticated OData endpoint and a dedicated
-// test company with committed fixtures and disabled test isolation.
-// In-process employee filtering, traveler mapping/navigation, lifecycle, date, and scope coverage
-// in "Spend Request Test", and restrictive role coverage in "Expense Permissions Test", remain enabled.
-// Only the HTTP scenarios are excluded.
 codeunit 148347 "Travel Requests API Test"
 {
     Subtype = Test;
@@ -31,7 +25,6 @@ codeunit 148347 "Travel Requests API Test"
         LibraryHumanResource: Codeunit "Library - Human Resource";
         LibraryRandom: Codeunit "Library - Random";
         LibraryTestInitialize: Codeunit "Library - Test Initialize";
-        APITestAuthHelper: Codeunit "Expense API Test Auth Helper";
         IsInitialized: Boolean;
         ExpenseUsersServiceNameTok: Label 'expenseUsers', Locked = true;
 #if not CLEAN30
@@ -1291,7 +1284,9 @@ codeunit 148347 "Travel Requests API Test"
         if IsInitialized then
             exit;
 
-        BindSubscription(APITestAuthHelper);
+        LibraryGraphMgt.SetAuthenticationProvider(
+            Enum::"API Test Authentication"::"Microsoft Test Environment");
+
         LibraryTestInitialize.OnBeforeTestSuiteInitialize(Codeunit::"Travel Requests API Test");
         if not ExpenseAgentSetup.Get() then begin
             ExpenseAgentSetup.Init();