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

Fix broken snapshot and proto tests #512

Merged
merged 4 commits into from
Nov 6, 2018
Merged

Fix broken snapshot and proto tests #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11fc981
fix snapshot tests
Oct 31, 2018
66ce904
ignore eclipse metadata
Oct 31, 2018
6833667
reset some sample files
Oct 31, 2018
a09c948
fix prototest
Oct 31, 2018
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@ target/
bin/
*.iml
.idea
.project
.settings
.classpath

2 changes: 1 addition & 1 deletion google-http-client-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<artifactId>maven-protoc-plugin</artifactId>
<version>0.4.2</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}-build2:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
Expand Down
6 changes: 4 additions & 2 deletions google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -958,7 +958,8 @@ public LowLevelHttpRequest buildRequest(String method, String url) throws IOExce
assertEquals(ImmutableList.of("a2", "b2", "c2"), lowLevelRequest.getHeaderValues("objlist"));
assertEquals(ImmutableList.of("a1", "a2"), lowLevelRequest.getHeaderValues("r"));
assertTrue(lowLevelRequest.getHeaderValues("accept-encoding").isEmpty());
assertEquals(ImmutableList.of("foo " + HttpRequest.USER_AGENT_SUFFIX),
assertEquals(ImmutableList.of("foo Google-HTTP-Java-Client/"
+ HttpRequest.VERSION + " (gzip)"),
lowLevelRequest.getHeaderValues("user-agent"));
assertEquals(ImmutableList.of("b"), lowLevelRequest.getHeaderValues("a"));
assertEquals(ImmutableList.of("VALUE"), lowLevelRequest.getHeaderValues("value"));
Expand Down Expand Up @@ -1197,7 +1198,8 @@ public void testExecute_curlLogger() throws Exception {
if (message.startsWith("curl")) {
found = true;
assertEquals("curl -v --compressed -H 'Accept-Encoding: gzip' -H 'User-Agent: "
+ HttpRequest.USER_AGENT_SUFFIX + "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'",
+ "Google-HTTP-Java-Client/" + HttpRequest.VERSION + " (gzip)"

This comment was marked as spam.

Sign in to view

+ "' -- 'http://google.com/#q=a'\"'\"'b'\"'\"'c'",
message);
}
}
Expand Down