Skip to content

Commit 24b827d

Browse files
Add PowerBIEmbededTestRunner and replace Controller (Azure#18261)
1 parent d812b8a commit 24b827d

File tree

6 files changed

+125
-282
lines changed

6 files changed

+125
-282
lines changed
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System.Collections.Generic;
16+
using Microsoft.Azure.Commands.TestFx;
17+
using Xunit.Abstractions;
18+
19+
namespace Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests
20+
{
21+
public class PowerBITestRunner
22+
{
23+
protected readonly ITestRunner TestRunner;
24+
25+
protected PowerBITestRunner(ITestOutputHelper output)
26+
{
27+
TestRunner = TestManager.CreateInstance(output)
28+
.WithNewPsScriptFilename($"{GetType().Name}.ps1")
29+
.WithProjectSubfolderForTests("ScenarioTests")
30+
.WithCommonPsScripts(new[]
31+
{
32+
@"Common.ps1",
33+
@"../AzureRM.Resources.ps1"
34+
})
35+
.WithNewRmModules(helper => new[]
36+
{
37+
helper.RMProfileModule,
38+
helper.GetRMModulePath("Az.PowerBIEmbedded.psd1")
39+
})
40+
.WithNewRecordMatcherArguments(
41+
userAgentsToIgnore: new Dictionary<string, string>
42+
{
43+
{"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01"}
44+
},
45+
resourceProviders: new Dictionary<string, string>
46+
{
47+
{"Microsoft.Resources", null},
48+
{"Microsoft.Features", null},
49+
{"Microsoft.Authorization", null}
50+
}
51+
)
52+
.Build();
53+
}
54+
}
55+
}

src/PowerBIEmbedded/PowerBI.Test/ScenarioTests/PowerBITests.cs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,33 @@
1515
namespace Microsoft.Azure.Commands.PowerBI.Test.ScenarioTests
1616
{
1717
using Microsoft.WindowsAzure.Commands.ScenarioTest;
18-
using ServiceManagement.Common.Models;
1918
using Xunit;
2019

21-
public class PowerBITests : PowerBITestsBase
20+
public class PowerBITests : PowerBITestRunner
2221
{
23-
public XunitTracingInterceptor _logger;
24-
25-
public PowerBITests(Xunit.Abstractions.ITestOutputHelper output)
22+
public PowerBITests(Xunit.Abstractions.ITestOutputHelper output) : base(output)
2623
{
27-
_logger = new XunitTracingInterceptor(output);
28-
XunitTracingInterceptor.AddToContext(_logger);
2924
}
3025

3126
[Fact]
3227
[Trait(Category.AcceptanceType, Category.CheckIn)]
3328
public void TestPBIECapacity()
3429
{
35-
NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacity");
30+
TestRunner.RunTestScript("Test-PowerBIEmbeddedCapacity");
3631
}
3732

3833
[Fact]
3934
[Trait(Category.AcceptanceType, Category.CheckIn)]
4035
public void TestPBIECapacityScale()
4136
{
42-
NewInstance.RunPsTest(_logger, "Test-PowerBIEmbeddedCapacityScale");
37+
TestRunner.RunTestScript("Test-PowerBIEmbeddedCapacityScale");
4338
}
4439

4540
[Fact]
4641
[Trait(Category.AcceptanceType, Category.CheckIn)]
4742
public void TestNegativePBIECapacity()
4843
{
49-
NewInstance.RunPsTest(_logger, "Test-NegativePowerBIEmbeddedCapacity");
44+
TestRunner.RunTestScript("Test-NegativePowerBIEmbeddedCapacity");
5045
}
5146
}
5247
}

src/PowerBIEmbedded/PowerBI.Test/ScenarioTests/PowerBITestsBase.cs

Lines changed: 0 additions & 128 deletions
This file was deleted.

src/PowerBIEmbedded/PowerBIEmbedded.Test/ScenarioTests/PowerBIController.cs

Lines changed: 0 additions & 128 deletions
This file was deleted.

0 commit comments

Comments
 (0)