Skip to content

Commit 34effd3

Browse files
yugangw-msftyugangw-msft
committed
Merge pull request #677 from bgold09/sprint53
ADF- rename Table to Dataset for ADF
2 parents 648c7ba + b39ec20 commit 34effd3

33 files changed

+493
-410
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 84 additions & 0 deletions
Large diffs are not rendered by default.

‎src/ResourceManager.sln

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,10 @@ Global
149149
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
150150
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
151151
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
152-
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153-
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
154-
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
155-
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153+
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.Build.0 = Debug|Any CPU
154+
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.ActiveCfg = Release|Any CPU
155+
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.Build.0 = Release|Any CPU
156156
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
157157
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
158158
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -198,7 +198,6 @@ Global
198198
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
199199
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
200200
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
201-
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
202201
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
203202
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
204203
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
<SpecificVersion>False</SpecificVersion>
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.Management.DataFactories">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.2\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -148,7 +148,7 @@
148148
<Compile Include="UnitTests\GetDataFactoryGatewayTests.cs" />
149149
<Compile Include="ScenarioTests\TableTests.cs" />
150150
<Compile Include="UnitTests\GetPipelineTests.cs" />
151-
<Compile Include="UnitTests\GetTableTests.cs" />
151+
<Compile Include="UnitTests\GetDatasetTests.cs" />
152152
<Compile Include="UnitTests\GetLinkedServiceTests.cs" />
153153
<Compile Include="UnitTests\GetDataFactoryTests.cs" />
154154
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -161,10 +161,10 @@
161161
<Compile Include="UnitTests\NewDataFactoryTests.cs" />
162162
<Compile Include="UnitTests\NewPipelineTests.cs" />
163163
<Compile Include="UnitTests\RemoveAzureDataFactoryGatewayTests.cs" />
164-
<Compile Include="UnitTests\NewTableTests.cs" />
164+
<Compile Include="UnitTests\NewDatasetTests.cs" />
165165
<Compile Include="UnitTests\RemoveHubTests.cs" />
166166
<Compile Include="UnitTests\RemovePipelineTests.cs" />
167-
<Compile Include="UnitTests\RemoveTableTests.cs" />
167+
<Compile Include="UnitTests\RemoveDatasetTests.cs" />
168168
<Compile Include="UnitTests\RemoveLinkedServiceTests.cs" />
169169
<Compile Include="UnitTests\RemoveDataFactoryTests.cs" />
170170
<Compile Include="UnitTests\SaveAzureDataFactoryTests.cs" />
@@ -184,7 +184,7 @@
184184
<None Include="Resources\pipeline.json">
185185
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
186186
</None>
187-
<None Include="Resources\table.json">
187+
<None Include="Resources\dataset.json">
188188
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
189189
</None>
190190
<None Include="ScenarioTests\Common.ps1">

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json renamed to ‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/dataset.json

