!4407 【窗口子系统】修改用例错误码和校验接口返回数据

Merge pull request !4407 from hekun/master

graphic/windowstandard/src/main/js/test/display.test.js

@@ -44,11 +44,11 @@ describe('display_test', function () {
             expect(dsp.height != null).assertTrue();
             expect(dsp.rotation != null).assertTrue();
             expect(dsp.densityDPI != null).assertTrue();
-            expect(dsp.name).assertEqual(undefined);
+            expect(dsp.name != null).assertTrue();
             expect(dsp.alive).assertEqual(undefined);
             expect(dsp.state).assertEqual(undefined);
-            expect(dsp.densityPixels).assertEqual(undefined);
-            expect(dsp.scaledDensity).assertEqual(undefined);
+            expect(dsp.densityPixels != null).assertTrue();
+            expect(dsp.scaledDensity !=null).assertTrue();
             expect(dsp.xDPI).assertEqual(undefined);
             expect(dsp.yDPI).assertEqual(undefined);
             done();
@@ -79,11 +79,11 @@ describe('display_test', function () {
                 expect(data.height != null).assertTrue();
                 expect(data.rotation != null).assertTrue();
                 expect(data.densityDPI != null).assertTrue();
-                expect(data.name).assertEqual(undefined);
+                expect(data.name != null).assertTrue();
                 expect(data.alive).assertEqual(undefined);
                 expect(data.state).assertEqual(undefined);
-                expect(data.densityPixels).assertEqual(undefined);
-                expect(data.scaledDensity).assertEqual(undefined);
+                expect(data.densityPixels != null).assertTrue();
+                expect(data.scaledDensity !=null).assertTrue();
                 expect(data.xDPI).assertEqual(undefined);
                 expect(data.yDPI).assertEqual(undefined);
                 done();
@@ -106,11 +106,11 @@ describe('display_test', function () {
             expect(dsp[0].height != null).assertTrue();
             expect(dsp[0].rotation != null).assertTrue();
             expect(dsp[0].densityDPI != null).assertTrue();
-            expect(dsp[0].name).assertEqual(undefined);
+            expect(dsp[0].name != null).assertTrue();
             expect(dsp[0].alive).assertEqual(undefined);
             expect(dsp[0].state).assertEqual(undefined);
-            expect(dsp[0].densityPixels).assertEqual(undefined);
-            expect(dsp[0].scaledDensity).assertEqual(undefined);
+            expect(dsp[0].densityPixels != null).assertTrue();
+            expect(dsp[0].scaledDensity !=null).assertTrue();
             expect(dsp[0].xDPI).assertEqual(undefined);
             expect(dsp[0].yDPI).assertEqual(undefined);
             done();
@@ -140,11 +140,11 @@ describe('display_test', function () {
                 expect(data[0].height != null).assertTrue();
                 expect(data[0].rotation != null).assertTrue();
                 expect(data[0].densityDPI != null).assertTrue();
-                expect(data[0].name).assertEqual(undefined);
+                expect(data[0].name != null).assertTrue();
                 expect(data[0].alive).assertEqual(undefined);
                 expect(data[0].state).assertEqual(undefined);
-                expect(data[0].densityPixels).assertEqual(undefined);
-                expect(data[0].scaledDensity).assertEqual(undefined);
+                expect(data[0].densityPixels != null).assertTrue();
+                expect(data[0].scaledDensity !=null).assertTrue();
                 expect(data[0].xDPI).assertEqual(undefined);
                 expect(data[0].yDPI).assertEqual(undefined);
                 done();

graphic/windowstandard/src/main/js/test/window.test.js

@@ -1744,7 +1744,7 @@ describe('window_test', function () {
                 done();
             }, (err) => {
                 console.log('windowTest resetSizeTest3 wnd.resetSize failed, err :' + JSON.stringify(err));
-                expect(err.code).assertEqual(7);
+                expect(err.code).assertEqual(1003);
                 done();
             })
         }, (err) => {
@@ -1770,7 +1770,7 @@ describe('window_test', function () {
                 done();
             }, (err) => {
                 console.log('windowTest resetSizeTest4 wnd.resetSize failed, err :' + JSON.stringify(err));
-                expect(err.code).assertEqual(7);
+                expect(err.code).assertEqual(1003);
                 done();
             })
         }, (err) => {