Update integration_test.go so that it can function without Bazel, move integration_test and perf_test into folders named integration and perf respectively to fit what go modules expects.

PiperOrigin-RevId: 345077990

Author: suyashkumar

Diff for: go/jsonformat/test/BUILD

@@ -2,51 +2,7 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-load("@io_bazel_rules_go//go:def.bzl", "go_test")
-
-go_test(
-    name = "integration_test",
-    size = "large",
-    srcs = ["integration_test.go"],
-    data = [
-        "//spec:r4_examples",
-        "//spec:stu3",
-        "//testdata/r4:bigquery",
-        "//testdata/r4:examples",
-        "//testdata/stu3:bigquery",
-        "//testdata/stu3:examples",
-    ],
-    deps = [
-        "//go/jsonformat",
-        "//go/jsonformat/internal/jsonpbhelper",
-        "//go/jsonformat/internal/protopath",
-        "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_go_proto",
-        "//proto/google/fhir/proto/r4/core/resources:composition_go_proto",
-        "//proto/google/fhir/proto/r4/core/resources:observation_go_proto",
-        "//proto/google/fhir/proto/r4/core/resources:patient_go_proto",
-        "//proto/google/fhir/proto/stu3:resources_go_proto",
-        "@com_bitbucket_creachadair_stringset//:go_default_library",
-        "@com_github_golang_protobuf//proto:go_default_library",
-        "@com_github_google_go_cmp//cmp:go_default_library",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
-        "@org_golang_google_protobuf//testing/protocmp:go_default_library",
-    ],
-)
-
 filegroup(
     name = "testdata",
     srcs = glob(["testdata/*.json"]),
 )
-
-go_test(
-    name = "perf_test",
-    size = "small",
-    srcs = ["perf_test.go"],
-    data = [
-        ":testdata",
-    ],
-    deps = [
-        "//go/jsonformat",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
-    ],
-)

Diff for: go/jsonformat/test/integration/BUILD

@@ -0,0 +1,34 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "integration_test",
+    size = "large",
+    srcs = ["integration_test.go"],
+    data = [
+        "//spec:r4_examples",
+        "//spec:stu3",
+        "//testdata/r4:bigquery",
+        "//testdata/r4:examples",
+        "//testdata/stu3:bigquery",
+        "//testdata/stu3:examples",
+    ],
+    deps = [
+        "//go/jsonformat",
+        "//go/jsonformat/internal/jsonpbhelper",
+        "//go/jsonformat/internal/protopath",
+        "//proto/google/fhir/proto/r4/core/resources:bundle_and_contained_resource_go_proto",
+        "//proto/google/fhir/proto/r4/core/resources:composition_go_proto",
+        "//proto/google/fhir/proto/r4/core/resources:observation_go_proto",
+        "//proto/google/fhir/proto/r4/core/resources:patient_go_proto",
+        "//proto/google/fhir/proto/stu3:resources_go_proto",
+        "@com_bitbucket_creachadair_stringset//:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_google_go_cmp//cmp:go_default_library",
+        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
+        "@org_golang_google_protobuf//testing/protocmp:go_default_library",
+    ],
+)

Diff for: go/jsonformat/test/integration_test.go renamed to go/jsonformat/test/integration/integration_test.go

@@ -27,6 +27,8 @@ import (
 	"strings"
 	"testing"
 
+	"runtime"
+
 	"github.com/bazelbuild/rules_go/go/tools/bazel"
 	"github.com/google/fhir/go/jsonformat/internal/jsonpbhelper"
 	"github.com/google/fhir/go/jsonformat/internal/protopath"
@@ -532,18 +534,33 @@ func newContainedResource(ver jsonformat.Version) (proto.Message, error) {
 	}
 }
 
+var (
+	_, b, _, _ = runtime.Caller(0)
+	callerRoot = filepath.Dir(b)
+)
+// getRootPath returns the root bazel runfiles path if running in a bazel
+// environment, otherwise it will return the root path of the FHIR proto
+// repository. Typically this is used to access files such as testdata.
+// As usual, the caller should check to see if the expected file(s)
+// exist, and if not, report an error.
+func getRootPath() string {
+	var root string
+ 	root, err := bazel.RunfilesPath()
+ 	if err != nil {
+		// Fall back to the non-bazel way to get to the root directory.
+		root = callerRoot + "/../../../../"
+	}
+	return root
+}
+
 // readTestCases reads the JSON example files and returns the ones that have a
 // matching prototxt file, to be used as a test case.
 func readTestCases(t *testing.T, ver jsonformat.Version) []string {
 	t.Helper()
 	fileNames := readTestCaseFileNames(t, versionToJSONPath[ver])
 	var withGolden []string
 	for _, fileName := range fileNames {
-		root, err := bazel.RunfilesPath()
-		if err != nil {
-			t.Fatalf("failed to read runfiles root: %v", err)
-		}
-		fullPath := path.Join(root, versionToProtoPath[ver], fmt.Sprintf("%s.%s", fileName, txtprotoExt))
+		fullPath := path.Join(getRootPath(), versionToProtoPath[ver], fmt.Sprintf("%s.%s", fileName, txtprotoExt))
 		if _, err := os.Stat(fullPath); err != nil {
 			if os.IsNotExist(err) {
 				continue
@@ -571,11 +588,7 @@ func readTestCaseFile(ver jsonformat.Version, name string) ([]byte, []byte, erro
 
 func readTestCaseFileNames(t *testing.T, basePath string) []string {
 	t.Helper()
-	rp, err := bazel.RunfilesPath()
-	if err != nil {
-		t.Fatalf("Failed to get runfiles tree path: %v", err)
-	}
-	files, err := filepath.Glob(path.Join(rp, fmt.Sprintf("%s*.json", basePath)))
+	files, err := filepath.Glob(path.Join(getRootPath(), fmt.Sprintf("%s*.json", basePath)))
 	if err != nil {
 		t.Fatalf("Failed to read test cases with err: %v", err)
 	}
@@ -591,11 +604,7 @@ func readTestCaseFileNames(t *testing.T, basePath string) []string {
 }
 
 func readFile(basePath, fileName, ext string) ([]byte, error) {
-	root, err := bazel.RunfilesPath()
-	if err != nil {
-		return nil, err
-	}
-	filePath := path.Join(root, basePath, fmt.Sprintf("%s.%s", fileName, ext))
+	filePath := path.Join(getRootPath(), basePath, fmt.Sprintf("%s.%s", fileName, ext))
 	return ioutil.ReadFile(filePath)
 }
 

Diff for: go/jsonformat/test/perf/BUILD

@@ -0,0 +1,18 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "perf_test",
+    size = "small",
+    srcs = ["perf_test.go"],
+    data = [
+        "//go/jsonformat/test:testdata",
+    ],
+    deps = [
+        "//go/jsonformat",
+        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
+    ],
+)