mirror of
https://github.com/netbirdio/gomobile-tvos-fork.git
synced 2026-05-22 18:43:29 -07:00
bind: format generated go code before comparing with golden files
bind_test.go compares the generated Go files against golden files checked in the repository. The bind package formats some of the generated Go files, so any changes in the go formatter can break the tests. This change makes the test more robust by applying formatting based on the currently used go version. Since a golden file often includes multiple go files generated by the bind, the `gofmt` function splits the golden file using the gobindPreamble marker and then run format.Source for each chunk. In order to ease the golden file splitting, this CL also moves the gobindPreamble to the beginning of each generated file consistently. It turned out bind omits formatting for some go files (generated for reverse binding). That needs to be fixed but it is a much bigger fix. Thus, in this CL, we apply the formatting on the bind's output as well. This CL also updates the gobindPreamble to follow the style guide for generated code. https://golang.org/s/generatedcode Fixes golang/go#34619 Change-Id: Ia2957693154face2848e051ebbb2373e95d79593 Reviewed-on: https://go-review.googlesource.com/c/mobile/+/198322 Run-TryBot: Hyang-Ah Hana Kim <hyangah@gmail.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
This commit is contained in:
committed by
Hyang-Ah Hana Kim
parent
d3ece3b6da
commit
6d0d39b2ca
Vendored
+15
-10
@@ -1,7 +1,8 @@
|
||||
// Code generated by gobind. DO NOT EDIT.
|
||||
|
||||
// Java class java.Future is a proxy for talking to a Go program.
|
||||
// gobind -lang=java classes
|
||||
//
|
||||
// File is generated by gobind. Do not edit.
|
||||
// autogenerated by gobind -lang=java classes
|
||||
package java;
|
||||
|
||||
import go.Seq;
|
||||
@@ -32,10 +33,11 @@ public final class Future implements Seq.GoObject, java.util.concurrent.Future {
|
||||
@Override public native java.lang.Object get(long p0, java.util.concurrent.TimeUnit p1) throws java.lang.InterruptedException, java.util.concurrent.ExecutionException, java.util.concurrent.TimeoutException;
|
||||
}
|
||||
|
||||
// Code generated by gobind. DO NOT EDIT.
|
||||
|
||||
// Java class java.InputStream is a proxy for talking to a Go program.
|
||||
// gobind -lang=java classes
|
||||
//
|
||||
// File is generated by gobind. Do not edit.
|
||||
// autogenerated by gobind -lang=java classes
|
||||
package java;
|
||||
|
||||
import go.Seq;
|
||||
@@ -64,10 +66,11 @@ public final class InputStream extends java.io.InputStream implements Seq.GoObje
|
||||
@Override public native int read() throws java.io.IOException;
|
||||
}
|
||||
|
||||
// Code generated by gobind. DO NOT EDIT.
|
||||
|
||||
// Java class java.Object is a proxy for talking to a Go program.
|
||||
// gobind -lang=java classes
|
||||
//
|
||||
// File is generated by gobind. Do not edit.
|
||||
// autogenerated by gobind -lang=java classes
|
||||
package java;
|
||||
|
||||
import go.Seq;
|
||||
@@ -93,10 +96,11 @@ public final class Object extends java.lang.Object implements Seq.GoObject {
|
||||
|
||||
}
|
||||
|
||||
// Code generated by gobind. DO NOT EDIT.
|
||||
|
||||
// Java class java.Runnable is a proxy for talking to a Go program.
|
||||
// gobind -lang=java classes
|
||||
//
|
||||
// File is generated by gobind. Do not edit.
|
||||
// autogenerated by gobind -lang=java classes
|
||||
package java;
|
||||
|
||||
import go.Seq;
|
||||
@@ -123,10 +127,11 @@ public final class Runnable implements Seq.GoObject, java.lang.Runnable {
|
||||
@Override public native void run();
|
||||
}
|
||||
|
||||
// Code generated by gobind. DO NOT EDIT.
|
||||
|
||||
// Java class java.Java is a proxy for talking to a Go program.
|
||||
// gobind -lang=java classes
|
||||
//
|
||||
// File is generated by gobind. Do not edit.
|
||||
// autogenerated by gobind -lang=java classes
|
||||
package java;
|
||||
|
||||
import go.Seq;
|
||||
|
||||
Reference in New Issue
Block a user