diff options
author | Colin Cross <ccross@android.com> | 2018-10-25 14:37:27 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2018-10-25 14:37:34 -0700 |
commit | f4fe6ab6726e235448020c5fd203e4fc1dad728e (patch) | |
tree | 172e736d6c7428f6afd8f706fb3eae2e8ac786b3 /java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto | |
parent | 6e463f53f1f82dfe0a74e25ae729601a9678730c (diff) | |
parent | b0f5cf02f86449e35377c9ff7b9c0f727d3bf63b (diff) | |
download | protobuf-javalite-f4fe6ab6726e235448020c5fd203e4fc1dad728e.tar.gz |
Merge tag 'v3.0.1-javalite'
Test: m checkbuild
Change-Id: If5b58ea9b85a243ef67c30b182d7ce748c8eb734
Diffstat (limited to 'java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto')
-rw-r--r-- | java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto b/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto new file mode 100644 index 00000000..3e5956b0 --- /dev/null +++ b/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto @@ -0,0 +1,44 @@ +// 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. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +syntax = "proto2"; + +package protobuf_unittest; + + +message TestMessage2 { + message NestedMessage { + // This message's name is the same with the default outer class name of this + // proto file. It's used to test if the compiler can avoid this conflict + // correctly. + message OuterClassNameTest2 { + } + } +} |