Skip to content

ADF- rename Table to Dataset for ADF #677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2015
Merged

ADF- rename Table to Dataset for ADF #677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions setup/azurecmdfiles.wxi
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/ResourceManager.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@ Global
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}.Release|Any CPU.Build.0 = Release|Any CPU
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.Build.0 = Release|Any CPU
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -198,7 +198,6 @@ Global
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
Expand Down
12 changes: 6 additions & 6 deletions ...ourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.19.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.DataFactories">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.1\lib\net40\Microsoft.Azure.Management.DataFactories.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.DataFactories, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.DataFactories.1.0.2\lib\net45\Microsoft.Azure.Management.DataFactories.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
Expand Down Expand Up @@ -148,7 +148,7 @@
<Compile Include="UnitTests\GetDataFactoryGatewayTests.cs" />
<Compile Include="ScenarioTests\TableTests.cs" />
<Compile Include="UnitTests\GetPipelineTests.cs" />
<Compile Include="UnitTests\GetTableTests.cs" />
<Compile Include="UnitTests\GetDatasetTests.cs" />
<Compile Include="UnitTests\GetLinkedServiceTests.cs" />
<Compile Include="UnitTests\GetDataFactoryTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -161,10 +161,10 @@
<Compile Include="UnitTests\NewDataFactoryTests.cs" />
<Compile Include="UnitTests\NewPipelineTests.cs" />
<Compile Include="UnitTests\RemoveAzureDataFactoryGatewayTests.cs" />
<Compile Include="UnitTests\NewTableTests.cs" />
<Compile Include="UnitTests\NewDatasetTests.cs" />
<Compile Include="UnitTests\RemoveHubTests.cs" />
<Compile Include="UnitTests\RemovePipelineTests.cs" />
<Compile Include="UnitTests\RemoveTableTests.cs" />
<Compile Include="UnitTests\RemoveDatasetTests.cs" />
<Compile Include="UnitTests\RemoveLinkedServiceTests.cs" />
<Compile Include="UnitTests\RemoveDataFactoryTests.cs" />
<Compile Include="UnitTests\SaveAzureDataFactoryTests.cs" />
Expand All @@ -184,7 +184,7 @@
<None Include="Resources\pipeline.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\table.json">
<None Include="Resources\dataset.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\Common.ps1">
Expand Down
0 ...s.DataFactories.Test/Resources/table.json → ...DataFactories.Test/Resources/dataset.json
View file
Open in desktop
File renamed without changes.
39 changes: 20 additions & 19 deletions src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

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

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

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

Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName
Assert-AreEqual $expected.TableName $actual.TableName
Assert-AreEqual $expected.DatasetName $actual.DatasetName

