Fix up commonjs import tests

These were revealed to be broken by the clean test build
environment. Need to remove more closure asserts.

Author: dibenede

commonjs/import_test.js

@@ -32,21 +32,18 @@
 
 
 
-var googleProtobuf = require('google-protobuf');
-var asserts = require('closure_asserts_commonjs');
-var global = Function('return this')();
+const googleProtobuf = require('google-protobuf');
+const global = Function('return this')();
 
-// Bring asserts into the global namespace.
-googleProtobuf.object.extend(global, asserts);
 googleProtobuf.exportSymbol('jspb.Message', googleProtobuf.Message, global);
 
 var test7_pb = require('./test7/test7_pb');
 googleProtobuf.exportSymbol('proto.jspb.test.framing.FramingMessage', test7_pb.FramingMessage, global);
 
 describe('Import test suite', function() {
   it('testImportedMessage', function() {
-    var framing1 = new proto.jspb.test.framing.FramingMessage([]);
-    var framing2 = new proto.jspb.test.framing.FramingMessage([]);
-    assertObjectEquals(framing1.toObject(), framing2.toObject());
+    const framing1 = new proto.jspb.test.framing.FramingMessage([]);
+    const framing2 = new proto.jspb.test.framing.FramingMessage([]);
+    expect(framing1.toObject()).toEqual(framing2.toObject());
   });
 });

commonjs/strict_test.js

@@ -32,36 +32,32 @@
 
 
 
-var googleProtobuf = require('google-protobuf');
-var asserts = require('closure_asserts_commonjs');
-var global = Function('return this')();
+const googleProtobuf = require('google-protobuf');
+const global = Function('return this')();
 
-// Bring asserts into the global namespace.
-googleProtobuf.object.extend(global, asserts);
-
-var test9_pb = require('./protos/test9_pb');
-var test10_pb = require('./protos/test10_pb');
+const test9_pb = require('./protos/test9_pb');
+const test10_pb = require('./protos/test10_pb');
 
 describe('Strict test suite', function() {
   it('testImportedMessage', function() {
-    var simple1 = new test9_pb.jspb.exttest.strict.nine.Simple9()
-    var simple2 = new test9_pb.jspb.exttest.strict.nine.Simple9()
-    assertObjectEquals(simple1.toObject(), simple2.toObject());
+    const simple1 = new test9_pb.jspb.exttest.strict.nine.Simple9()
+    const simple2 = new test9_pb.jspb.exttest.strict.nine.Simple9()
+    expect(simple1.toObject()).toEqual(simple2.toObject());
   });
 
   it('testGlobalScopePollution', function() {
-    assertObjectEquals(global.jspb.exttest, undefined);
+    expect(global.jspb.exttest).toBeUndefined();
   });
 
   describe('with imports', function() {
     it('testImportedMessage', function() {
-      var simple1 = new test10_pb.jspb.exttest.strict.ten.Simple10()
-      var simple2 = new test10_pb.jspb.exttest.strict.ten.Simple10()
-      assertObjectEquals(simple1.toObject(), simple2.toObject());
+      const simple1 = new test10_pb.jspb.exttest.strict.ten.Simple10()
+      const simple2 = new test10_pb.jspb.exttest.strict.ten.Simple10()
+      expect(simple1.toObject()).toEqual(simple2.toObject());
     });
 
     it('testGlobalScopePollution', function() {
-      assertObjectEquals(global.jspb.exttest, undefined);
+      expect(global.jspb.exttest).toBeUndefined();
     });
   });
 });