Skip to content

Move test protos into protos directory #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Move test protos into protos directory #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion binary/proto_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ goog.require('goog.testing.asserts');
goog.require('jspb.BinaryWriter');
goog.require('jspb.Message');

// CommonJS-LoadFromFile: ../testbinary_pb proto.jspb.test
// CommonJS-LoadFromFile: ../protos/testbinary_pb proto.jspb.test
goog.require('proto.jspb.test.ExtendsWithMessage');
goog.require('proto.jspb.test.ForeignEnum');
goog.require('proto.jspb.test.ForeignMessage');
Expand Down
4 changes: 2 additions & 2 deletions commonjs/strict_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ var global = Function('return this')();
// Bring asserts into the global namespace.
googleProtobuf.object.extend(global, asserts);

var test9_pb = require('./test9_pb');
var test10_pb = require('./test10_pb');
var test9_pb = require('./protos/test9_pb');
var test10_pb = require('./protos/test10_pb');

describe('Strict test suite', function() {
it('testImportedMessage', function() {
Expand Down
36 changes: 18 additions & 18 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,32 @@ var wellKnownTypes = [
wellKnownTypes.forEach((path, i) => protocInc + '/' + path);

var group1Protos = [
'data.proto',
'test3.proto',
'test5.proto',
'protos/data.proto',
'protos/test3.proto',
'protos/test5.proto',
'commonjs/test6/test6.proto',
'test8.proto',
'test11.proto',
'test12.proto',
'test13.proto',
'test14.proto',
'test15.proto',
'testbinary.proto',
'testempty.proto',
'test.proto',
'testlargenumbers.proto',
'protos/test8.proto',
'protos/test11.proto',
'protos/test12.proto',
'protos/test13.proto',
'protos/test14.proto',
'protos/test15.proto',
'protos/testbinary.proto',
'protos/testempty.proto',
'protos/test.proto',
'protos/testlargenumbers.proto',
];

var group2Protos = [
'proto3_test.proto',
'test2.proto',
'test4.proto',
'protos/proto3_test.proto',
'protos/test2.proto',
'protos/test4.proto',
'commonjs/test7/test7.proto',
];

var group3Protos = [
'test9.proto',
'test10.proto'
'protos/test9.proto',
'protos/test10.proto'
];

function make_exec_logging_callback(cb) {
Expand Down
4 changes: 2 additions & 2 deletions maps_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
goog.require('goog.testing.asserts');
goog.require('goog.userAgent');

// CommonJS-LoadFromFile: testbinary_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/testbinary_pb proto.jspb.test
goog.require('proto.jspb.test.MapValueEnum');
goog.require('proto.jspb.test.MapValueMessage');
goog.require('proto.jspb.test.TestMapFields');
Expand All @@ -49,7 +49,7 @@ goog.require('proto.jspb.test.MapEntryOptionalValuesDoubleValue');
goog.require('proto.jspb.test.MapEntryOptionalValuesEnumValue');
goog.require('proto.jspb.test.MapEntryOptionalValuesMessageValue');

// CommonJS-LoadFromFile: test_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/test_pb proto.jspb.test
goog.require('proto.jspb.test.MapValueMessageNoBinary');
goog.require('proto.jspb.test.TestMapFieldsNoBinary');

Expand Down
26 changes: 13 additions & 13 deletions message_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,20 @@ goog.require('goog.testing.PropertyReplacer');
goog.require('goog.testing.asserts');
goog.require('goog.userAgent');

// CommonJS-LoadFromFile: google-protobuf jspb
// CommonJS-LoadFromFile: protos/google-protobuf jspb
goog.require('jspb.Message');

// CommonJS-LoadFromFile: test15_pb proto.jspb.filenametest.package1
// CommonJS-LoadFromFile: protos/test15_pb proto.jspb.filenametest.package1
goog.require('proto.jspb.filenametest.package1.b');

// CommonJS-LoadFromFile: test14_pb proto.jspb.filenametest.package2
// CommonJS-LoadFromFile: protos/test14_pb proto.jspb.filenametest.package2
goog.require('proto.jspb.filenametest.package2.TestMessage');

// CommonJS-LoadFromFile: test13_pb proto.jspb.filenametest.package1
// CommonJS-LoadFromFile: protos/test13_pb proto.jspb.filenametest.package1
goog.require('proto.jspb.filenametest.package1.a');
goog.require('proto.jspb.filenametest.package1.TestMessage');

// CommonJS-LoadFromFile: test12_pb proto.jspb.circulartest
// CommonJS-LoadFromFile: protos/test12_pb proto.jspb.circulartest
goog.require('proto.jspb.circulartest.ExtensionContainingType1');
goog.require('proto.jspb.circulartest.ExtensionContainingType2');
goog.require('proto.jspb.circulartest.ExtensionField1');
Expand All @@ -66,25 +66,25 @@ goog.require('proto.jspb.circulartest.NestedMessage2');
goog.require('proto.jspb.circulartest.RepeatedMessageField1');
goog.require('proto.jspb.circulartest.RepeatedMessageField2');

// CommonJS-LoadFromFile: test11_pb proto.jspb.exttest.reverse
// CommonJS-LoadFromFile: protos/test11_pb proto.jspb.exttest.reverse
goog.require('proto.jspb.exttest.reverse.TestExtensionReverseOrderMessage1');
goog.require('proto.jspb.exttest.reverse.TestExtensionReverseOrderMessage2');
goog.require('proto.jspb.exttest.reverse.c');

// CommonJS-LoadFromFile: test8_pb proto.jspb.exttest.nested
// CommonJS-LoadFromFile: protos/test8_pb proto.jspb.exttest.nested
goog.require('proto.jspb.exttest.nested.TestNestedExtensionsMessage');
goog.require('proto.jspb.exttest.nested.TestOuterMessage');

// CommonJS-LoadFromFile: test5_pb proto.jspb.exttest.beta
// CommonJS-LoadFromFile: protos/test5_pb proto.jspb.exttest.beta
goog.require('proto.jspb.exttest.beta.floatingStrField');

// CommonJS-LoadFromFile: test3_pb proto.jspb.exttest
// CommonJS-LoadFromFile: protos/test3_pb proto.jspb.exttest
goog.require('proto.jspb.exttest.floatingMsgField');

// CommonJS-LoadFromFile: test4_pb proto.jspb.exttest
// CommonJS-LoadFromFile: protos/test4_pb proto.jspb.exttest
goog.require('proto.jspb.exttest.floatingMsgFieldTwo');

// CommonJS-LoadFromFile: test_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/test_pb proto.jspb.test
goog.require('proto.jspb.test.BooleanFields');
goog.require('proto.jspb.test.CloneExtension');
goog.require('proto.jspb.test.Complex');
Expand Down Expand Up @@ -113,12 +113,12 @@ goog.require('proto.jspb.test.TestMessageWithOneof');
goog.require('proto.jspb.test.TestReservedNames');
goog.require('proto.jspb.test.TestReservedNamesExtension');

// CommonJS-LoadFromFile: test2_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/test2_pb proto.jspb.test
goog.require('proto.jspb.test.ExtensionMessage');
goog.require('proto.jspb.test.TestExtensionsMessage');

goog.require('proto.jspb.test.TestAllowAliasEnum');
// CommonJS-LoadFromFile: testlargenumbers_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/testlargenumbers_pb proto.jspb.test
goog.require('proto.jspb.test.MessageWithLargeFieldNumbers');

goog.require('proto.jspb.test.simple1');
Expand Down
4 changes: 2 additions & 2 deletions proto3_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@

goog.require('goog.crypt.base64');
goog.require('goog.testing.asserts');
// CommonJS-LoadFromFile: testbinary_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/testbinary_pb proto.jspb.test
goog.require('proto.jspb.test.ForeignMessage');
// CommonJS-LoadFromFile: proto3_test_pb proto.jspb.test
// CommonJS-LoadFromFile: protos/proto3_test_pb proto.jspb.test
goog.require('proto.jspb.test.Proto3Enum');
goog.require('proto.jspb.test.TestProto3');
// CommonJS-LoadFromFile: google/protobuf/any_pb proto.google.protobuf
Expand Down
0 data.proto → protos/data.proto
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion proto3_test.proto → protos/proto3_test.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ syntax = "proto3";

package jspb.test;

import "testbinary.proto";
import "protos/testbinary.proto";

message TestProto3 {
int32 singular_int32 = 1;
Expand Down
0 test.proto → protos/test.proto
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test10.proto → protos/test10.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ syntax = "proto3";

package jspb.exttest.strict.ten;

import "test9.proto";
import "protos/test9.proto";

message Simple10 {
jspb.exttest.strict.nine.Simple9 a = 1;
Expand Down
0 test11.proto → protos/test11.proto
View file
Open in desktop
File renamed without changes.
0 test12.proto → protos/test12.proto
View file
Open in desktop
File renamed without changes.
0 test13.proto → protos/test13.proto
View file
Open in desktop
File renamed without changes.
0 test14.proto → protos/test14.proto
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test15.proto → protos/test15.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ syntax = "proto2";

package jspb.filenametest.package1;

import "test13.proto";
import "protos/test13.proto";

extend TestMessage {
optional int32 b = 2;
Expand Down
2 changes: 1 addition & 1 deletion test2.proto → protos/test2.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ syntax = "proto2";

package jspb.test;

import "test.proto";
import "protos/test.proto";

option java_package = "com.google.apps.jspb.proto";
option java_multiple_files = true;
Expand Down
0 test3.proto → protos/test3.proto
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test4.proto → protos/test4.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ syntax = "proto2";

package jspb.exttest;

import "test3.proto";
import "protos/test3.proto";

option java_package = "com.google.apps.jspb.proto";
option java_multiple_files = true;
Expand Down
0 test5.proto → protos/test5.proto
View file
Open in desktop
File renamed without changes.
0 test8.proto → protos/test8.proto
View file
Open in desktop
File renamed without changes.
0 test9.proto → protos/test9.proto
View file
Open in desktop
File renamed without changes.
0 testbinary.proto → protos/testbinary.proto
View file
Open in desktop
File renamed without changes.
0 testempty.proto → protos/testempty.proto
View file
Open in desktop
File renamed without changes.
0 testlargenumbers.proto → protos/testlargenumbers.proto
View file
Open in desktop
File renamed without changes.