Remove-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname -Force
Remove-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname -Force
}
finally
{
Expand All @@ -50,8 +50,8 @@ function Test-Table

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

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

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

Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
Assert-AreEqual $expected.DataFactoryName $actual.DataFactoryName
Assert-AreEqual $expected.TableName $actual.TableName
Assert-AreEqual $expected.DatasetName $actual.DatasetName

Remove-AzureDataFactoryTable -DataFactory $df -Name $tblname -Force
Remove-AzureDataFactoryDataset -DataFactory $df -Name $datasetname -Force
}
finally
{
Expand All @@ -104,13 +104,14 @@ function Test-TablePiping

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

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

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

# Test the table no longer exists
Assert-ThrowsContains { Get-AzureDataFactoryTable -ResourceGroupName $rgname -DataFactoryName $dfname -Name $tblname } "TableNotFound"
# Test the dataset no longer exists
# TODO bgold09: change expected error message to "DatasetNotFound" after service error messages have been updated
Assert-ThrowsContains { Get-AzureDataFactoryDataset -ResourceGroupName $rgname -DataFactoryName $dfname -Name $datasetname } "TableNotFound"
}
finally
{
Expand Down
44 changes: 22 additions & 22 deletions ...Factories.Test/UnitTests/GetTableTests.cs → ...ctories.Test/UnitTests/GetDatasetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@

namespace Microsoft.Azure.Commands.DataFactories.Test
{
public class GetTableTests : DataFactoryUnitTestBase
public class GetDatasetTests : DataFactoryUnitTestBase
{
private const string tableName = "foo";
private const string datasetName = "foo";

private GetAzureDataFactoryTableCommand cmdlet;
private GetAzureDataFactoryDatasetCommand cmdlet;

public GetTableTests()
public GetDatasetTests()
{
base.SetupTest();

cmdlet = new GetAzureDataFactoryTableCommand()
cmdlet = new GetAzureDataFactoryDatasetCommand()
{
CommandRuntime = commandRuntimeMock.Object,
DataFactoryClient = dataFactoriesClientMock.Object,
Expand All @@ -43,30 +43,30 @@ public GetTableTests()

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void CanGetTable()
public void CanGetDataset()
{
// Arrange
PSTable expected = new PSTable()
PSDataset expected = new PSDataset()
{
TableName = tableName,
DatasetName = datasetName,
DataFactoryName = DataFactoryName,
ResourceGroupName = ResourceGroupName
};

dataFactoriesClientMock
.Setup(
c =>
c.FilterPSTables(
It.Is<TableFilterOptions>(
c.FilterPSDatasets(
It.Is<DatasetFilterOptions>(
options =>
options.ResourceGroupName == ResourceGroupName &&
options.DataFactoryName == DataFactoryName &&
options.Name == tableName)))
options.Name == datasetName)))
.CallBase()
.Verifiable();

dataFactoriesClientMock
.Setup(c => c.GetTable(ResourceGroupName, DataFactoryName, tableName))
.Setup(c => c.GetDataset(ResourceGroupName, DataFactoryName, datasetName))
.Returns(expected)
.Verifiable();

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

cmdlet.Name = tableName;
cmdlet.Name = datasetName;
cmdlet.ExecuteCmdlet();

// Assert
Expand All @@ -89,20 +89,20 @@ public void CanGetTable()

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void CanListTables()
public void CanListDatasets()
{
// Arrange
List<PSTable> expected = new List<PSTable>()
List<PSDataset> expected = new List<PSDataset>()
{
new PSTable()
new PSDataset()
{
TableName = tableName,
DatasetName = datasetName,
DataFactoryName = DataFactoryName,
ResourceGroupName = ResourceGroupName
},
new PSTable()
new PSDataset()
{
TableName = "anotherTable",
DatasetName = "anotherDataset",
DataFactoryName = DataFactoryName,
ResourceGroupName = ResourceGroupName
}
Expand All @@ -111,8 +111,8 @@ public void CanListTables()
dataFactoriesClientMock
.Setup(
c =>
c.FilterPSTables(
It.Is<TableFilterOptions>(
c.FilterPSDatasets(
It.Is<DatasetFilterOptions>(
options =>
options.ResourceGroupName == ResourceGroupName &&
options.DataFactoryName == DataFactoryName &&
Expand All @@ -122,7 +122,7 @@ public void CanListTables()
.Verifiable();

dataFactoriesClientMock
.Setup(f => f.ListTables(It.Is<TableFilterOptions>(
.Setup(f => f.ListDatasets(It.Is<DatasetFilterOptions>(
options =>
options.ResourceGroupName == ResourceGroupName &&
options.DataFactoryName == DataFactoryName &&
Expand Down
42 changes: 21 additions & 21 deletions ...Factories.Test/UnitTests/NewTableTests.cs → ...ctories.Test/UnitTests/NewDatasetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace Microsoft.Azure.Commands.DataFactories.Test.UnitTests
{
public class NewTableTests : DataFactoryUnitTestBase
public class NewDatasetTests : DataFactoryUnitTestBase
{
private const string tableName = "foo1";
private const string datasetName = "foo1";

private const string filePath = "table.json";
private const string filePath = "dataset.json";

private const string rawJsonContent = @"
{
Expand Down Expand Up @@ -52,17 +52,17 @@ public class NewTableTests : DataFactoryUnitTestBase
}
";

private NewAzureDataFactoryTableCommand cmdlet;
private NewAzureDataFactoryDatasetCommand cmdlet;

public NewTableTests()
public NewDatasetTests()
{
base.SetupTest();

cmdlet = new NewAzureDataFactoryTableCommand()
cmdlet = new NewAzureDataFactoryDatasetCommand()
{
CommandRuntime = commandRuntimeMock.Object,
DataFactoryClient = dataFactoriesClientMock.Object,
Name = tableName,
Name = datasetName,
DataFactoryName = DataFactoryName,
ResourceGroupName = ResourceGroupName
};
Expand All @@ -71,12 +71,12 @@ public NewTableTests()
// ToDo: enable the tests when we can set readonly provisioning state in test
//[Fact]
//[Trait(Category.AcceptanceType, Category.CheckIn)]
public void CanCreateTable()
public void CanCreateDataset()
{
// Arrange
Table expected = new Table()
{
Name = tableName,
Name = datasetName,
Properties = new TableProperties()
};

Expand All @@ -86,18 +86,18 @@ public void CanCreateTable()

dataFactoriesClientMock.Setup(
c =>
c.CreatePSTable(
It.Is<CreatePSTableParameters>(
c.CreatePSDataset(
It.Is<CreatePSDatasetParameters>(
parameters =>
parameters.Name == tableName &&
parameters.Name == datasetName &&
parameters.ResourceGroupName == ResourceGroupName &&
parameters.DataFactoryName == DataFactoryName)))
.CallBase()
.Verifiable();

dataFactoriesClientMock.Setup(
c =>
c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent))
c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent))
.Returns(expected)
.Verifiable();

Expand All @@ -112,22 +112,22 @@ public void CanCreateTable()
commandRuntimeMock.Verify(
f =>
f.WriteObject(
It.Is<PSTable>(
It.Is<PSDataset>(
tbl =>
ResourceGroupName == tbl.ResourceGroupName &&
DataFactoryName == tbl.DataFactoryName &&
expected.Name == tbl.TableName)),
expected.Name == tbl.DatasetName)),
Times.Once());
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void CanThrowIfTableProvisioningFailed()
public void CanThrowIfDatasetProvisioningFailed()
{
// Arrange
Table expected = new Table()
{
Name = tableName,
Name = datasetName,
Properties = new TableProperties()
};

Expand All @@ -137,18 +137,18 @@ public void CanThrowIfTableProvisioningFailed()

dataFactoriesClientMock.Setup(
c =>
c.CreatePSTable(
It.Is<CreatePSTableParameters>(
c.CreatePSDataset(
It.Is<CreatePSDatasetParameters>(
parameters =>
parameters.Name == tableName &&
parameters.Name == datasetName &&
parameters.ResourceGroupName == ResourceGroupName &&
parameters.DataFactoryName == DataFactoryName)))
.CallBase()
.Verifiable();

dataFactoriesClientMock.Setup(
c =>
c.CreateOrUpdateTable(ResourceGroupName, DataFactoryName, tableName, rawJsonContent))
c.CreateOrUpdateDataset(ResourceGroupName, DataFactoryName, datasetName, rawJsonContent))
.Returns(expected)
.Verifiable();

Expand Down
Loading