Skip to content
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

[ggj][codegen][test] fix: handle floating-point types for test codegen assertEquals #544

Merged
merged 14 commits into from
Nov 21, 2020
Merged

[ggj][codegen][test] fix: handle floating-point types for test codegen assertEquals #544

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bb8f2f2
fix: align resname ctors with superclass variants
miraleung Nov 19, 2020
59d8338
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Nov 19, 2020
7336db7
fix: avoid type collisions - refactor {Concrete,Vapor}Ref into AstNodes
miraleung Nov 20, 2020
2f7c857
fix: better message null checks in Parser
miraleung Nov 20, 2020
8814542
fix: map proto.Empty RPC types to void in ServiceClient
miraleung Nov 20, 2020
ca8398f
fix: improve import(shortName) state-keeping in ImportWriterVisitor
miraleung Nov 20, 2020
b48f494
fix: fix stub pkg for all ServiceSettingsStub usages
miraleung Nov 20, 2020
93ed4bd
fix: handle older protos with javaMultipleFiles=false
miraleung Nov 20, 2020
bb7d59f
fix: gate isPaged on all fields for monolith back-compat
miraleung Nov 20, 2020
15c781c
fix: fail early if bazel lacks a grpc_service_config.json file
miraleung Nov 20, 2020
2dcee4e
fix: add Bazel handling for lack of resname helper classes
miraleung Nov 21, 2020
3c732cf
fix: reverse conditional
miraleung Nov 21, 2020
c60b038
fix: handle floating-point types for test codegen assertEquals
miraleung Nov 21, 2020
92a1e46
Merge branch 'master' into ag/11
miraleung Nov 21, 2020
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
14 changes: 13 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,11 +851,23 @@ private static MethodDefinition createRpcTestMethod(
.build();
Expr expectedFieldExpr = checkExprFn.apply(requestVarExpr);
Expr actualFieldExpr = checkExprFn.apply(actualRequestVarExpr);
List<Expr> assertEqualsArguments = new ArrayList<>();
assertEqualsArguments.add(expectedFieldExpr);
assertEqualsArguments.add(actualFieldExpr);
if (TypeNode.isFloatingPointType(field.type())) {
boolean isFloat = field.type().equals(TypeNode.FLOAT);
assertEqualsArguments.add(
ValueExpr.withValue(
PrimitiveValue.builder()
.setType(isFloat ? TypeNode.FLOAT : TypeNode.DOUBLE)
.setValue(String.format("0.0001%s", isFloat ? "f" : ""))
.build()));
}
methodExprs.add(
MethodInvocationExpr.builder()
.setStaticReferenceType(STATIC_TYPES.get("Assert"))
.setMethodName("assertEquals")
.setArguments(expectedFieldExpr, actualFieldExpr)
.setArguments(assertEqualsArguments)
.build());
}
} else {
Expand Down