File renamed without changes.

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
<#
1616
.SYNOPSIS
17-
Create a table and the linked service which it depends on. Then do a Get to compare the result are identical.
18-
Delete the created table after test finishes.
17+
Create a dataset and the linked service which it depends on. Then do a Get to compare the result are identical.
18+
Delete the created dataset after test finishes.
1919
#>
2020
function Test-Table
2121
{
@@ -32,15 +32,15 @@ function Test-Table
3232

3333
New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force
3434

35-
$tblname = "foo2"
36-
$actual = New-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -File .\Resources\table.json -Force
37-
$expected = Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname
35+
$datasetname = "foo2"
36+
$actual = New-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -File .\Resources\dataset.json -Force
37+
$expected = Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname
3838

3939
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
4040
Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName
41-
Assert-AreEqual $expected.TableName $actual.TableName
41+
Assert-AreEqual $expected.DatasetName $actual.DatasetName
4242

43-
Remove-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -Force
43+
Remove-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -Force
4444
}
4545
finally
4646
{
@@ -50,8 +50,8 @@ function Test-Table
5050

5151
<#
5252
.SYNOPSIS
53-
Create a table and the linked service which it depends on. Then do a Get to compare the result are identical.
54-
Delete the created table after test finishes.
53+
Create a dataset and the linked service which it depends on. Then do a Get to compare the result are identical.
54+
Delete the created dataset after test finishes.
5555
Use -DataFactory parameter in all cmdlets.
5656
#>
5757
function Test-TableWithDataFactoryParameter
@@ -69,15 +69,15 @@ function Test-TableWithDataFactoryParameter
6969

7070
New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force
7171

72-
$tblname = "foo2"
73-
$actual = New-AzureDataFactoryTable -DataFactory $df -Name $tblname -File .\Resources\table.json -Force
74-
$expected = Get-AzureDataFactoryTable -DataFactory $df -Name $tblname
72+
$datasetname = "foo2"
73+
$actual = New-AzureDataFactoryDataset -DataFactory $df -Name $datasetname -File .\Resources\dataset.json -Force
74+
$expected = Get-AzureDataFactoryDataset -DataFactory $df -Name $datasetname
7575

7676
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
7777
Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName
78-
Assert-AreEqual $expected.TableName $actual.TableName
78+
Assert-AreEqual $expected.DatasetName $actual.DatasetName
7979

80-
Remove-AzureDataFactoryTable -DataFactory $df -Name $tblname -Force
80+
Remove-AzureDataFactoryDataset -DataFactory $df -Name $datasetname -Force
8181
}
8282
finally
8383
{
@@ -104,13 +104,14 @@ function Test-TablePiping
104104

105105
New-AzureDataFactoryLinkedService -ResourceGroupName $rgname -DataFactoryName $dfname -File .\Resources\linkedService.json -Force
106106

107-
$tblname = "foo2"
108-
New-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -File .\Resources\table.json -Force
107+
$datasetname = "foo2"
108+
New-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -File .\Resources\dataset.json -Force
109109

110-
Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname | Remove-AzureDataFactoryTable -Force
110+
Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname | Remove-AzureDataFactoryDataset -Force
111111

112-
# Test the table no longer exists
113-
Assert-ThrowsContains { Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname } "TableNotFound"
112+
# Test the dataset no longer exists
113+
# TODO bgold09: change expected error message to "DatasetNotFound" after service error messages have been updated
114+
Assert-ThrowsContains { Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname } "TableNotFound"
114115
}
115116
finally
116117
{

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetTableTests.cs renamed to ‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/GetDatasetTests.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222

2323
namespace Microsoft.Azure.Commands.DataFactories.Test
2424
{
25-
public class GetTableTests : DataFactoryUnitTestBase
25+
public class GetDatasetTests : DataFactoryUnitTestBase
2626
{
27-
private const string tableName = "foo";
27+
private const string datasetName = "foo";
2828

29-
private GetAzureDataFactoryTableCommand cmdlet;
29+
private GetAzureDataFactoryDatasetCommand cmdlet;
3030

31-
public GetTableTests()
31+
public GetDatasetTests()
3232
{
3333
base.SetupTest();
3434

35-
cmdlet = new GetAzureDataFactoryTableCommand()
35+
cmdlet = new GetAzureDataFactoryDatasetCommand()
3636
{
3737
CommandRuntime = commandRuntimeMock.Object,
3838
DataFactoryClient = dataFactoriesClientMock.Object,
@@ -43,30 +43,30 @@ public GetTableTests()
4343

4444
[Fact]
4545
[Trait(Category.AcceptanceType, Category.CheckIn)]
46-
public void CanGetTable()
46+
public void CanGetDataset()
4747
{
4848
// Arrange
49-
PSTable expected = new PSTable()
49+
PSDataset expected = new PSDataset()
5050
{
51-
TableName = tableName,
51+
DatasetName = datasetName,
5252
DataFactoryName = DataFactoryName,
5353
ResourceGroupName = ResourceGroupName
5454
};
5555

5656
dataFactoriesClientMock
5757
.Setup(
5858
c =>
59-
c.FilterPSTables(
60-
It.Is<TableFilterOptions>(
59+
c.FilterPSDatasets(
60+
It.Is<DatasetFilterOptions>(
6161
options =>
6262
options.ResourceGroupName == ResourceGroupName &&
6363
options.DataFactoryName == DataFactoryName &&
64-
options.Name == tableName)))
64+
options.Name == datasetName)))
6565
.CallBase()
6666
.Verifiable();
6767

6868
dataFactoriesClientMock
69-
.Setup(c => c.GetTable(ResourceGroupName, DataFactoryName, tableName))
69+
.Setup(c => c.GetDataset(ResourceGroupName, DataFactoryName, datasetName))
7070
.Returns(expected)
7171
.Verifiable();
7272

@@ -77,7 +77,7 @@ public void CanGetTable()
7777
cmdlet.Name = "";
7878
Exception empty = Assert.Throws<PSArgumentNullException>(() => cmdlet.ExecuteCmdlet());
7979

80-
cmdlet.Name = tableName;
80+
cmdlet.Name = datasetName;
8181
cmdlet.ExecuteCmdlet();
8282

8383
// Assert
@@ -89,20 +89,20 @@ public void CanGetTable()
8989

9090
[Fact]
9191
[Trait(Category.AcceptanceType, Category.CheckIn)]
92-
public void CanListTables()
92+
public void CanListDatasets()
9393
{
9494
// Arrange
95-
List<PSTable> expected = new List<PSTable>()
95+
List<PSDataset> expected = new List<PSDataset>()
9696
{
97-
new PSTable()
97+
new PSDataset()
9898
{
99-
TableName = tableName,
99+
DatasetName = datasetName,
100100
DataFactoryName = DataFactoryName,
101101
ResourceGroupName = ResourceGroupName
102102
},
103-
new PSTable()
103+
new PSDataset()
104104
{
105-
TableName = "anotherTable",
105+
DatasetName = "anotherDataset",
106106
DataFactoryName = DataFactoryName,
107107
ResourceGroupName = ResourceGroupName
108108
}
@@ -111,8 +111,8 @@ public void CanListTables()
111111
dataFactoriesClientMock
112112
.Setup(
113113
c =>
114-
c.FilterPSTables(
115-
It.Is<TableFilterOptions>(
114+
c.FilterPSDatasets(
115+
It.Is<DatasetFilterOptions>(
116116
options =>
117117
options.ResourceGroupName == ResourceGroupName &&
118118
options.DataFactoryName == DataFactoryName &&
@@ -122,7 +122,7 @@ public void CanListTables()
122122
.Verifiable();
123123

124124
dataFactoriesClientMock
125-
.Setup(f => f.ListTables(It.Is<TableFilterOptions>(
125+
.Setup(f => f.ListDatasets(It.Is<DatasetFilterOptions>(
126126
options =>
127127
options.ResourceGroupName == ResourceGroupName &&
128128
options.DataFactoryName == DataFactoryName &&

‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs renamed to ‎src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDatasetTests.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
namespace Microsoft.Azure.Commands.DataFactories.Test.UnitTests
2222
{
23-
public class NewTableTests : DataFactoryUnitTestBase
23+
public class NewDatasetTests : DataFactoryUnitTestBase
2424
{
25-
private const string tableName = "foo1";
25+
private const string datasetName = "foo1";
2626

27-
private const string filePath = "table.json";
27+
private const string filePath = "dataset.json";
2828

2929
private const string rawJsonContent = @"
3030
{
@@ -52,17 +52,17 @@ public class NewTableTests : DataFactoryUnitTestBase
5252
}
5353
";
5454

55-
private NewAzureDataFactoryTableCommand cmdlet;
55+
private NewAzureDataFactoryDatasetCommand cmdlet;
5656

57-
public NewTableTests()
57+
public NewDatasetTests()
5858
{
5959
base.SetupTest();
6060

61-
cmdlet = new NewAzureDataFactoryTableCommand()
61+
cmdlet = new NewAzureDataFactoryDatasetCommand()
6262
{
6363
CommandRuntime = commandRuntimeMock.Object,
6464
DataFactoryClient = dataFactoriesClientMock.Object,
65-
Name = tableName,
65+
Name = datasetName,
6666
DataFactoryName = DataFactoryName,
6767
ResourceGroupName = ResourceGroupName
6868
};
@@ -71,12 +71,12 @@ public NewTableTests()
7171
// ToDo: enable the tests when we can set readonly provisioning state in test
7272
//[Fact]
7373
//[Trait(Category.AcceptanceType, Category.CheckIn)]
74-
public void CanCreateTable()
74+
public void CanCreateDataset()
7575
{
7676
// Arrange
7777
Table expected = new Table()
7878
{
79-
Name = tableName,
79+
Name = datasetName,
8080
Properties = new TableProperties()
8181
};
8282

@@ -86,18 +86,18 @@ public void CanCreateTable()
8686

8787
dataFactoriesClientMock.Setup(
8888
c =>
89-
c.CreatePSTable(
90-
It.Is<CreatePSTableParameters>(
89+
c.CreatePSDataset(
90+
It.Is<CreatePSDatasetParameters>(
9191
parameters =>
92-
parameters.Name == tableName &&
92+
parameters.Name == datasetName &&
9393
parameters.ResourceGroupName == ResourceGroupName &&
9494
parameters.DataFactoryName == DataFactoryName)))
9595
.CallBase()
9696
.Verifiable();
9797

9898
dataFactoriesClientMock.Setup(
9999
c =>
100-
c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent))
100+
c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent))
101101
.Returns(expected)
102102
.Verifiable();
103103

@@ -112,22 +112,22 @@ public void CanCreateTable()
112112
commandRuntimeMock.Verify(
113113
f =>
114114
f.WriteObject(
115-
It.Is<PSTable>(
115+
It.Is<PSDataset>(
116116
tbl =>
117117
ResourceGroupName == tbl.ResourceGroupName &&
118118
DataFactoryName == tbl.DataFactoryName &&
119-
expected.Name == tbl.TableName)),
119+
expected.Name == tbl.DatasetName)),
120120
Times.Once());
121121
}
122122

123123
[Fact]
124124
[Trait(Category.AcceptanceType, Category.CheckIn)]
125-
public void CanThrowIfTableProvisioningFailed()
125+
public void CanThrowIfDatasetProvisioningFailed()
126126
{
127127
// Arrange
128128
Table expected = new Table()
129129
{
130-
Name = tableName,
130+
Name = datasetName,
131131
Properties = new TableProperties()
132132
};
133133

@@ -137,18 +137,18 @@ public void CanThrowIfTableProvisioningFailed()
137137

138138
dataFactoriesClientMock.Setup(
139139
c =>
140-
c.CreatePSTable(
141-
It.Is<CreatePSTableParameters>(
140+
c.CreatePSDataset(
141+
It.Is<CreatePSDatasetParameters>(
142142
parameters =>
143-
parameters.Name == tableName &&
143+
parameters.Name == datasetName &&
144144
parameters.ResourceGroupName == ResourceGroupName &&
145145
parameters.DataFactoryName == DataFactoryName)))
146146
.CallBase()
147147
.Verifiable();
148148

149149
dataFactoriesClientMock.Setup(
150150
c =>
151-
c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent))
151+
c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent))
152152
.Returns(expected)
153153
.Verifiable();
154154

0 commit comments

Comments
 (0)