1616using System . Collections . Generic ;
1717using System . Xml ;
1818using Microsoft . Azure . Commands . Insights . Metrics ;
19- using Microsoft . Azure . Insights . Legacy ;
20- using Microsoft . Azure . Insights . Legacy . Models ;
19+ using Microsoft . Azure . Insights ;
20+ using Microsoft . Azure . Insights . Models ;
2121using Microsoft . Rest . Azure . OData ;
2222using Microsoft . WindowsAzure . Commands . ScenarioTest ;
2323using Moq ;
@@ -33,84 +33,96 @@ public class GetAzureRmMetricTests
3333 {
3434 private readonly GetAzureRmMetricCommand cmdlet ;
3535 private readonly Mock < InsightsClient > insightsClientMock ;
36- private readonly Mock < IMetricOperations > insightsMetricOperationsMock ;
36+ private readonly Mock < IMetricsOperations > insightsMetricOperationsMock ;
3737 private Mock < ICommandRuntime > commandRuntimeMock ;
38- private MetricListResponse response ;
38+ private Microsoft . Rest . Azure . AzureOperationResponse < IEnumerable < Metric > > response ;
3939 private string resourceId ;
40- private string filter ;
40+ private ODataQuery < Metric > filter ;
4141
4242 public GetAzureRmMetricTests ( Xunit . Abstractions . ITestOutputHelper output )
4343 {
4444 ServiceManagemenet . Common . Models . XunitTracingInterceptor . AddToContext ( new ServiceManagemenet . Common . Models . XunitTracingInterceptor ( output ) ) ;
45- insightsMetricOperationsMock = new Mock < IMetricOperations > ( ) ;
45+ insightsMetricOperationsMock = new Mock < IMetricsOperations > ( ) ;
4646 insightsClientMock = new Mock < InsightsClient > ( ) ;
4747 commandRuntimeMock = new Mock < ICommandRuntime > ( ) ;
4848 cmdlet = new GetAzureRmMetricCommand ( )
4949 {
5050 CommandRuntime = commandRuntimeMock . Object ,
51- // InsightsClient = insightsClientMock.Object
51+ InsightsClient = insightsClientMock . Object
5252 } ;
5353
54- response = Utilities . InitializeMetricResponse ( ) ;
54+ response = new Microsoft . Rest . Azure . AzureOperationResponse < IEnumerable < Metric > > ( )
55+ {
56+ Body = new List < Metric > ( )
57+ } ;
5558
56- insightsMetricOperationsMock . Setup ( f => f . GetMetricsAsync ( It . IsAny < string > ( ) , It . IsAny < string > ( ) , It . IsAny < CancellationToken > ( ) ) )
57- . Returns ( Task . FromResult < MetricListResponse > ( response ) )
58- . Callback ( ( string f , string s , CancellationToken t ) =>
59+ insightsMetricOperationsMock . Setup ( f => f . ListWithHttpMessagesAsync ( It . IsAny < string > ( ) , It . IsAny < ODataQuery < Metric > > ( ) , It . IsAny < Dictionary < string , List < string > > > ( ) , It . IsAny < CancellationToken > ( ) ) )
60+ . Returns ( Task . FromResult < Microsoft . Rest . Azure . AzureOperationResponse < IEnumerable < Metric > > > ( response ) )
61+ . Callback ( ( string r , ODataQuery < Metric > s , Dictionary < string , List < string > > headers , CancellationToken t ) =>
5962 {
60- resourceId = f ;
63+ resourceId = r ;
6164 filter = s ;
6265 } ) ;
6366
64- insightsClientMock . SetupGet ( f => f . MetricOperations ) . Returns ( this . insightsMetricOperationsMock . Object ) ;
67+ insightsClientMock . SetupGet ( f => f . Metrics ) . Returns ( this . insightsMetricOperationsMock . Object ) ;
6568 }
6669
67- [ Fact ( Skip = "Disable this release since there are conflicts between DLL versions" ) ]
70+ [ Fact ] // (Skip = "Disable this release since there are conflicts between DLL versions")]
6871 [ Trait ( Category . AcceptanceType , Category . CheckIn ) ]
6972 public void GetMetricsCommandParametersProcessing ( )
7073 {
7174 // Testting defaults and required parameters
7275 cmdlet . ResourceId = Utilities . ResourceUri ;
73- cmdlet . TimeGrain = TimeSpan . FromMinutes ( 1 ) ;
7476
7577 cmdlet . ExecuteCmdlet ( ) ;
76- Assert . True ( filter != null && filter . Contains ( "timeGrain eq duration'PT1M'" ) && filter . Contains ( " and startTime eq " ) && filter . Contains ( " and endTime eq " ) ) ;
78+ Assert . True ( filter != null && filter . Filter == null ) ;
7779 Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
7880
79- cmdlet . TimeGrain = TimeSpan . FromMinutes ( 5 ) ;
81+ cmdlet . MetricNames = new [ ] { "n1" , "n2" } ;
82+ cmdlet . ExecuteCmdlet ( ) ;
83+ Assert . True ( filter != null ) ;
84+ Assert . True ( filter . Filter . Contains ( "(name.value eq 'n1' or name.value eq 'n2')" ) ) ;
85+ Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
8086
87+ cmdlet . AggregationType = AggregationType . Total ;
8188 cmdlet . ExecuteCmdlet ( ) ;
82- Assert . True ( filter != null && filter . Contains ( "timeGrain eq duration'PT5M'" ) && filter . Contains ( " and startTime eq " ) && filter . Contains ( " and endTime eq " ) ) ;
89+ Assert . True ( filter != null ) ;
90+ Assert . True ( filter . Filter . Contains ( "aggregationType eq 'Total'" ) ) ;
91+ Assert . True ( filter . Filter . Contains ( "(name.value eq 'n1' or name.value eq 'n2')" ) ) ;
8392 Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
8493
85- var endDate = DateTime . Now . AddMinutes ( - 1 ) ;
86- cmdlet . TimeGrain = TimeSpan . FromMinutes ( 5 ) ;
94+ var endDate = DateTime . UtcNow . AddMinutes ( - 1 ) ;
95+ cmdlet . AggregationType = AggregationType . Average ;
8796 cmdlet . EndTime = endDate ;
8897
89- var startTime = endDate . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . ToString ( "O" ) ;
90- var endTime = endDate . ToString ( "O" ) ;
91- var expected = "timeGrain eq duration'PT5M' and startTime eq " + startTime + " and endTime eq " + endTime ;
92-
9398 // Remove the value assigned in the last execution
9499 cmdlet . StartTime = default ( DateTime ) ;
95-
96100 cmdlet . ExecuteCmdlet ( ) ;
97- Assert . Equal ( expected , filter ) ;
101+ Assert . True ( filter != null ) ;
102+ Assert . True ( filter . Filter . Contains ( "aggregationType eq 'Average'" ) ) ;
103+ Assert . True ( filter . Filter . Contains ( "(name.value eq 'n1' or name.value eq 'n2')" ) ) ;
104+ Assert . True ( filter . Filter . Contains ( "startTime eq " + endDate . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . ToString ( "O" ) ) ) ;
105+ Assert . True ( filter . Filter . Contains ( "endTime eq " + endDate . ToString ( "O" ) ) ) ;
98106 Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
99107
100108 cmdlet . StartTime = endDate . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) ;
101- startTime = cmdlet . StartTime . ToString ( "O" ) ;
102- expected = "timeGrain eq duration'PT5M' and startTime eq " + startTime + " and endTime eq " + endTime ;
103-
104109 cmdlet . ExecuteCmdlet ( ) ;
105- Assert . Equal ( expected , filter ) ;
110+ Assert . True ( filter != null ) ;
111+ Assert . True ( filter . Filter . Contains ( "aggregationType eq 'Average'" ) ) ;
112+ Assert . True ( filter . Filter . Contains ( "(name.value eq 'n1' or name.value eq 'n2')" ) ) ;
113+ Assert . True ( filter . Filter . Contains ( "startTime eq " + endDate . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . ToString ( "O" ) ) ) ;
114+ Assert . True ( filter . Filter . Contains ( "endTime eq " + endDate . ToString ( "O" ) ) ) ;
106115 Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
107116
108- // Testing with optional parameters
109- cmdlet . MetricNames = new [ ] { "n1" , "n2" } ;
110- expected = "(name.value eq 'n1' or name.value eq 'n2') and " + expected ;
111-
117+ cmdlet . AggregationType = AggregationType . Maximum ;
118+ cmdlet . TimeGrain = TimeSpan . FromMinutes ( 5 ) ;
112119 cmdlet . ExecuteCmdlet ( ) ;
113- Assert . Equal ( expected , filter ) ;
120+ Assert . True ( filter != null ) ;
121+ Assert . True ( filter . Filter . Contains ( "aggregationType eq 'Maximum'" ) ) ;
122+ Assert . True ( filter . Filter . Contains ( "(name.value eq 'n1' or name.value eq 'n2')" ) ) ;
123+ Assert . True ( filter . Filter . Contains ( "startTime eq " + endDate . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . Subtract ( GetAzureRmMetricCommand . DefaultTimeRange ) . ToString ( "O" ) ) ) ;
124+ Assert . True ( filter . Filter . Contains ( "endTime eq " + endDate . ToString ( "O" ) ) ) ;
125+ Assert . True ( filter . Filter . Contains ( "timeGrain eq duration'" + XmlConvert . ToString ( cmdlet . TimeGrain ) + "'" ) ) ;
114126 Assert . Equal ( Utilities . ResourceUri , resourceId ) ;
115127 }
116128 }
0 commit comments