cover time API

Signed-off-by: Nzwx1016320 <zhangyushuai1@huawei-partners.com>

time/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js

@@ -22,48 +22,145 @@ import {
     afterAll,
     it,
     expect,
-  } from "deccjsunit/index";
-  import systemTime from "@ohos.systemTime";
+} from "deccjsunit/index";
+import systemTime from "@ohos.systemTime";
 
-  describe("TimeTest", function () {
+describe("TimeTest", function () {
     console.log("start################################start");
 
     /**
-     * @tc.number    SUB_systemTime_getRealActiveTime_JS_API_0100
-     * @tc.name      Test systemTime.getRealActiveTime
-     * @tc.desc      Test systemTime_getRealActiveTime API functionality.
+     * @tc.number    SUB_systemTime_getCurrentTime_JS_API_0001
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds that have elapsed since the Unix epoch.
      * @tc.size      : MEDIUM
      * @tc.type      : Function
-     * @tc.level     : Level 0
+     * @tc.level     : Level 1
      */
-    it("systemTime_getRealActiveTime_test1", 0, async function (done) {
-      console.log("SUB_systemTime_getRealActiveTime_JS_API_0100 start");
+    it("SUB_systemTime_getCurrentTime_JS_API_0001", 0, async function (done) {
+        console.log("---------------UB_systemTime_getCurrentTime_JS_API_0001 start----------------");
+        systemTime.getCurrentTime(true, (error, data) => {
+            if (error) {
+                console.error(`failed to systemTime.getCurrentTime because ` + JSON.stringify(error));
+                expect().assertFail()
+            }
+            console.log(`systemTime.getCurrentTime success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
+        });
+
+        console.log("---------------SUB_systemTime_getRealActiveTime_JS_API_0100 end-----------------");
+        done();
+    });
+
+    /**
+     * @tc.number    SUB_systemTime_getCurrentTime_JS_API_0002
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds that have elapsed since the Unix epoch.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 1
+     */
+    it("SUB_systemTime_getCurrentTime_JS_API_0002", 0, async function (done) {
+        console.log("----------SUB_systemTime_getCurrentTime_JS_API_0002 start----------------");
+        systemTime.getCurrentTime(true).then((data) => {
+            console.log(`systemTime.getCurrentTime promise success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
+        }).catch(err => {
+            console.error(`failed to systemTime.getCurrentTime promise because ` + JSON.stringify(error));
+            expect().assertFail()
+        })
+        console.log("----------SUB_systemTime_getCurrentTime_JS_API_0002 end------------");
+        done();
+    });
 
-      systemTime.getRealActiveTime().then((data) => {
-        console.log("f_ActiveTime1: getRealActiveTime data = " + data);
+    /**
+     * @tc.number    SUB_systemTime_getRealActiveTime_JS_API_0001
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds elapsed since the system was booted, not including deep sleep time.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 1
+     */
+    it("SUB_systemTime_getRealActiveTime_JS_API_0001", 0, async function (done) {
+        console.log("---------------SUB_systemTime_getRealActiveTime_JS_API_0001 start----------------");
+        systemTime.getRealActiveTime(true, (error, data) => {
+            if (error) {
+                console.error(`failed to systemTime.getRealActiveTime because ` + JSON.stringify(error));
+                expect().assertFail()
+            }
+            console.log(`systemTime.getRealActiveTime success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
         });
-      expect(true).assertTrue();
-      console.log("SUB_systemTime_getRealActiveTime_JS_API_0100 end");
+
+        console.log("---------------SUB_systemTime_getRealActiveTime_JS_API_0001 end-----------------");
         done();
     });
 
     /**
-     * @tc.number    SUB_systemTime_getRealTime_JS_API_0100
-     * @tc.name      Test systemTime.getRealTime
-     * @tc.desc      Test systemTime_getRealTime API functionality.
+     * @tc.number    SUB_systemTime_getRealActiveTime_JS_API_0002
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds elapsed since the system was booted, not including deep sleep time.
      * @tc.size      : MEDIUM
      * @tc.type      : Function
-     * @tc.level     : Level 0
+     * @tc.level     : Level 1
      */
-    it("systemTime_getRealTime_test1", 0, async function (done) {
-      console.log("SUB_systemTime_getRealTime_JS_API_0100 start");
+    it("SUB_systemTime_getRealActiveTime_JS_API_0002", 0, async function (done) {
+        console.log("----------SUB_systemTime_getRealActiveTime_JS_API_0002 start----------------");
+        systemTime.getRealActiveTime(true).then((data) => {
+            onsole.log(`systemTime.getRealActiveTime promise success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
+        }).catch(err => {
+            console.error(`failed to systemTime.getRealActiveTime promise because ` + JSON.stringify(error));
+            expect().assertFail()
+        })
+        console.log("----------SUB_systemTime_getRealActiveTime_JS_API_0002 end------------");
+        done();
+    });
 
-      systemTime.getRealTime().then((data) => {
-        console.log("f_RealTime1: getRealTime data = " + data);
+    /**
+     * @tc.number    SUB_systemTime_getRealTime_JS_API_0001
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds elapsed since the system was booted, including deep sleep time.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 1
+     */
+    it("SUB_systemTime_getRealTime_JS_API_0001", 0, async function (done) {
+        console.log("---------------SUB_systemTime_getRealTime_JS_API_0001 start----------------");
+        systemTime.getRealTime(true, (error, data) => {
+            if (error) {
+                console.error(`failed to systemTime.getRealTime because ` + JSON.stringify(error));
+                expect().assertFail()
+            }
+            console.log(`systemTime.getRealTime success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
         });
-      expect(true).assertTrue();
-      console.log("SUB_systemTime_getRealTime_JS_API_0100 end");
+
+        console.log("---------------SUB_systemTime_getRealTime_JS_API_0001 end-----------------");
         done();
     });
+
+    /**
+     * @tc.number    SUB_systemTime_getRealTime_JS_API_0002
+     * @tc.name      Test systemTime.getCurrentTime
+     * @tc.desc      Obtains the number of milliseconds elapsed since the system was booted, not including deep sleep time.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 1
+     */
+    it("SUB_systemTime_getRealTime_JS_API_0002", 0, async function (done) {
+        console.log("----------SUB_systemTime_getRealTime_JS_API_0002 start----------------");
+        systemTime.getRealTime(true).then((data) => {
+            console.log(`systemTime.getRealTime promise success data : ` + JSON.stringify(data));
+            expect(data != null).assertEqual(true);
+        }).catch(err => {
+            console.error(`failed to systemTime.getRealTime promise because ` + JSON.stringify(error));
+            expect().assertFail()
+        })
+        console.log("----------SUB_systemTime_getRealTime_JS_API_0002 end------------");
+        done();
     });
 
+
+
+});
+  
\ No newline at end of file

time/TimeTest_js/src/main/js/default/test/Time.test.js

@@ -18,7 +18,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
 import systemTime from '@ohos.systemTime'
 
 describe('TimeTest', function(){
-    console.log('start################################start');
+	console.log("-------------------TimeTest start----------------------" );
 
 	/**
      * @tc.number    SUB_systemTime_setTime_JS_API_0100
@@ -28,7 +28,7 @@ describe('TimeTest', function(){
      * @tc.type      : Function
      * @tc.level     : Level 0
      */
-    it('systemTime_setTime_test1', 0, async function (done) {
+	it('SUB_systemTime_setTime_JS_API_0100', 0, async function (done) {
 		console.log("SUB_systemTime_setTime_JS_API_0100 start")
 		systemTime.setTime(1526003846000)
 			.then(data =>{
@@ -36,9 +36,7 @@ describe('TimeTest', function(){
 				execpt(data).assertEqual(true)
 			}).catch(error => {
 			console.log("setTime ===error " + error)
-            console.log("setTime ===data " + data)
 			execpt(0).assertLarger(1)
-
 		});
 		console.log('SUB_systemTime_setTime_JS_API_0100 end');
 		done()
@@ -52,16 +50,15 @@ describe('TimeTest', function(){
      * @tc.type      : Function
      * @tc.level     : Level 0
      */
-    it('systemTime_setTime_test2', 0, async function (done) {
+	it('SUB_systemTime_setTime_JS_API_0200', 0, async function (done) {
 		console.log("SUB_systemTime_setTime_JS_API_0200 start")
-        systemTime.setTime(-1)
+		systemTime.setTime(15222)
 			.then(data => {
 				console.log("setTime ===data " + data)
-
+				expect(true).assertTrue();
 			}).catch(error => {
 			console.log("setTime ===error " + error)
 			execpt(0).assertLarger(1)
-
 		});
 		console.log('SUB_systemTime_setTime_JS_API_0200 end');
 		done()
@@ -75,11 +72,16 @@ describe('TimeTest', function(){
      * @tc.type      : Function
      * @tc.level     : Level 0
      */
-    it('systemTime_setTime_test3', 0, async function (done) {
+	it('SUB_systemTime_setTime_JS_API_0300', 0, async function (done) {
 		console.log("SUB_systemTime_setTime_JS_API_0300 start")
-        systemTime.setTime(1597156246000, (error, data) => {
+		systemTime.setTime(1597156246000, (err, data) => {
+			if (err) {
+				console.log("setTime ===error: " + err);
+				expect().assertFail()
+			}else{
 				console.log("setTime ===data: " + data);
-            console.log("setTime ===error: " + error);
+				expect(true).assertTrue();
+			}
 		});
 		console.log('SUB_systemTime_setTime_JS_API_0300 end');
 		done()
@@ -93,14 +95,17 @@ describe('TimeTest', function(){
      * @tc.type      : Function
      * @tc.level     : Level 0
      */
-    it('systemTime_setTime_test4', 0, async function (done) {
+	it('SUB_systemTime_setTime_JS_API_0400', 0, async function (done) {
 		console.log("SUB_systemTime_setTime_JS_API_0400 start")
-        systemTime.setTime(-1, (error, data) => {
+		try{
+			systemTime.setTime(18, (err, data) => {
 			console.log("setTime ===data: " + data);
-            console.log("setTime ===error: " + error);
-        }).catch(error=> {
+			console.log("setTime ===error: " + err);
+			expect(true).assertTrue();
+		})}catch(error) {error => {
 			expect(1).assertLarger(0)
-        })
+			}
+		}
 		console.log('SUB_systemTime_setTime_JS_API_0400 end');
 		done()
 	})
@@ -113,16 +118,17 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setDate_test1', 0, async function (done) {
+	it('SUB_systemTime_setDate_JS_API_0100', 0, async function (done) {
 		console.log("SUB_systemTime_setDate_JS_API_0100 start");
 		var data = new Date("October 13, 2020 11:13:00");
-        systemTime.setDate(-1).then(data => {
+		systemTime.setDate(1).then(data => {
 			console.log("setTime ===data " + data);
-            done();
+			expect(true).assertTrue();
 		}).catch(error => {
 			console.log("setTime ===error " + error);
-            done();
+			expect().assertFail()
 		});
+		done();
 	});
 
 	/**
@@ -133,15 +139,16 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setDate_test2', 0, async function (done) {
+	it('SUB_systemTime_setDate_JS_API_0200', 0, async function (done) {
 		console.log("SUB_systemTime_setDate_JS_API_0200 start");
 		systemTime.setDate(0).then(data => {
 			console.log("setTime ===data " + data);
-            done();
+			expect(true).assertTrue();
 		}).catch(error => {
 			console.log("setTime ===error " + error);
-            done();
+			expect().assertFail()
 		});
+		done();
 	});
 
 	/**
@@ -152,18 +159,19 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setDate_test3', 0, async function (done) {
+	it('SUB_systemTime_setDate_JS_API_0300', 0, async function (done) {
 		console.log("SUB_systemTime_setDate_JS_API_0300 start");
 		var data = new Date("October 13, 2020 11:13:00");
 		systemTime.setDate(data, (error, data) => {
 			if(error){
 				console.log("setTime ===error " + error);
-                done();
+				expect().assertFail()
 			}else{
 				console.log("setTime ===data " + data);
-                done();
+				expect(true).assertTrue();
 			}
 		});
+		done();
 	});
 
 	/**
@@ -174,15 +182,16 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setTimezone_test1', 0, async function (done) {
+	it('SUB_systemTime_setTimezone_JS_API_0100', 0, async function (done) {
 		console.log("SUB_systemTime_setTimezone_JS_API_0100 start");
 		systemTime.setTimezone('Asia, Shanghai').then(data => {
 			console.log("setTime ===data " + data)
-            done();
+			expect().assertFail()
 		}).catch(error => {
 			console.log("setTime ===error " + error)
-            done();
+			expect(true).assertTrue();
 		});
+		done();
 	});
 
 	/**
@@ -193,15 +202,16 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setTimezone_test1', 0, async function (done) {
-        console.log("SUB_systemTime_setTimezone_JS_API_0100 start");
+	it('SUB_systemTime_setTimezone_JS_API_0200', 0, async function (done) {
+		console.log("SUB_systemTime_setTimezone_JS_API_0200 start");
 		systemTime.setTimezone('Beijing,China').then(data => {
 			console.log("setTime ===data " + data)
-            done();
+			expect().assertFail()
 		}).catch(error => {
 			console.log("setTime ===error " + error)
-            done();
+			expect(true).assertTrue();
 		});
+		done();
 	});
 
 	/**
@@ -212,14 +222,15 @@ describe('TimeTest', function(){
     * @tc.type      : Function
     * @tc.level     : Level 0
     */
-    it('systemTime_setTimezone_test1', 0, async function (done) {
-        console.log("SUB_systemTime_setTimezone_JS_API_0100 start");
+	it('SUB_systemTime_setTimezone_JS_API_0300', 0, async function (done) {
+		console.log("SUB_systemTime_setTimezone_JS_API_0300 start");
 		systemTime.setTimezone('Baker Island, U.S.A.').then(data => {
 			console.log("setTime ===data " + data)
-            done();
+			expect().assertFail()
 		}).catch(error => {
 			console.log("setTime ===error " + error)
-            done();
+			expect(true).assertTrue();
 		});
+		done();
 	});
 })