【ut】fix ut

Author: xiongjiaojiao

src/common/commontypes/CircularUtil.js

@@ -1,11 +1,11 @@
 const CircularUtil = {
   lastSeqID: 0,
+  parentUtil: null,
+  setRelativeParentUtil: function (util) {
+    CircularUtil.parentUtil = util;
+  },
   createUniqueID: function (prefix) {
-    if (prefix == null) {
-      prefix = 'id_';
-    }
-    CircularUtil.lastSeqID += 1;
-    return prefix + CircularUtil.lastSeqID;
+    return createUniqueID(prefix, CircularUtil.parentUtil || CircularUtil);
   },
   extend: function (destination, source) {
     destination = destination || {};
@@ -39,4 +39,12 @@ const CircularUtil = {
   }
 };
 
+function createUniqueID(prefix, util) {
+  if (prefix == null) {
+    prefix = 'id_';
+  }
+  util.lastSeqID += 1;
+  return prefix + util.lastSeqID;
+}
+
 export { CircularUtil };

src/common/commontypes/Util.js

@@ -555,7 +555,7 @@ const Util = {
    * @type {number}
    * @default 0
    */
-  lastSeqID: CircularUtil.lastSeqID,
+  lastSeqID: 0,
 
   /**
    * @memberOf CommonUtil
@@ -1255,4 +1255,6 @@ function canBeJsonified(str) {
   }
 }
 
+CircularUtil.setRelativeParentUtil(Util);
+
 export { Util, Browser, INCHES_PER_UNIT, METERS_PER_INCH, DOTS_PER_INCH, IS_GECKO };

test/common/commontypes/UtilSpec.js

@@ -1,4 +1,5 @@
 import { Util } from '../../../src/common/commontypes/Util';
+import { CircularUtil } from '../../../src/common/commontypes/CircularUtil';
 import { Pixel } from '../../../src/common/commontypes/Pixel';
 import { Size } from '../../../src/common/commontypes/Size';
 import { Bounds } from '../../../src/common/commontypes/Bounds';
@@ -400,4 +401,21 @@ describe('Util', () => {
         expect(lastSeqId + 2).toBe(Util.lastSeqID);
     })
 
+    it('createUniqueID no parentUtil', () => {
+        CircularUtil.setRelativeParentUtil(null);
+        expect(CircularUtil.lastSeqID).toBe(0);
+        let id = CircularUtil.createUniqueID();
+        let lastSeqId = CircularUtil.lastSeqID;
+        expect(id).toContain('id_1');
+        expect(id).toBe(`id_${lastSeqId}`);
+        id = CircularUtil.createUniqueID('custom_');
+        expect(id).toContain('custom_');
+        expect(id).toBe(`custom_${lastSeqId + 1}`);
+        id = CircularUtil.createUniqueID();
+        expect(id).toContain('id_');
+        expect(id).toBe(`id_${lastSeqId + 2}`);
+        expect(lastSeqId + 2).toBe(CircularUtil.lastSeqID);
+        CircularUtil.setRelativeParentUtil(Util);
+    })
+
 });