@@ -44,7 +44,8 @@ goog.require('jspb.BinaryConstants');
4444goog . require ( 'jspb.BinaryReader' ) ;
4545goog . require ( 'jspb.BinaryWriter' ) ;
4646goog . require ( 'jspb.utils' ) ;
47-
47+ goog . require ( 'goog.crypt.base64' ) ;
48+ goog . requireType ( 'jspb.BinaryMessage' ) ;
4849
4950/**
5051 * @param {function() } func This function should throw an error when run.
@@ -61,48 +62,90 @@ describe('binaryWriterTest', function() {
6162 it ( 'testWriteErrors' , function ( ) {
6263 // Submessages with invalid field indices should assert.
6364 var writer = new jspb . BinaryWriter ( ) ;
64- var dummyMessage = /** @type {!jspb.BinaryMessage } */ ( { } ) ;
65+ var dummyMessage = /** @type {!jspb.BinaryMessage } */ ( { } ) ;
6566
6667 assertFails ( function ( ) {
6768 writer . writeMessage ( - 1 , dummyMessage , goog . nullFunction ) ;
6869 } ) ;
6970
7071 // Writing invalid field indices should assert.
7172 writer = new jspb . BinaryWriter ( ) ;
72- assertFails ( function ( ) { writer . writeUint64 ( - 1 , 1 ) ; } ) ;
73+ assertFails ( function ( ) {
74+ writer . writeUint64 ( - 1 , 1 ) ;
75+ } ) ;
7376
7477 // Writing out-of-range field values should assert.
7578 writer = new jspb . BinaryWriter ( ) ;
7679
77- assertFails ( function ( ) { writer . writeInt32 ( 1 , - Infinity ) ; } ) ;
78- assertFails ( function ( ) { writer . writeInt32 ( 1 , Infinity ) ; } ) ;
80+ assertFails ( function ( ) {
81+ writer . writeInt32 ( 1 , - Infinity ) ;
82+ } ) ;
83+ assertFails ( function ( ) {
84+ writer . writeInt32 ( 1 , Infinity ) ;
85+ } ) ;
7986
80- assertFails ( function ( ) { writer . writeInt64 ( 1 , - Infinity ) ; } ) ;
81- assertFails ( function ( ) { writer . writeInt64 ( 1 , Infinity ) ; } ) ;
87+ assertFails ( function ( ) {
88+ writer . writeInt64 ( 1 , - Infinity ) ;
89+ } ) ;
90+ assertFails ( function ( ) {
91+ writer . writeInt64 ( 1 , Infinity ) ;
92+ } ) ;
8293
83- assertFails ( function ( ) { writer . writeUint32 ( 1 , - 1 ) ; } ) ;
84- assertFails ( function ( ) { writer . writeUint32 ( 1 , Infinity ) ; } ) ;
94+ assertFails ( function ( ) {
95+ writer . writeUint32 ( 1 , - 1 ) ;
96+ } ) ;
97+ assertFails ( function ( ) {
98+ writer . writeUint32 ( 1 , Infinity ) ;
99+ } ) ;
85100
86- assertFails ( function ( ) { writer . writeUint64 ( 1 , - 1 ) ; } ) ;
87- assertFails ( function ( ) { writer . writeUint64 ( 1 , Infinity ) ; } ) ;
101+ assertFails ( function ( ) {
102+ writer . writeUint64 ( 1 , - 1 ) ;
103+ } ) ;
104+ assertFails ( function ( ) {
105+ writer . writeUint64 ( 1 , Infinity ) ;
106+ } ) ;
88107
89- assertFails ( function ( ) { writer . writeSint32 ( 1 , - Infinity ) ; } ) ;
90- assertFails ( function ( ) { writer . writeSint32 ( 1 , Infinity ) ; } ) ;
108+ assertFails ( function ( ) {
109+ writer . writeSint32 ( 1 , - Infinity ) ;
110+ } ) ;
111+ assertFails ( function ( ) {
112+ writer . writeSint32 ( 1 , Infinity ) ;
113+ } ) ;
91114
92- assertFails ( function ( ) { writer . writeSint64 ( 1 , - Infinity ) ; } ) ;
93- assertFails ( function ( ) { writer . writeSint64 ( 1 , Infinity ) ; } ) ;
115+ assertFails ( function ( ) {
116+ writer . writeSint64 ( 1 , - Infinity ) ;
117+ } ) ;
118+ assertFails ( function ( ) {
119+ writer . writeSint64 ( 1 , Infinity ) ;
120+ } ) ;
94121
95- assertFails ( function ( ) { writer . writeFixed32 ( 1 , - 1 ) ; } ) ;
96- assertFails ( function ( ) { writer . writeFixed32 ( 1 , Infinity ) ; } ) ;
122+ assertFails ( function ( ) {
123+ writer . writeFixed32 ( 1 , - 1 ) ;
124+ } ) ;
125+ assertFails ( function ( ) {
126+ writer . writeFixed32 ( 1 , Infinity ) ;
127+ } ) ;
97128
98- assertFails ( function ( ) { writer . writeFixed64 ( 1 , - 1 ) ; } ) ;
99- assertFails ( function ( ) { writer . writeFixed64 ( 1 , Infinity ) ; } ) ;
129+ assertFails ( function ( ) {
130+ writer . writeFixed64 ( 1 , - 1 ) ;
131+ } ) ;
132+ assertFails ( function ( ) {
133+ writer . writeFixed64 ( 1 , Infinity ) ;
134+ } ) ;
100135
101- assertFails ( function ( ) { writer . writeSfixed32 ( 1 , - Infinity ) ; } ) ;
102- assertFails ( function ( ) { writer . writeSfixed32 ( 1 , Infinity ) ; } ) ;
136+ assertFails ( function ( ) {
137+ writer . writeSfixed32 ( 1 , - Infinity ) ;
138+ } ) ;
139+ assertFails ( function ( ) {
140+ writer . writeSfixed32 ( 1 , Infinity ) ;
141+ } ) ;
103142
104- assertFails ( function ( ) { writer . writeSfixed64 ( 1 , - Infinity ) ; } ) ;
105- assertFails ( function ( ) { writer . writeSfixed64 ( 1 , Infinity ) ; } ) ;
143+ assertFails ( function ( ) {
144+ writer . writeSfixed64 ( 1 , - Infinity ) ;
145+ } ) ;
146+ assertFails ( function ( ) {
147+ writer . writeSfixed64 ( 1 , Infinity ) ;
148+ } ) ;
106149 } ) ;
107150
108151
0 commit comments