Skip to content

Commit 23c7fe4

Browse files
RikkiGibsonRikkiGibson
committed
Fix broken tests
1 parent f43dd10 commit 23c7fe4

File tree

58 files changed

+274
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+274
-342
lines changed

‎test/azure/src/test/java/fixtures/azureparametergrouping/ParameterGroupingTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
44
import com.microsoft.rest.v2.http.HttpPipeline;
55
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
67
import com.microsoft.rest.v2.policy.PortPolicyFactory;
78
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
89
import org.junit.BeforeClass;
@@ -23,7 +24,8 @@ public static void setup() {
2324
HttpPipeline.build(
2425
new ProtocolPolicyFactory("http"),
2526
new PortPolicyFactory(3000),
26-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null))));
27+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
28+
new DecodingPolicyFactory()));
2729
}
2830

2931
@Test

‎test/azure/src/test/java/fixtures/azurereport/CoverageReporter.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
package fixtures.azurereport;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
import java.util.Map;
6-
73
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
84
import com.microsoft.rest.v2.http.HttpPipeline;
95
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
107
import com.microsoft.rest.v2.policy.PortPolicyFactory;
118
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
129
import fixtures.azurereport.implementation.AutoRestReportServiceForAzureImpl;
1310
import org.junit.runner.Result;
1411
import org.junit.runner.notification.RunListener;
1512

13+
import java.util.ArrayList;
14+
import java.util.List;
15+
import java.util.Map;
16+
1617
public final class CoverageReporter extends RunListener {
1718
private AutoRestReportServiceForAzureImpl client = new AutoRestReportServiceForAzureImpl(
1819
HttpPipeline.build(
1920
new ProtocolPolicyFactory("http"),
2021
new PortPolicyFactory(3000),
21-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null))));
22+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
23+
new DecodingPolicyFactory()));
2224

2325
@Override
2426
public void testRunFinished(Result result) throws Exception {

‎test/azure/src/test/java/fixtures/azurespecials/ApiVersionDefaultTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
55
import com.microsoft.rest.v2.http.HttpPipeline;
66
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
7+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
78
import com.microsoft.rest.v2.policy.PortPolicyFactory;
89
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
10+
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
911
import org.junit.BeforeClass;
10-
import org.junit.Ignore;
1112
import org.junit.Test;
1213

13-
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
14-
1514
import static org.junit.Assert.assertEquals;
1615

1716
public class ApiVersionDefaultTests {
@@ -22,7 +21,8 @@ public static void setup() {
2221
final HttpPipeline httpPipeline = HttpPipeline.build(
2322
new ProtocolPolicyFactory("http"),
2423
new PortPolicyFactory(3000),
25-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)));
24+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
25+
new DecodingPolicyFactory());
2626
client = new AutoRestAzureSpecialParametersTestClientImpl(httpPipeline);
2727
}
2828

‎test/azure/src/test/java/fixtures/azurespecials/ApiVersionLocalTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
55
import com.microsoft.rest.v2.http.HttpPipeline;
66
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
7+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
78
import com.microsoft.rest.v2.policy.PortPolicyFactory;
89
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
9-
import org.junit.Assert;
10+
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
1011
import org.junit.BeforeClass;
11-
import org.junit.Ignore;
1212
import org.junit.Test;
1313

14-
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
15-
1614
import static org.junit.Assert.assertEquals;
1715

1816
public class ApiVersionLocalTests {
@@ -24,7 +22,8 @@ public static void setup() {
2422
HttpPipeline.build(
2523
new ProtocolPolicyFactory("http"),
2624
new PortPolicyFactory(3000),
27-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null))));
25+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
26+
new DecodingPolicyFactory()));
2827
}
2928

3029
@Test

‎test/azure/src/test/java/fixtures/azurespecials/HeaderOperationsTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
55
import com.microsoft.rest.v2.http.HttpPipeline;
66
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
7+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
78
import com.microsoft.rest.v2.policy.PortPolicyFactory;
89
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
910
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
@@ -13,7 +14,6 @@
1314
import fixtures.azurespecials.models.HeaderCustomNamedRequestIdParamGroupingParameters;
1415
import org.junit.Assert;
1516
import org.junit.BeforeClass;
16-
import org.junit.Ignore;
1717
import org.junit.Test;
1818

