AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/zsurocking/protobuf

Browse Source
This commit is contained in:
Xiao Hang 2015-07-29 15:12:10 -07:00
commit ebcd51ce0f
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
javanano/src/test/java/com/google/protobuf/nano/NanoTest.java
View File

@ -30,20 +30,20 @@
package com.google.protobuf.nano;
import com.google.protobuf.nano.MapTestProto.nano.TestMap;
import com.google.protobuf.nano.MapTestProto.TestMap;
import com.google.protobuf.nano.CodedOutputByteBufferNano;
import com.google.protobuf.nano.MapTestProto.nano.TestMap.MessageValue;
import com.google.protobuf.nano.MapTestProto.TestMap.MessageValue;
import com.google.protobuf.nano.NanoAccessorsOuterClass.TestNanoAccessors;
import com.google.protobuf.nano.NanoHasOuterClass.TestAllTypesNanoHas;
import com.google.protobuf.nano.NanoOuterClass.TestAllTypesNano;
import com.google.protobuf.nano.UnittestRecursiveNano.nano.RecursiveMessageNano;
import com.google.protobuf.nano.UnittestRecursiveNano.RecursiveMessageNano;
import com.google.protobuf.nano.NanoReferenceTypesCompat;
import com.google.protobuf.nano.UnittestSimpleNano.nano.SimpleMessageNano;
import com.google.protobuf.nano.UnittestSingleNano.nano.SingleMessageNano;
import com.google.protobuf.nano.testext.Extensions;
import com.google.protobuf.nano.testext.Extensions.AnotherMessage;
import com.google.protobuf.nano.testext.Extensions.MessageWithGroup;
import com.google.protobuf.nano.testimport.UnittestImportNano;
import com.google.protobuf.nano.UnittestSimpleNano.SimpleMessageNano;
import com.google.protobuf.nano.UnittestSingleNano.SingleMessageNano;
import com.google.protobuf.nano.testext.nano.Extensions;
import com.google.protobuf.nano.testext.nano.Extensions.AnotherMessage;
import com.google.protobuf.nano.testext.nano.Extensions.MessageWithGroup;
import com.google.protobuf.nano.testimport.nano.UnittestImportNano;
import junit.framework.TestCase;

2
javanano/src/test/java/com/google/protobuf/nano/map_test.proto
View File

@ -32,7 +32,7 @@ syntax = "proto3";
package map_test;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "MapTestProto";
message TestMap {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_accessors_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "NanoAccessorsOuterClass";
message TestNanoAccessors {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_multiple_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_multiple_files = true;
enum FileScopeEnumMultiple {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_enum_class_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "EnumClassNanos";
enum FileScopeEnum {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_enum_validity_nano.proto
View File

@ -1,6 +1,6 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "EnumValidity";
enum E {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_extension_packed_nano.proto
View File

@ -1,7 +1,7 @@
syntax = "proto2";
option java_multiple_files = true;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
import "google/protobuf/nano/unittest_extension_nano.proto";

2
javanano/src/test/java/com/google/protobuf/nano/unittest_extension_repeated_nano.proto
View File

@ -1,7 +1,7 @@
syntax = "proto2";
option java_multiple_files = true;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
import "google/protobuf/nano/unittest_extension_nano.proto";

2
javanano/src/test/java/com/google/protobuf/nano/unittest_extension_singular_nano.proto
View File

@ -1,7 +1,7 @@
syntax = "proto2";
option java_multiple_files = true;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
import "google/protobuf/nano/unittest_extension_nano.proto";

2
javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "NanoHasOuterClass";
message TestAllTypesNanoHas {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nameclash_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest_import;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "MultipleNameClashNano";
option java_multiple_files = true;

2
javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_nano.proto
View File

@ -34,7 +34,7 @@ package protobuf_unittest_import;
import "google/protobuf/nano/unittest_import_nano.proto";
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_multiple_files = true;
enum FileScopeEnum {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
View File

@ -34,7 +34,7 @@ package protobuf_unittest;
import "google/protobuf/nano/unittest_import_nano.proto";
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "NanoOuterClass";
// Same as TestAllTypes but with the nano runtime.

2
javanano/src/test/java/com/google/protobuf/nano/unittest_recursive_nano.proto
View File

@ -33,7 +33,7 @@
package protobuf_unittest_import;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
// Explicit outer classname to suppress legacy info.
option java_outer_classname = "UnittestRecursiveNano";

2
javanano/src/test/java/com/google/protobuf/nano/unittest_reference_types_nano.proto
View File

@ -1,6 +1,6 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "NanoReferenceTypes";
message TestAllTypesNano {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_merge_nano.proto
View File

@ -34,7 +34,7 @@ package protobuf_unittest;
import "google/protobuf/nano/unittest_nano.proto";
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_multiple_files = true;
// A container message for testing the merging of repeated fields at a

2
javanano/src/test/java/com/google/protobuf/nano/unittest_repeated_packables_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
option java_outer_classname = "NanoRepeatedPackables";
enum Enum {

2
javanano/src/test/java/com/google/protobuf/nano/unittest_simple_nano.proto
View File

@ -33,7 +33,7 @@
package protobuf_unittest_import;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
// Explicit outer classname to suppress legacy info.
option java_outer_classname = "UnittestSimpleNano";

2
javanano/src/test/java/com/google/protobuf/nano/unittest_single_nano.proto
View File

@ -32,7 +32,7 @@
package protobuf_unittest_import;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
message SingleMessageNano {
}

2
javanano/src/test/java/com/google/protobuf/nano/unittest_stringutf8_nano.proto
View File

@ -33,7 +33,7 @@
package protobuf_unittest_import;
option java_package = "com.google.protobuf.nano";
option java_package = "com.google.protobuf";
// Explicit outer classname to suppress legacy info.
option java_outer_classname = "UnittestStringutf8Nano";