diff --git a/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestReporterTests.cs b/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestReporterTests.cs index 01f70f9c..13bb2c98 100644 --- a/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestReporterTests.cs +++ b/src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestReporterTests.cs @@ -37,7 +37,7 @@ public void ThrowsOnInvalidTestRunIdTest(string testRunId) Assert.Throws(() => testReporter.GetTestRun(testRunId)); Assert.Throws(() => testReporter.StartTestRun(testRunId)); Assert.Throws(() => testReporter.EndTestRun(testRunId)); - Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "c:\\testplan.fx.yaml")); + Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), Guid.NewGuid().ToString())); Assert.Throws(() => testReporter.StartTest(testRunId, Guid.NewGuid().ToString())); Assert.Throws(() => testReporter.EndTest(testRunId, Guid.NewGuid().ToString(), true, "", new List(), null)); Assert.Throws(() => testReporter.GenerateTestReport(testRunId, "c:\\results")); @@ -168,15 +168,15 @@ public void CreateTestTest() var testRunId = testReporter.CreateTestRun(testRunName, testUser); var testLocation = $"{TestReporter.ResultsPrefix}{testRunId}"; - Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation)); + Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName)); testReporter.StartTestRun(testRunId); - Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation)); + Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName)); var testSuiteId = testReporter.CreateTestSuite(testRunId, testSuiteName); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, testLocation); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); var testRun = testReporter.GetTestRun(testRunId); @@ -207,7 +207,7 @@ public void CreateTestTest() var testName2 = "testName2"; var testLocation2 = $"{TestReporter.ResultsPrefix}{testRunId}"; - var testId2 = testReporter.CreateTest(testRunId, testSuiteId, testName2, testLocation); + var testId2 = testReporter.CreateTest(testRunId, testSuiteId, testName2); testRun = testReporter.GetTestRun(testRunId); @@ -237,7 +237,7 @@ public void CreateTestTest() Assert.Equal(2, testRun.ResultSummary.Counters.Total); testReporter.EndTestRun(testRunId); - Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation)); + Assert.Throws(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName)); } [Fact] @@ -251,7 +251,7 @@ public void CreateTestStorageNameTest() var testRunId = testReporter.CreateTestRun(testRunName, testUser); testReporter.StartTestRun(testRunId); var testSuiteId = testReporter.CreateTestSuite(testRunId, testSuiteName); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, ""); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); var testRun = testReporter.GetTestRun(testRunId); Assert.Equal($"{TestReporter.ResultsPrefix}{testRunId}", testRun.Definitions.UnitTests[0].Storage); @@ -264,14 +264,13 @@ public void StartTestTest() var testRunName = "testRunName"; var testUser = "testUser"; var testName = "testName"; - var testLocation = "C:\\testplan.fx.yaml"; var testReporter = new TestReporter(MockFileSystem.Object); var testRunId = testReporter.CreateTestRun(testRunName, testUser); testReporter.StartTestRun(testRunId); var testSuiteId = testReporter.CreateTestSuite(testRunId, "testSuite"); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, testLocation); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); var before = DateTime.Now; testReporter.StartTest(testRunId, testId); @@ -296,14 +295,13 @@ public void EndTestTest(bool success, string stdout, string[] additionalFiles, s var testRunName = "testRunName"; var testUser = "testUser"; var testName = "testName"; - var testLocation = "C:\\testplan.fx.yaml"; var testReporter = new TestReporter(MockFileSystem.Object); var testRunId = testReporter.CreateTestRun(testRunName, testUser); testReporter.StartTestRun(testRunId); var testSuiteId = testReporter.CreateTestSuite(testRunId, "testSuite"); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, testLocation); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); Assert.Throws(() => testReporter.EndTest(testRunId, testId, success, stdout, additionalFiles.ToList(), errorMessage)); @@ -353,14 +351,13 @@ public void FailTestTest() var testRunName = "testRunName"; var testUser = "testUser"; var testName = "testName"; - var testLocation = "C:\\testplan.fx.yaml"; var testReporter = new TestReporter(MockFileSystem.Object); var testRunId = testReporter.CreateTestRun(testRunName, testUser); testReporter.StartTestRun(testRunId); var testSuiteId = testReporter.CreateTestSuite(testRunId, "testSuite"); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, testLocation); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); testReporter.FailTest(testRunId, testId); @@ -380,7 +377,6 @@ public void GenerateTestReportTest() var testRunName = "testRunName"; var testUser = "testUser"; var testName = "testName"; - var testLocation = "C:\\testplan.fx.yaml"; var resultDirectory = "C:\\results"; var testReporter = new TestReporter(MockFileSystem.Object); var testRunId = testReporter.CreateTestRun(testRunName, testUser); @@ -390,7 +386,7 @@ public void GenerateTestReportTest() testReporter.StartTestRun(testRunId); var testSuiteId = testReporter.CreateTestSuite(testRunId, "testSuite"); - var testId = testReporter.CreateTest(testRunId, testSuiteId, testName, testLocation); + var testId = testReporter.CreateTest(testRunId, testSuiteId, testName); testReporter.StartTest(testRunId, testId); diff --git a/src/Microsoft.PowerApps.TestEngine.Tests/SingleTestRunnerTests.cs b/src/Microsoft.PowerApps.TestEngine.Tests/SingleTestRunnerTests.cs index 04a3db11..55fc7053 100644 --- a/src/Microsoft.PowerApps.TestEngine.Tests/SingleTestRunnerTests.cs +++ b/src/Microsoft.PowerApps.TestEngine.Tests/SingleTestRunnerTests.cs @@ -60,7 +60,7 @@ private void SetupMocks(string testRunId, string testSuiteId, string testId, str LoggingTestHelper.SetupMock(MockLogger); MockLogger.Setup(x => x.BeginScope(It.IsAny())).Returns(new TestLoggerScope("", () => { })); - MockTestReporter.Setup(x => x.CreateTest(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())).Returns(testId); + MockTestReporter.Setup(x => x.CreateTest(It.IsAny(), It.IsAny(), It.IsAny())).Returns(testId); MockTestReporter.Setup(x => x.CreateTestSuite(It.IsAny(), It.IsAny())).Returns(testSuiteId); MockTestReporter.Setup(x => x.StartTest(It.IsAny(), It.IsAny())); MockTestReporter.Setup(x => x.EndTest(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny>(), It.IsAny())); @@ -147,7 +147,7 @@ private void VerifySuccessfulTestExecution(string testResultDirectory, TestSuite MockUrlMapper.Verify(x => x.GenerateTestUrl("", ""), Times.Once()); MockTestInfraFunctions.Verify(x => x.GoToUrlAsync(appUrl), Times.Once()); MockTestState.Verify(x => x.GetTestSuiteDefinition(), Times.Exactly(2)); - MockTestReporter.Verify(x => x.CreateTest(testRunId, testSuiteId, testSuiteDefinition.TestCases[0].TestCaseName, "TODO"), Times.Once()); + MockTestReporter.Verify(x => x.CreateTest(testRunId, testSuiteId, testSuiteDefinition.TestCases[0].TestCaseName), Times.Once()); MockTestReporter.Verify(x => x.StartTest(testRunId, testId), Times.Once()); MockTestState.Verify(x => x.SetTestId(testId), Times.Once()); MockLoggerFactory.Verify(x => x.CreateLogger(testSuiteId), Times.Once()); diff --git a/src/Microsoft.PowerApps.TestEngine/Reporting/ITestReporter.cs b/src/Microsoft.PowerApps.TestEngine/Reporting/ITestReporter.cs index 7283eb8f..8e471b55 100644 --- a/src/Microsoft.PowerApps.TestEngine/Reporting/ITestReporter.cs +++ b/src/Microsoft.PowerApps.TestEngine/Reporting/ITestReporter.cs @@ -44,9 +44,8 @@ public interface ITestReporter /// Test run id /// Test suite id /// Name of test - /// Location of test file /// Test id - public string CreateTest(string testRunId, string testSuiteId, string testName, string testLocation); + public string CreateTest(string testRunId, string testSuiteId, string testName); /// /// Starts test. This records the start time of the test. diff --git a/src/Microsoft.PowerApps.TestEngine/Reporting/TestReporter.cs b/src/Microsoft.PowerApps.TestEngine/Reporting/TestReporter.cs index 9a001852..333259e5 100644 --- a/src/Microsoft.PowerApps.TestEngine/Reporting/TestReporter.cs +++ b/src/Microsoft.PowerApps.TestEngine/Reporting/TestReporter.cs @@ -146,7 +146,7 @@ private bool DoesTestSuiteExist(TestRun testRun, string testSuiteId) return testRun.TestLists.TestList.Where(x => x.Id == testSuiteId).Count() == 1; } - public string CreateTest(string testRunId, string testSuiteId, string testName, string testLocation) + public string CreateTest(string testRunId, string testSuiteId, string testName) { var testRun = GetTestRun(testRunId); diff --git a/src/Microsoft.PowerApps.TestEngine/SingleTestRunner.cs b/src/Microsoft.PowerApps.TestEngine/SingleTestRunner.cs index f82427d1..36fee3e0 100644 --- a/src/Microsoft.PowerApps.TestEngine/SingleTestRunner.cs +++ b/src/Microsoft.PowerApps.TestEngine/SingleTestRunner.cs @@ -139,7 +139,7 @@ public async Task RunTestAsync(string testRunId, string testRunDirectory, TestSu _eventHandler.TestCaseBegin(testCase.TestCaseName); TestSuccess = true; - var testId = _testReporter.CreateTest(testRunId, testSuiteId, $"{testCase.TestCaseName}", "TODO"); + var testId = _testReporter.CreateTest(testRunId, testSuiteId, $"{testCase.TestCaseName}"); _testReporter.StartTest(testRunId, testId); _testState.SetTestId(testId); @@ -242,7 +242,7 @@ public async Task RunTestAsync(string testRunId, string testRunDirectory, TestSu // Run test case one by one, mark it as failed foreach (var testCase in _testState.GetTestSuiteDefinition().TestCases) { - var testId = _testReporter.CreateTest(testRunId, testSuiteId, $"{testCase.TestCaseName}", "TODO"); + var testId = _testReporter.CreateTest(testRunId, testSuiteId, $"{testCase.TestCaseName}"); _testReporter.FailTest(testRunId, testId); } }