1919
public class HeaderOperationsTests {
@@ -25,7 +25,8 @@ public static void setup() {
2525
HttpPipeline.build(
2626
new ProtocolPolicyFactory("http"),
2727
new PortPolicyFactory(3000),
28-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null))));
28+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
29+
new DecodingPolicyFactory()));
2930
}
3031

3132
@Test

‎test/azure/src/test/java/fixtures/azurespecials/SkipUrlEncodingTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
44
import com.microsoft.rest.v2.http.HttpPipeline;
55
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
67
import com.microsoft.rest.v2.policy.PortPolicyFactory;
78
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
89
import org.junit.BeforeClass;
@@ -23,7 +24,8 @@ public static void setup() {
2324
HttpPipeline.build(
2425
new ProtocolPolicyFactory("http"),
2526
new PortPolicyFactory(3000),
26-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)))).skipUrlEncodings();
27+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
28+
new DecodingPolicyFactory())).skipUrlEncodings();
2729
}
2830

2931
@Test

‎test/azure/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
package fixtures.azurespecials;
22

33
import com.microsoft.rest.v2.credentials.TokenCredentials;
4-
54
import com.microsoft.rest.v2.http.HttpPipeline;
65
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
77
import com.microsoft.rest.v2.policy.PortPolicyFactory;
88
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
99
import com.microsoft.rest.v2.policy.RequestIdPolicyFactory;
10+
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
1011
import org.junit.BeforeClass;
1112
import org.junit.Test;
1213

1314
import java.util.UUID;
1415

15-
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
16-
1716
public class SubscriptionInCredentialsTests {
1817
private static AutoRestAzureSpecialParametersTestClientImpl client;
1918

@@ -23,7 +22,8 @@ public static void setup() {
2322
new ProtocolPolicyFactory("http"),
2423
new PortPolicyFactory(3000),
2524
new CredentialsPolicyFactory(new TokenCredentials(null, UUID.randomUUID().toString())),
26-
new RequestIdPolicyFactory());
25+
new RequestIdPolicyFactory(),
26+
new DecodingPolicyFactory());
2727
client = new AutoRestAzureSpecialParametersTestClientImpl(httpPipeline);
2828
client.withSubscriptionId("1234-5678-9012-3456");
2929
}

‎test/azure/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package fixtures.azurespecials;
22

33
import com.microsoft.rest.v2.credentials.TokenCredentials;
4-
54
import com.microsoft.rest.v2.http.HttpPipeline;
65
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
77
import com.microsoft.rest.v2.policy.PortPolicyFactory;
88
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
99
import com.microsoft.rest.v2.policy.RequestIdPolicyFactory;
10+
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
1011
import org.junit.Assert;
1112
import org.junit.BeforeClass;
1213
import org.junit.Test;
1314

1415
import java.util.UUID;
1516

16-
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
17-
1817
import static org.junit.Assert.fail;
1918

2019
public class SubscriptionInMethodTests {
@@ -26,7 +25,8 @@ public static void setup() {
2625
new ProtocolPolicyFactory("http"),
2726
new PortPolicyFactory(3000),
2827
new CredentialsPolicyFactory(new TokenCredentials(null, UUID.randomUUID().toString())),
29-
new RequestIdPolicyFactory());
28+
new RequestIdPolicyFactory(),
29+
new DecodingPolicyFactory());
3030
client = new AutoRestAzureSpecialParametersTestClientImpl(httpPipeline);
3131
client.withSubscriptionId("1234-5678-9012-3456");
3232
}

‎test/azure/src/test/java/fixtures/azurespecials/XMsClientRequestIdTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import com.microsoft.rest.v2.http.HttpPipeline;
77
import com.microsoft.rest.v2.policy.AddHeadersPolicyFactory;
88
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
9+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
910
import com.microsoft.rest.v2.policy.PortPolicyFactory;
1011
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
1112
import fixtures.azurespecials.implementation.AutoRestAzureSpecialParametersTestClientImpl;
1213
import org.junit.BeforeClass;
13-
import org.junit.Ignore;
1414
import org.junit.Test;
1515

