Skip to content

Commit cf5e41b

Browse files
author
Hovsep Mkrtchyan
committed
Fixed SQL test to ignore UserAgent checks
1 parent 12ef78a commit cf5e41b

11 files changed

+21
-21
lines changed

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseOperationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void GetAzureSqlDatabaseOperationWithSqlAuth()
5353
(expected, actual) =>
5454
{
5555
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
56-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
56+
Assert.IsNotNull(actual.UserAgent);
5757
switch (expected.Index)
5858
{
5959
// Request 0-7: Create and Query $testdb

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseServiceObjectiveTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void GetAzureSqlDatabaseServiceObjectiveWithSqlAuth()
5050
(expected, actual) =>
5151
{
5252
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
53-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
53+
Assert.IsNotNull(actual.UserAgent);
5454
switch (expected.Index)
5555
{
5656
// Request 0-6: Retrieving all (6) ServiceObjectives and DimensionSettings

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void GetAzureSqlDatabaseWithSqlAuth()
6262
(expected, actual) =>
6363
{
6464
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
65-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
65+
Assert.IsNotNull(actual.UserAgent);
6666
// 0 - 5
6767
// Get all databases + ServiceObjective lookup
6868
// 6 - 11
@@ -147,7 +147,7 @@ public void GetAzureSqlDatabaseWithSqlAuthByPipe()
147147
(expected, actual) =>
148148
{
149149
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
150-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
150+
Assert.IsNotNull(actual.UserAgent);
151151
if (expected.Index < 12)
152152
{
153153
// Request 0-3: Get all databases + ServiceObjectives requests
@@ -224,7 +224,7 @@ public void GetAzureSqlDatabaseWithSqlAuthNonExistentDb()
224224
(expected, actual) =>
225225
{
226226
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
227-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
227+
Assert.IsNotNull(actual.UserAgent);
228228
switch (expected.Index)
229229
{
230230
// Request 0-2: Get database requests

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetRestorableDroppedDatabaseSqlAuthTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void GetRestorableDroppedDatabaseWithSqlAuth()
6262
(expected, actual) =>
6363
{
6464
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
65-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
65+
Assert.IsNotNull(actual.UserAgent);
6666
if (expected.Index < 3)
6767
{
6868
DatabaseTestHelper.ValidateHeadersForODataRequest(expected.RequestInfo, actual);
@@ -162,7 +162,7 @@ public void GetRestorableDroppedDatabaseWithSqlAuthByPipe()
162162
(expected, actual) =>
163163
{
164164
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
165-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
165+
Assert.IsNotNull(actual.UserAgent);
166166
if (expected.Index < 5)
167167
{
168168
DatabaseTestHelper.ValidateHeadersForODataRequest(expected.RequestInfo, actual);
@@ -270,7 +270,7 @@ public void GetRestorableDroppedDatabaseWithSqlAuthNonExistentDb()
270270
(expected, actual) =>
271271
{
272272
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
273-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
273+
Assert.IsNotNull(actual.UserAgent);
274274
if (expected.Index < 1)
275275
{
276276
DatabaseTestHelper.ValidateHeadersForODataRequest(expected.RequestInfo, actual);

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseServerContextTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public static void CreateServerContextSqlAuth(
288288
(expected, actual) =>
289289
{
290290
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
291-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
291+
Assert.IsNotNull(actual.UserAgent);
292292
switch (expected.Index)
293293
{
294294
// Request 0-2: Create context with both ManageUrl and ServerName overriden

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void NewAzureSqlDatabaseWithSqlAuthDuplicateName()
7474
(expected, actual) =>
7575
{
7676
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
77-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
77+
Assert.IsNotNull(actual.UserAgent);
7878
switch (expected.Index)
7979
{
8080
// Request 0-1: Create testdb1
@@ -141,7 +141,7 @@ public static void CreateTestDatabasesWithSqlAuth(
141141
(expected, actual) =>
142142
{
143143
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
144-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
144+
Assert.IsNotNull(actual.UserAgent);
145145
switch (expected.Index)
146146
{
147147
// Request 0-2: Create testdb1
@@ -234,7 +234,7 @@ public static void RemoveTestDatabasesWithSqlAuth(
234234
(expected, actual) =>
235235
{
236236
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
237-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
237+
Assert.IsNotNull(actual.UserAgent);
238238
switch (expected.Index)
239239
{
240240
// Request 0-5: Remove database requests

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlPremiumDatabaseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void CreatePremiumDatabasesWithSqlAuth()
5454
(expected, actual) =>
5555
{
5656
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
57-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
57+
Assert.IsNotNull(actual.UserAgent);
5858
});
5959

6060
TestCreatePremiumDatabase(powershell, testSession);
@@ -170,7 +170,7 @@ public static void RemoveTestDatabasesWithSqlAuth(
170170
(expected, actual) =>
171171
{
172172
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
173-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
173+
Assert.IsNotNull(actual.UserAgent);
174174
switch (expected.Index)
175175
{
176176
// Request 0-11: Remove database requests

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/RemoveAzureSqlDatabaseTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void RemoveAzureSqlDatabaseWithSqlAuth()
5454
(expected, actual) =>
5555
{
5656
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
57-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
57+
Assert.IsNotNull(actual.UserAgent);
5858
if (expected.Index < 8)
5959
{
6060
// Request 0-5: Remove database requests
@@ -71,7 +71,7 @@ public void RemoveAzureSqlDatabaseWithSqlAuth()
7171

7272
using (AsyncExceptionManager exceptionManager = new AsyncExceptionManager())
7373
{
74-
// Create context with both ManageUrl and ServerName overriden
74+
// Create context with both ManageUrl and ServerName overridden
7575
Collection<PSObject> databases;
7676
using (new MockHttpServer(
7777
exceptionManager,

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/SetAzureSqlDatabaseTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void SetAzureSqlDatabaseSizeWithSqlAuth()
6161
(expected, actual) =>
6262
{
6363
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
64-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
64+
Assert.IsNotNull(actual.UserAgent);
6565
if (expected.Index < 10)
6666
{
6767
// Request 0-2: Set testdb1 with new MaxSize
@@ -142,7 +142,7 @@ public void SetAzureSqlDatabaseNameWithSqlAuth()
142142
(expected, actual) =>
143143
{
144144
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
145-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
145+
Assert.IsNotNull(actual.UserAgent);
146146
if (expected.Index < 10)
147147
{
148148
// Request 0-4: Set testdb1 with new name of new_testdb1
@@ -211,7 +211,7 @@ public void SetAzureSqlDatabaseServiceObjectiveWithSqlAuth()
211211
(expected, actual) =>
212212
{
213213
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
214-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
214+
Assert.IsNotNull(actual.UserAgent);
215215
switch (expected.Index)
216216
{
217217
// Request 0-1: Get Service Objective

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Server/Cmdlet/ServerCmdletTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ public void GetAzureSqlDatabaseServerQuotaSqlAuthTest()
376376
(expected, actual) =>
377377
{
378378
Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
379-
Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
379+
Assert.IsNotNull(actual.UserAgent);
380380
switch (expected.Index)
381381
{
382382
// Request 0-1: Create testdb1

src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/ServerDataService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected ServerDataServiceContext(Uri serviceUri)
5656
}
5757

5858
/// <summary>
59-
/// Handler to add aditional headers and properties to the request.
59+
/// Handler to add additional headers and properties to the request.
6060
/// </summary>
6161
/// <param name="request">The request to enhance.</param>
6262
protected virtual void OnEnhanceRequest(HttpWebRequest request)

0 commit comments

Comments
 (0)