Skip to content

Commit

Permalink
removing testlocation argument from createtest
Browse files Browse the repository at this point in the history
  • Loading branch information
@NavneetThekkumpat
NavneetThekkumpat committed Jul 18, 2023
1 parent f991ad2 commit ea63c0e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 22 deletions.
26 changes: 11 additions & 15 deletions src/Microsoft.PowerApps.TestEngine.Tests/Reporting/TestReporterTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void ThrowsOnInvalidTestRunIdTest(string testRunId)
Assert.Throws<ArgumentException>(() => testReporter.GetTestRun(testRunId));
Assert.Throws<ArgumentException>(() => testReporter.StartTestRun(testRunId));
Assert.Throws<ArgumentException>(() => testReporter.EndTestRun(testRunId));
Assert.Throws<ArgumentException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "c:\\testplan.fx.yaml"));
Assert.Throws<ArgumentException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), Guid.NewGuid().ToString()));
Assert.Throws<ArgumentException>(() => testReporter.StartTest(testRunId, Guid.NewGuid().ToString()));
Assert.Throws<ArgumentException>(() => testReporter.EndTest(testRunId, Guid.NewGuid().ToString(), true, "", new List<string>(), null));
Assert.Throws<ArgumentException>(() => testReporter.GenerateTestReport(testRunId, "c:\\results"));
Expand Down Expand Up @@ -168,15 +168,15 @@ public void CreateTestTest()
var testRunId = testReporter.CreateTestRun(testRunName, testUser);
var testLocation = $"{TestReporter.ResultsPrefix}{testRunId}";

Assert.Throws<InvalidOperationException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation));
Assert.Throws<InvalidOperationException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName));

testReporter.StartTestRun(testRunId);

Assert.Throws<InvalidOperationException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation));
Assert.Throws<InvalidOperationException>(() => 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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -237,7 +237,7 @@ public void CreateTestTest()
Assert.Equal(2, testRun.ResultSummary.Counters.Total);

testReporter.EndTestRun(testRunId);
Assert.Throws<InvalidOperationException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName, testLocation));
Assert.Throws<InvalidOperationException>(() => testReporter.CreateTest(testRunId, Guid.NewGuid().ToString(), testName));
}

[Fact]
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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<InvalidOperationException>(() => testReporter.EndTest(testRunId, testId, success, stdout, additionalFiles.ToList(), errorMessage));

Expand Down Expand Up @@ -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);

Expand All @@ -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);
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerApps.TestEngine.Tests/SingleTestRunnerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void SetupMocks(string testRunId, string testSuiteId, string testId, str
LoggingTestHelper.SetupMock(MockLogger);
MockLogger.Setup(x => x.BeginScope(It.IsAny<string>())).Returns(new TestLoggerScope("", () => { }));

MockTestReporter.Setup(x => x.CreateTest(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(testId);
MockTestReporter.Setup(x => x.CreateTest(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(testId);
MockTestReporter.Setup(x => x.CreateTestSuite(It.IsAny<string>(), It.IsAny<string>())).Returns(testSuiteId);
MockTestReporter.Setup(x => x.StartTest(It.IsAny<string>(), It.IsAny<string>()));
MockTestReporter.Setup(x => x.EndTest(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>(), It.IsAny<string>(), It.IsAny<List<string>>(), It.IsAny<string>()));
Expand Down Expand Up @@ -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());
Expand Down
3 changes: 1 addition & 2 deletions src/Microsoft.PowerApps.TestEngine/Reporting/ITestReporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,8 @@ public interface ITestReporter
/// <param name="testRunId">Test run id</param>
/// <param name="testSuiteId">Test suite id</param>
/// <param name="testName">Name of test</param>
/// <param name="testLocation">Location of test file</param>
/// <returns>Test id</returns>
public string CreateTest(string testRunId, string testSuiteId, string testName, string testLocation);
public string CreateTest(string testRunId, string testSuiteId, string testName);

/// <summary>
/// Starts test. This records the start time of the test.
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerApps.TestEngine/Reporting/TestReporter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerApps.TestEngine/SingleTestRunner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}
}
Expand Down

0 comments on commit ea63c0e

Please sign in to comment.