1616
import java.util.UUID;
@@ -29,7 +29,8 @@ public static void setup() {
2929
new ProtocolPolicyFactory("http"),
3030
new PortPolicyFactory(3000),
3131
new CredentialsPolicyFactory(new TokenCredentials(null, UUID.randomUUID().toString())),
32-
new AddHeadersPolicyFactory(headers));
32+
new AddHeadersPolicyFactory(headers),
33+
new DecodingPolicyFactory());
3334
client = new AutoRestAzureSpecialParametersTestClientImpl(httpPipeline);
3435
client.withSubscriptionId("1234-5678-9012-3456");
3536
}

‎test/azure/src/test/java/fixtures/headexceptions/HeadExceptionTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.microsoft.rest.v2.credentials.BasicAuthenticationCredentials;
55
import com.microsoft.rest.v2.http.HttpPipeline;
66
import com.microsoft.rest.v2.policy.CredentialsPolicyFactory;
7+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
78
import com.microsoft.rest.v2.policy.PortPolicyFactory;
89
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
910
import org.junit.BeforeClass;
@@ -20,7 +21,8 @@ public static void setup() {
2021
HttpPipeline.build(
2122
new ProtocolPolicyFactory("http"),
2223
new PortPolicyFactory(3000),
23-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null))));
24+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
25+
new DecodingPolicyFactory()));
2426
}
2527

2628
@Test

‎test/azure/src/test/java/fixtures/lro/LRORetrysTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package fixtures.lro;
22

33
import com.microsoft.azure.v2.AzureProxy;
4-
import com.microsoft.rest.v2.policy.CookiePolicyFactory;
5-
import com.microsoft.rest.v2.policy.HttpLoggingPolicyFactory;
6-
import com.microsoft.rest.v2.policy.HttpLogDetailLevel;
74
import com.microsoft.rest.v2.http.HttpPipeline;
5+
import com.microsoft.rest.v2.policy.CookiePolicyFactory;
6+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
87
import com.microsoft.rest.v2.policy.PortPolicyFactory;
98
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
109
import com.microsoft.rest.v2.policy.RetryPolicyFactory;
@@ -23,7 +22,8 @@ public static void setup() {
2322
new ProtocolPolicyFactory("http"),
2423
new PortPolicyFactory(3000),
2524
new RetryPolicyFactory(),
26-
new CookiePolicyFactory());
25+
new CookiePolicyFactory(),
26+
new DecodingPolicyFactory());
2727
AzureProxy.setDefaultPollingDelayInMilliseconds(0);
2828
client = new AutoRestLongRunningOperationTestServiceImpl(httpPipeline)
2929
.withLongRunningOperationRetryTimeout(0);

‎test/azure/src/test/java/fixtures/lro/LROSADsTests.java

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

33
import com.microsoft.azure.v2.AzureProxy;
44
import com.microsoft.azure.v2.CloudException;
5-
5+
import com.microsoft.rest.v2.RestException;
66
import com.microsoft.rest.v2.http.HttpPipeline;
7+
import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
78
import com.microsoft.rest.v2.policy.PortPolicyFactory;
89
import com.microsoft.rest.v2.policy.ProtocolPolicyFactory;
10+
import fixtures.lro.implementation.AutoRestLongRunningOperationTestServiceImpl;
11+
import fixtures.lro.models.Product;
12+
import org.hamcrest.CoreMatchers;
913
import org.junit.Assert;
1014
import org.junit.BeforeClass;
1115
import org.junit.Test;
1216

13-
import fixtures.lro.implementation.AutoRestLongRunningOperationTestServiceImpl;
14-
import fixtures.lro.models.Product;
17+
import java.io.IOException;
1518

19+
import static org.junit.Assert.assertThat;
1620
import static org.junit.Assert.fail;
1721

1822
public class LROSADsTests {
@@ -23,7 +27,8 @@ public static void setup() {
2327
client = new AutoRestLongRunningOperationTestServiceImpl(
2428
HttpPipeline.build(
2529
new ProtocolPolicyFactory("http"),
26-
new PortPolicyFactory(3000)));
30+
new PortPolicyFactory(3000),
31+
new DecodingPolicyFactory()));
2732
AzureProxy.setDefaultPollingDelayInMilliseconds(0);
2833
}
2934

