Merge pull request #9735 from humbletim/21190-fix-unit-tests

CR 21190 unit_tests: add support for jasmine.done() and pending

Chris Collins committed 9 years ago

Commit d88d52c2 parents 0351ac1 4c0f6a65 files · +49 −8Browse files

Showing the changes to scripts/developer (5 of 5 files). Show all

Unified · Split

5 files

                 print('<span style="color:red">Tests completed with ' +
                     errorCount + ' ' + ERROR + '.<span>');
             }
-            if (pending.length)
+            if (pending.length) {
                 print ('<span style="color:darkorange">disabled: <br />&nbsp;&nbsp;&nbsp;'+
                        pending.join('<br />&nbsp;&nbsp;&nbsp;')+'</span>');
+            }
             print('Tests completed in ' + (endTime - startTime) + 'ms.');
         };
         this.suiteStarted = function(obj) {

+/* eslint-env jasmine */
 // Art3mis
+// eslint-disable-next-line max-len
 var DEFAULT_AVATAR_URL = "https://hifi-metaverse.s3-us-west-1.amazonaws.com/marketplace/contents/e76946cc-c272-4adf-9bb6-02cde0a4b57d/8fd984ea6fe1495147a3303f87fa6e23.fst?1460131758";
 var ORIGIN = {x: 0, y: 0, z: 0};
 describe("MyAvatar", function () {
+    // backup/restore current skeletonModelURL
+    beforeAll(function() {
+        this.oldURL = MyAvatar.skeletonModelURL;
+    });
+    afterAll(function() {
+        MyAvatar.skeletonModelURL = this.oldURL;
+    });
     // reload the avatar from scratch before each test.
     beforeEach(function (done) {
         MyAvatar.skeletonModelURL = DEFAULT_AVATAR_URL;
                 MyAvatar.position = ORIGIN;
                 MyAvatar.orientation = ROT_IDENT;
                 // give the avatar 1/2 a second to settle on the ground in the idle pose.
-                 Script.setTimeout(function () {
+                Script.setTimeout(function () {
                     done();
                 }, 500);
             }
         }, 500);
-    });
+    }, 10000 /* timeout -- allow time to download avatar*/);
     // makes the assumption that there is solid ground somewhat underneath the avatar.
     it("position and orientation getters", function () {

@@ -1,3 +1,5 @@
		1	/* eslint-env jasmine */
		2
1	Script.include('../../../system/libraries/utils.js');	3	Script.include('../../../system/libraries/utils.js');
2		4
3	describe('Bind', function() {	5	describe('Bind', function() {

+/* eslint-env jasmine */
 describe('Entity', function() {
     var center = Vec3.sum(
         MyAvatar.position,
         },
     };
+    it('serversExist', function() {
+        expect(Entities.serversExist()).toBe(true);
+    });
+    it('canRezTmp', function() {
+        expect(Entities.canRezTmp()).toBe(true);
+    });
     beforeEach(function() {
         boxEntity = Entities.addEntity(boxProps);
     });
         props = Entities.getEntityProperties(boxEntity);
         expect(props.lastEdited).toBeGreaterThan(prevLastEdited);
     });
 });

@@ -1,13 +1,30 @@
		1	/* eslint-env jasmine */
		2
1	// Include testing library	3	// Include testing library
2	Script.include('../../libraries/jasmine/jasmine.js');	4	Script.include('../../libraries/jasmine/jasmine.js');
3	Script.include('../../libraries/jasmine/hifi-boot.js')	5	Script.include('../../libraries/jasmine/hifi-boot.js');
4		6
5	// Include unit tests	7	// Include unit tests
6	// FIXME: Figure out why jasmine done() is not working.	8	Script.include('avatarUnitTests.js');
7	// Script.include('avatarUnitTests.js');
8	Script.include('bindUnitTest.js');	9	Script.include('bindUnitTest.js');
9	Script.include('entityUnitTests.js');	10	Script.include('entityUnitTests.js');
10		11
		12	describe("jasmine internal tests", function() {
		13	it('should support async .done()', function(done) {
		14	var start = new Date;
		15	Script.setTimeout(function() {
		16	expect((new Date - start)/1000).toBeCloseTo(0.5, 1);
		17	done();
		18	}, 500);
		19	});
		20	// jasmine pending test
		21	xit('disabled test', function() {
		22	expect(false).toBe(true);
		23	});
		24	});
		25
		26	// invoke Script.stop (after any async tests complete)
		27	jasmine.getEnv().addReporter({ jasmineDone: Script.stop });
		28
11	// Run the tests	29	// Run the tests
12	jasmine.getEnv().execute();	30	jasmine.getEnv().execute();
13	Script.stop();