Added tests for Http2Client and AuthorizedHttp2Client

src/utils/api-request.ts

@@ -842,7 +842,7 @@ class AsyncHttp2Call extends AsyncRequestCall {
       ':method': this.options.method,
       ':scheme': this.options.protocol!,
       ':path': this.options.path!,
-      ...this.http2ConfigImpl.headers
+      ...this.options.headers
     });
 
     req.on('response', (headers: IncomingHttp2Headers) => {

test/resources/mocks.ts

@@ -319,54 +319,82 @@ export interface MockHttp2Request {
 
 export interface MockHttp2Response {
   headers: http2.IncomingHttpHeaders & http2.IncomingHttpStatusHeader,
-  data: Buffer
+  data: Buffer,
+  delay?: number,
+  error?: any
 }
 
 export class Http2Mocker {
-  private connectStub: sinon.SinonStub;
+  private connectStub: sinon.SinonStub | null;
   private originalConnect = http2.connect;
+  private timeouts: NodeJS.Timeout[] = [];
+  private mockResponses: MockHttp2Response[] = [];
   public requests: MockHttp2Request[] = [];
 
   public http2Stub(mockResponses: MockHttp2Response[]): void {
+    this.mockResponses = mockResponses
     this.connectStub = sinon.stub(http2, 'connect');
-    this.connectStub.callsFake((target: any, options: any) => {
-      const session = this.originalConnect(target, options);
-      session.request = this.createMockRequest(mockResponses)
+    this.connectStub.callsFake((_target: any, options: any) => {
+      const session = this.originalConnect('https://www.example.com', options);
+      session.request = this.createMockRequest()
       return session;
     })
   }
 
-  private createMockRequest(mockResponses: MockHttp2Response[]) {
+  private createMockRequest() {
     return (requestHeaders: http2.OutgoingHttpHeaders) => {
       // Create a mock ClientHttp2Stream to return
       const mockStream = new stream.Readable({
         // eslint-disable-next-line @typescript-eslint/no-empty-function
         read() {} 
       }) as http2.ClientHttp2Stream;
-  
+
       mockStream.end = (data: any) => {
         this.requests.push({ headers: requestHeaders, data: data })
         return mockStream
       };
 
-      mockStream.setTimeout = sinon.stub()
-
-      process.nextTick(() => {
-        const mockRes = mockResponses.shift()
-        if (mockRes) {
-          mockStream.emit('response', mockRes.headers);
-          mockStream.emit('data', mockRes.data);
-          mockStream.emit('end');
-        }
-      });
+      mockStream.setTimeout = (timeout, callback: () => void) => {
+        this.timeouts.push(setTimeout(callback, timeout))
+      }
+
+      const mockRes = this.mockResponses.shift();
+      if (mockRes) {
+        this.timeouts.push(setTimeout(() => {
+          if (mockRes.error) {
+            mockStream.emit('error', mockRes.error)
+          }
+          else {
+            mockStream.emit('response', mockRes.headers);
+            mockStream.emit('data', mockRes.data);
+            mockStream.emit('end');
+          }
+        }, mockRes.delay))
+      }
+      else {
+        throw Error('A mock request response was expected but not found.')
+      }
       return mockStream;
     }
   }
 
-  public restore(): void {
+  public done(): void {
+    // Clear timeouts
+    this.timeouts.forEach((timeout) => {
+      clearTimeout(timeout)
+    })
+
+    // Remove stub
     if (this.connectStub) {
       this.connectStub.restore();
+      this.connectStub = null;
+    }
+
+    // Check if all mock requests responces were used
+    if (this.mockResponses.length > 0) {
+      throw Error('A extra mock request was provided but not used.')
     }
+
     this.requests = []
   }
 }

test/unit/messaging/messaging.spec.ts

@@ -379,7 +379,7 @@ describe('Messaging', () => {
     if (httpsRequestStub && httpsRequestStub.restore) {
       httpsRequestStub.restore();
     }
-    http2Mocker.restore()
+    http2Mocker.done()
     mockedHttp2Responses = [];
     getTokenStub.restore();
     return mockApp.delete();
@@ -1219,7 +1219,6 @@ describe('Messaging', () => {
         });
     });
 
-    // TODO(jedey): copy
     it('should be fulfilled with a BatchResponse given valid message', () => {
       const messageIds = [
         'projects/projec_id/messages/1',