@@ -217,8 +222,8 @@ public void put200InvalidJson() throws Exception {
217222
try {
218223
client.lROSADs().put200InvalidJson(product);
219224
fail();
220-
} catch (RuntimeException ex) {
221-
Assert.assertTrue(ex.getMessage().contains("Unexpected end-of-input"));
225+
} catch (RestException ex) {
226+
assertThat(ex.getMessage(), CoreMatchers.containsString("HTTP response has a malformed body"));
222227
}
223228
}
224229

@@ -229,8 +234,8 @@ public void putAsyncRelativeRetryInvalidHeader() throws Exception {
229234
try {
230235
client.lROSADs().putAsyncRelativeRetryInvalidHeader(product);
231236
fail();
232-
} catch (NumberFormatException ex) {
233-
Assert.assertEquals("For input string: \"/bar\"", ex.getMessage());
237+
} catch (RuntimeException ex) {
238+
assertThat(ex.getCause(), CoreMatchers.instanceOf(IOException.class));
234239
}
235240
}
236241

@@ -242,7 +247,7 @@ public void putAsyncRelativeRetryInvalidJsonPolling() throws Exception {
242247
client.lROSADs().putAsyncRelativeRetryInvalidJsonPolling(product);
243248
fail();
244249
} catch (RuntimeException ex) {
245-
Assert.assertTrue(ex.getMessage().contains("does not contain a valid body"));
250+
assertThat(ex.getMessage(), CoreMatchers.containsString("HTTP response has a malformed body"));
246251
}
247252
}
248253

@@ -251,8 +256,8 @@ public void delete202RetryInvalidHeader() throws Exception {
251256
try {
252257
client.lROSADs().delete202RetryInvalidHeader();
253258
fail();
254-
} catch (NumberFormatException ex) {
255-
Assert.assertEquals("For input string: \"/bar\"", ex.getMessage());
259+
} catch (RuntimeException ex) {
260+
assertThat(ex.getCause(), CoreMatchers.instanceOf(IOException.class));
256261
}
257262
}
258263

@@ -261,8 +266,8 @@ public void deleteAsyncRelativeRetryInvalidHeader() throws Exception {
261266
try {
262267
client.lROSADs().deleteAsyncRelativeRetryInvalidHeader();
263268
fail();
264-
} catch (NumberFormatException ex) {
265-
Assert.assertEquals("For input string: \"/bar\"", ex.getMessage());
269+
} catch (RuntimeException ex) {
270+
assertThat(ex.getCause(), CoreMatchers.instanceOf(IOException.class));
266271
}
267272
}
268273

@@ -283,8 +288,8 @@ public void post202RetryInvalidHeader() throws Exception {
283288
try {
284289
client.lROSADs().post202RetryInvalidHeader(product);
285290
fail();
286-
} catch (NumberFormatException ex) {
287-
Assert.assertEquals("For input string: \"/bar\"", ex.getMessage());
291+
} catch (RuntimeException ex) {
292+
assertThat(ex.getCause(), CoreMatchers.instanceOf(IOException.class));
288293
}
289294
}
290295

@@ -295,8 +300,8 @@ public void postAsyncRelativeRetryInvalidHeader() throws Exception {
295300
try {
296301
client.lROSADs().postAsyncRelativeRetryInvalidHeader(product);
297302
fail();
298-
} catch (NumberFormatException ex) {
299-
Assert.assertEquals("For input string: \"/bar\"", ex.getMessage());
303+
} catch (RuntimeException ex) {
304+
assertThat(ex.getCause(), CoreMatchers.instanceOf(IOException.class));
300305
}
301306
}
302307

‎test/azure/src/test/java/fixtures/lro/LROsCustomHeaderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public static void setup() {
2525
new RetryPolicyFactory(),
2626
new CookiePolicyFactory(),
2727
new AddHeadersPolicyFactory(headers),
28-
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)));
28+
new CredentialsPolicyFactory(new BasicAuthenticationCredentials(null, null)),
29+
new DecodingPolicyFactory());
2930
AzureProxy.setDefaultPollingDelayInMilliseconds(0);
3031
client = new AutoRestLongRunningOperationTestServiceImpl(httpPipeline);
3132
}

0 commit comments

Comments
 (0)