Skip to content

Commit

Permalink
fix(private): error printout and broken reference to fail (#4287)
Browse files Browse the repository at this point in the history
  • Loading branch information
@trivikr
trivikr committed Dec 14, 2022
1 parent d229edd commit 5582ee8
Show file tree
Hide file tree
Showing 8 changed files with 312 additions and 248 deletions.
48 changes: 28 additions & 20 deletions private/aws-protocoltests-ec2/test/functional/ec2query.spec.ts
View file
Expand Up @@ -154,6 +154,14 @@ const clientParams = {
credentials: { accessKeyId: "key", secretAccessKey: "secret" },
};

/**
* A wrapper function that shadows `fail` from jest-jasmine2
* (jasmine2 was replaced with circus in > v27 as the default test runner)
*/
const fail = (error?: any): never => {
throw new Error(error);
};

/**
* Empty input serializes no extra query params
*/
Expand Down Expand Up @@ -214,7 +222,7 @@ it("Ec2QueryEmptyInputAndEmptyOutput:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -322,7 +330,7 @@ it("Ec2GreetingWithErrors:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -505,7 +513,7 @@ it("Ec2IgnoresWrappingXmlName:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -625,7 +633,7 @@ it("Ec2QueryNoInputAndOutput:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -976,7 +984,7 @@ it("Ec2RecursiveShapes:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1532,7 +1540,7 @@ it("Ec2SimpleScalarProperties:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1592,7 +1600,7 @@ it("Ec2QuerySupportsNaNFloatOutputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1636,7 +1644,7 @@ it("Ec2QuerySupportsInfinityFloatOutputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1680,7 +1688,7 @@ it("Ec2QuerySupportsNegativeInfinityFloatOutputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1724,7 +1732,7 @@ it("Ec2XmlBlobs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1766,7 +1774,7 @@ it("Ec2XmlEmptyBlobs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1808,7 +1816,7 @@ it("Ec2XmlEmptySelfClosedBlobs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1850,7 +1858,7 @@ it("Ec2XmlEmptyLists:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1914,7 +1922,7 @@ it("Ec2XmlEnums:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2025,7 +2033,7 @@ it("Ec2XmlLists:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2117,7 +2125,7 @@ it("Ec2XmlNamespaces:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2163,7 +2171,7 @@ it("Ec2XmlTimestamps:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2205,7 +2213,7 @@ it("Ec2XmlTimestampsWithDateTimeFormat:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2247,7 +2255,7 @@ it("Ec2XmlTimestampsWithEpochSecondsFormat:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2289,7 +2297,7 @@ it("Ec2XmlTimestampsWithHttpDateFormat:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down
42 changes: 25 additions & 17 deletions private/aws-protocoltests-json-10/test/functional/awsjson1_0.spec.ts
View file
Expand Up @@ -142,6 +142,14 @@ const clientParams = {
credentials: { accessKeyId: "key", secretAccessKey: "secret" },
};

/**
* A wrapper function that shadows `fail` from jest-jasmine2
* (jasmine2 was replaced with circus in > v27 as the default test runner)
*/
const fail = (error?: any): never => {
throw new Error(error);
};

/**
* Clients must always send an empty object if input is modeled.
*/
Expand Down Expand Up @@ -201,7 +209,7 @@ it("AwsJson10EmptyInputAndEmptyOutputSendJsonObject:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1186,7 +1194,7 @@ it("AwsJson10DeserializeStringUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1230,7 +1238,7 @@ it("AwsJson10DeserializeBooleanUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1274,7 +1282,7 @@ it("AwsJson10DeserializeNumberUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1318,7 +1326,7 @@ it("AwsJson10DeserializeBlobUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1362,7 +1370,7 @@ it("AwsJson10DeserializeTimestampUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1406,7 +1414,7 @@ it("AwsJson10DeserializeEnumUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1450,7 +1458,7 @@ it("AwsJson10DeserializeListUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1497,7 +1505,7 @@ it("AwsJson10DeserializeMapUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1547,7 +1555,7 @@ it("AwsJson10DeserializeStructureUnionValue:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1633,7 +1641,7 @@ it("AwsJson10HandlesEmptyOutputShape:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1667,7 +1675,7 @@ it("AwsJson10HandlesUnexpectedJsonOutput:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1700,7 +1708,7 @@ it("AwsJson10ServiceRespondsWithNoPayload:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1765,7 +1773,7 @@ it("AwsJson10NoInputAndOutput:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1926,7 +1934,7 @@ it("AwsJson10SupportsNaNFloatInputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -1969,7 +1977,7 @@ it("AwsJson10SupportsInfinityFloatInputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down Expand Up @@ -2012,7 +2020,7 @@ it("AwsJson10SupportsNegativeInfinityFloatInputs:Response", async () => {
try {
r = await client.send(command);
} catch (err) {
fail("Expected a valid response to be returned, got err.");
fail("Expected a valid response to be returned, got " + err);
return;
}
expect(r["$metadata"].httpStatusCode).toBe(200);
Expand Down

0 comments on commit 5582ee8

Please sign in to comment.