Merge pull request #5 from lizan/visibility_test

Make transcoding compile with istio/proxy

Author: lizan

src/BUILD

@@ -14,7 +14,7 @@
 #
 ################################################################################
 #
-package(default_visibility = ["//visibility:private"])
+package(default_visibility = ["//visibility:public"])
 
 load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
@@ -97,9 +97,6 @@ cc_library(
     hdrs = [
         "path_matcher.h",
     ],
-    visibility = [
-        "//visibility:public",
-    ],
     deps = [
         ":http_template",
     ],
@@ -113,9 +110,6 @@ cc_library(
     hdrs = [
         "http_template.h",
     ],
-    visibility = [
-        "//visibility:public",
-    ],
 )
 
 cc_library(
@@ -167,7 +161,6 @@ cc_library(
     srcs = [
         "transcoder_input_stream.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         "@protobuf_git//:protobuf",
     ],
@@ -178,11 +171,11 @@ cc_library(
     hdrs = [
         "transcoder.h",
     ],
-    visibility = ["//visibility:public"],
     deps = [
         ":json_request_translator",
         ":message_stream",
         ":response_to_json_translator",
+        ":type_helper",
         "//external:protobuf",
     ],
 )

src/test_common.cc

@@ -186,10 +186,7 @@ std::string GenerateInput(const std::string& seed, size_t size) {
 
 namespace {
 
-std::string LoadFile(const std::string& input_file_name) {
-  const char kTestdata[] = "src/testdata/";
-  std::string file_name = std::string(kTestdata) + input_file_name;
-
+std::string LoadFile(const std::string& file_name) {
   std::ifstream ifs(file_name);
   if (!ifs) {
     ADD_FAILURE() << "Could not open " << file_name.c_str() << std::endl;
@@ -203,8 +200,9 @@ std::string LoadFile(const std::string& input_file_name) {
 }  // namespace
 
 bool LoadService(const std::string& config_pb_txt_file,
+                 const std::string& testdata_path,
                  ::google::api::Service* service) {
-  auto config = LoadFile(config_pb_txt_file);
+  auto config = LoadFile(testdata_path + config_pb_txt_file);
   if (config.empty()) {
     return false;
   }
@@ -218,6 +216,12 @@ bool LoadService(const std::string& config_pb_txt_file,
   }
 }
 
+bool LoadService(const std::string& config_pb_txt_file,
+                 ::google::api::Service* service) {
+  static const char kTestdata[] = "src/testdata/";
+  return LoadService(config_pb_txt_file, kTestdata, service);
+}
+
 unsigned DelimiterToSize(const unsigned char* delimiter) {
   unsigned size = 0;
   // Bytes 1-4 are big-endian 32-bit message size

src/test_common.h

@@ -88,6 +88,9 @@ std::string GenerateInput(const std::string& seed, size_t size);
 
 // Load service from a proto text file. Returns true if loading succeeds;
 // otherwise returns false.
+bool LoadService(const std::string& config_pb_txt_file,
+                 const std::string& testdata_path,
+                 ::google::api::Service* service);
 bool LoadService(const std::string& config_pb_txt_file,
                  ::google::api::Service* service);