Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 39 matching lines @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/compiler/command_line_interface.h>
 #include <google/protobuf/compiler/code_generator.h>
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/compiler/mock_code_generator.h>
 #include <google/protobuf/compiler/subprocess.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/unittest.pb.h>
 #include <google/protobuf/testing/file.h>
-#include <google/protobuf/stubs/stringprintf.h>
 #include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/stubs/substitute.h>
 
 #include <google/protobuf/testing/file.h>
 #include <google/protobuf/testing/googletest.h>
 #include <gtest/gtest.h>
 
 
 namespace google {
 namespace protobuf {
@@ skipping 140 matching lines @@
   // The result of Run().
   int return_code_;
 
   // The captured stderr output.
   string error_text_;
 
   // The captured stdout.
   string captured_stdout_;
 
   // Pointers which need to be deleted later.
-  std::vector<CodeGenerator*> mock_generators_to_delete_;
+  vector<CodeGenerator*> mock_generators_to_delete_;
 
   NullCodeGenerator* null_generator_;
 };
 
 class CommandLineInterfaceTest::NullCodeGenerator : public CodeGenerator {
  public:
   NullCodeGenerator() : called_(false) {}
   ~NullCodeGenerator() {}
 
   mutable bool called_;
@@ skipping 53 matching lines @@
   }
 
   // Delete all the MockCodeGenerators.
   for (int i = 0; i < mock_generators_to_delete_.size(); i++) {
     delete mock_generators_to_delete_[i];
   }
   mock_generators_to_delete_.clear();
 }
 
 void CommandLineInterfaceTest::Run(const string& command) {
-  std::vector<string> args = Split(command, " ", true);
+  vector<string> args = Split(command, " ", true);
 
   if (!disallow_plugins_) {
     cli_.AllowPlugins("prefix-");
 #ifndef GOOGLE_THIRD_PARTY_PROTOBUF
     string plugin_path;
 #ifdef GOOGLE_PROTOBUF_TEST_PLUGIN_PATH
     plugin_path = GOOGLE_PROTOBUF_TEST_PLUGIN_PATH;
 #else
     const char* possible_paths[] = {
       // When building with shared libraries, libtool hides the real executable
@@ skipping 341 matching lines @@
       "--test_opt=foo3 "
       "--proto_path=$tmpdir foo.proto");
 
   ExpectNoErrors();
   ExpectGenerated(
       "test_generator", "bar,foo1,foo2,foo3", "foo.proto", "Foo", "a");
   ExpectGenerated(
       "test_generator", "baz,foo1,foo2,foo3", "foo.proto", "Foo", "b");
 }
 
-TEST_F(CommandLineInterfaceTest, ExtraPluginParameters) {
-  // Test that generator parameters specified with the option flag are
-  // correctly passed to the code generator.
-
-  CreateTempFile("foo.proto",
-    "syntax = \"proto2\";\n"
-    "message Foo {}\n");
-  // Create the "a" and "b" sub-directories.
-  CreateTempDir("a");
-  CreateTempDir("b");
-
-  Run("protocol_compiler "
-      "--plug_opt=foo1 "
-      "--plug_out=bar:$tmpdir/a "
-      "--plug_opt=foo2 "
-      "--plug_out=baz:$tmpdir/b "
-      "--plug_opt=foo3 "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated(
-      "test_plugin", "bar,foo1,foo2,foo3", "foo.proto", "Foo", "a");
-  ExpectGenerated(
-      "test_plugin", "baz,foo1,foo2,foo3", "foo.proto", "Foo", "b");
-}
-
-TEST_F(CommandLineInterfaceTest, UnrecognizedExtraParameters) {
-  CreateTempFile("foo.proto",
-    "syntax = \"proto2\";\n"
-    "message Foo {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--unknown_plug_opt=Foo "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("Unknown flag: --unknown_plug_opt");
-}
-
 TEST_F(CommandLineInterfaceTest, Insert) {
   // Test running a generator that inserts code into another's output.
 
   CreateTempFile("foo.proto",
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
 
   Run("protocol_compiler "
       "--test_out=TestParameter:$tmpdir "
       "--plug_out=TestPluginParameter:$tmpdir "
@@ skipping 46 matching lines @@
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
 
   Run("protocol_compiler --test_out=$tmpdir\\ "
       "--proto_path=$tmpdir\\ foo.proto");
 
   ExpectNoErrors();
   ExpectGenerated("test_generator", "", "foo.proto", "Foo");
 }
 
-TEST_F(CommandLineInterfaceTest, Win32ErrorMessage) {
-  EXPECT_EQ("The system cannot find the file specified.\r\n",
-            Subprocess::Win32ErrorMessage(ERROR_FILE_NOT_FOUND));
-}
-
 #endif  // defined(_WIN32) || defined(__CYGWIN__)
 
 TEST_F(CommandLineInterfaceTest, PathLookup) {
   // Test that specifying multiple directories in the proto search path works.
 
   CreateTempFile("b/bar.proto",
     "syntax = \"proto2\";\n"
     "message Bar {}\n");
   CreateTempFile("a/foo.proto",
     "syntax = \"proto2\";\n"
@@ skipping 47 matching lines @@
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
 
   Run("protocol_compiler --test_out=$tmpdir "
       "--proto_path=bar=$tmpdir bar/foo.proto");
 
   ExpectNoErrors();
   ExpectGenerated("test_generator", "", "bar/foo.proto", "Foo");
 }
 
-TEST_F(CommandLineInterfaceTest, PathWithEqualsSign) {
-  // Test setting up a search path which happens to have '=' in it.
-
-  CreateTempDir("with=sign");
-  CreateTempFile("with=sign/foo.proto",
-    "syntax = \"proto2\";\n"
-    "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/with=sign foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
 TEST_F(CommandLineInterfaceTest, MultipleGenerators) {
   // Test that we can have multiple generators and use both in one invocation,
   // each with a different output directory.
 
   CreateTempFile("foo.proto",
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
   // Create the "a" and "b" sub-directories.
   CreateTempDir("a");
   CreateTempDir("b");
@@ skipping 45 matching lines @@
     "message Foo {}\n"
     "service Bar {}\n");
 
   Run("protocol_compiler --test_out=$tmpdir "
       "--proto_path=$tmpdir foo.proto");
 
   ExpectNoErrors();
   ExpectGenerated("test_generator", "", "foo.proto", "Foo");
 }
 
-TEST_F(CommandLineInterfaceTest, DirectDependencies_Missing_EmptyList) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo { optional Bar bar = 1; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies= foo.proto");
-
-  ExpectErrorText(
-      "foo.proto: File is imported but not declared in --direct_dependencies: "
-      "bar.proto\n");
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_Missing) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "import \"bla.proto\";\n"
-                 "message Foo { optional Bar bar = 1; optional Bla bla = 2; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-  CreateTempFile("bla.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bla { optional int64 number = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bla.proto foo.proto");
-
-  ExpectErrorText(
-      "foo.proto: File is imported but not declared in --direct_dependencies: "
-      "bar.proto\n");
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_NoViolation) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo { optional Bar bar = 1; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto foo.proto");
-
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_NoViolation_MultiImports) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "import \"bla.proto\";\n"
-                 "message Foo { optional Bar bar = 1; optional Bla bla = 2; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-  CreateTempFile("bla.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bla { optional int64 number = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto:bla.proto foo.proto");
-
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_ProvidedMultipleTimes) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto --direct_dependencies=bla.proto "
-      "foo.proto");
-
-  ExpectErrorText(
-      "--direct_dependencies may only be passed once. To specify multiple "
-      "direct dependencies, pass them all as a single parameter separated by "
-      "':'.\n");
-}
-
 TEST_F(CommandLineInterfaceTest, CwdRelativeInputs) {
   // Test that we can accept working-directory-relative input files.
 
   SetInputsAreProtoPathRelative(false);
 
   CreateTempFile("foo.proto",
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
 
   Run("protocol_compiler --test_out=$tmpdir "
@@ skipping 567 matching lines @@
     "syntax = \"proto2\";\n"
     "message MockCodeGenerator_HasJsonName {\n"
     "  optional int32 value = 1;\n"
     "}\n");
 
   Run("protocol_compiler --plug_out=$tmpdir --proto_path=$tmpdir foo.proto");
 
   ExpectErrorSubstring("Saw json_name: 1");
 }
 
-TEST_F(CommandLineInterfaceTest, PluginReceivesCompilerVersion) {
-  CreateTempFile("foo.proto",
-    "syntax = \"proto2\";\n"
-    "message MockCodeGenerator_ShowVersionNumber {\n"
-    "  optional int32 value = 1;\n"
-    "}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(
-      StringPrintf("Saw compiler_version: %d %s",
-                   GOOGLE_PROTOBUF_VERSION,
-                   GOOGLE_PROTOBUF_VERSION_SUFFIX));
-}
-
 TEST_F(CommandLineInterfaceTest, GeneratorPluginNotFound) {
   // Test what happens if the plugin isn't found.
 
   CreateTempFile("error.proto",
     "syntax = \"proto2\";\n"
     "message Foo {}\n");
 
   Run("protocol_compiler --badplug_out=TestParameter:$tmpdir "
       "--plugin=prefix-gen-badplug=no_such_file "
       "--proto_path=$tmpdir error.proto");
@@ skipping 254 matching lines @@
       }
     }
 
     return result;
   }
 
   enum Type { TEXT, BINARY };
   enum ReturnCode { SUCCESS, ERROR };
 
   bool Run(const string& command) {
-    std::vector<string> args;
+    vector<string> args;
     args.push_back("protoc");
     SplitStringUsing(command, " ", &args);
     args.push_back("--proto_path=" + TestSourceDir());
 
     google::protobuf::scoped_array<const char * > argv(new const char* [args.size()]);
     for (int i = 0; i < args.size(); i++) {
       argv[i] = args[i].c_str();
     }
 
     CommandLineInterface cli;
@@ skipping 99 matching lines @@
     "google/protobuf/no_such_file.proto: File not found.\n");
 }
 
 }  // anonymous namespace
 
 #endif  // !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN
 
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google