diff --git a/uni_modules/uts-tests/utssdk/ArrayBuffer.uts b/uni_modules/uts-tests/utssdk/ArrayBuffer.uts index 0055f7e4dbe618428c8ef39a07df0975c2c0b26a..c0f362f4d5279936261ab1ec02df081bbbe839c4 100644 --- a/uni_modules/uts-tests/utssdk/ArrayBuffer.uts +++ b/uni_modules/uts-tests/utssdk/ArrayBuffer.uts @@ -9,7 +9,7 @@ import { TUint8Array } from './TUInt8Array.uts' import { TUint8ClampedArray } from './TUInt8ClampedArray.uts' import { TUint16Array } from './TUint16Array.uts' import { TUint32Array } from './TUint32Array.uts' -// #ifdef UNI-APP-X && APP-ANDROID +// #ifdef APP-ANDROID import ByteBuffer from 'java.nio.ByteBuffer'; // #endif @@ -26,7 +26,7 @@ const int16 = new TInt16Array() export function testArrayBuffer() : Result { return describe("ArrayBuffer", () => { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB test('arraybuffer_isview', () => { // #TEST ArrayBuffer.isView var arrayBuffer = new ArrayBuffer(16) @@ -42,7 +42,7 @@ export function testArrayBuffer() : Result { expect(isViewA).toEqual(false); }) - // #ifdef UNI-APP-X && APP-ANDROID + // #ifdef APP-ANDROID test('arraybuffer_toByteBuffer', () => { // #TEST ArrayBuffer.fromByteBuffer,ArrayBuffer.toByteBuffer var byteBuffer = ByteBuffer.allocate(100) diff --git a/uni_modules/uts-tests/utssdk/TDataView.uts b/uni_modules/uts-tests/utssdk/TDataView.uts index 988c93ba6d23881985ce0d08f39bf239ceebb013..1ca5019268607a30118278be700cf6faf9e284b9 100644 --- a/uni_modules/uts-tests/utssdk/TDataView.uts +++ b/uni_modules/uts-tests/utssdk/TDataView.uts @@ -18,7 +18,7 @@ export class TDataView { // this.setUint8(); // this.testMix(); } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB setConstructor() { let buffer = new ArrayBuffer(16); let dataview = new DataView(buffer); diff --git a/uni_modules/uts-tests/utssdk/TFloat32Array.uts b/uni_modules/uts-tests/utssdk/TFloat32Array.uts index 2e6233fce5db12a5462c782acf38dfc2e45cd5e1..6dccc79d3aa9c4ea4ad9c72bea970c5f4d118b05 100644 --- a/uni_modules/uts-tests/utssdk/TFloat32Array.uts +++ b/uni_modules/uts-tests/utssdk/TFloat32Array.uts @@ -7,7 +7,7 @@ import { export class TFloat32Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testfloat32(); this.testConstructor(); this.testSet(); @@ -34,7 +34,7 @@ export class TFloat32Array { this.arrayBufferSlice(); // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB from() { var float32Array = Float32Array.from([1, 2, 3], (v : number, _ : number) : number => v + v); expect(float32Array.toString()).toEqual('2,4,6'); @@ -399,4 +399,4 @@ export class TFloat32Array { } // #endif -} +} \ No newline at end of file diff --git a/uni_modules/uts-tests/utssdk/TFloat64Array.uts b/uni_modules/uts-tests/utssdk/TFloat64Array.uts index 5f65fcb9572cf0c4fff372fc37e65ee8c63db81e..3eaad42ab70b2defe76594794ad817289f11ebfb 100644 --- a/uni_modules/uts-tests/utssdk/TFloat64Array.uts +++ b/uni_modules/uts-tests/utssdk/TFloat64Array.uts @@ -7,7 +7,7 @@ import { export class TFloat64Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testfloat64(); this.testConstructor(); this.testSet(); @@ -34,7 +34,7 @@ export class TFloat64Array { this.arrayBufferSlice(); // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testfloat64() { let float64 = new Float64Array(2); float64[0] = 42; diff --git a/uni_modules/uts-tests/utssdk/TInt16Array.uts b/uni_modules/uts-tests/utssdk/TInt16Array.uts index 1a6ed8c7b88cb9df43788af88443ef2d20ab5a67..0d19306392bd5efccff1011cde7cb81b023b0bba 100644 --- a/uni_modules/uts-tests/utssdk/TInt16Array.uts +++ b/uni_modules/uts-tests/utssdk/TInt16Array.uts @@ -7,7 +7,7 @@ import { export class TInt16Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testConstructor(); this.testSet(); this.testCopyWith(); @@ -34,7 +34,7 @@ export class TInt16Array { // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testConstructor() { let buffer = new ArrayBuffer(16); diff --git a/uni_modules/uts-tests/utssdk/TInt32Array.uts b/uni_modules/uts-tests/utssdk/TInt32Array.uts index 9a8e17af68c4c7ecea0b362ab432cb199b3ff804..ce59fe3b3b6eb2df8189dbb0c57f9547711b554f 100644 --- a/uni_modules/uts-tests/utssdk/TInt32Array.uts +++ b/uni_modules/uts-tests/utssdk/TInt32Array.uts @@ -7,7 +7,7 @@ import { export class TInt32Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testInt32Array(); this.testConstructor(); @@ -36,7 +36,7 @@ export class TInt32Array { // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testInt32Array() { let int32 = new Int32Array(2); @@ -103,7 +103,7 @@ export class TInt32Array { int32 = new Int32Array([1, 2, 3]).fill(4, 1); console.log(int32.toString()); // "1,4,4" - + // expect(int32.toString()).toEqual("1,4,4"); int32 = new Int32Array([1, 2, 3]).fill(4, 1, 2); @@ -113,7 +113,7 @@ export class TInt32Array { int32 = new Int32Array([1, 2, 3]).fill(4, 1, 1); console.log(int32.toString()); // "1,2,3" - + // expect(int32.toString()).toEqual("1,2,3"); int32 = new Int32Array([1, 2, 3]).fill(4, -3, -2); @@ -182,7 +182,7 @@ export class TInt32Array { res = int32.includes(4); console.log(res); // false - + // expect(res).toEqual(false); res = int32.includes(3, 3); @@ -196,7 +196,7 @@ export class TInt32Array { let int32 = new Int32Array([2, 5, 9]); let res = int32.indexOf(2); console.log(res); // 0 - + // expect(res).toEqual(0); res = int32.indexOf(7); @@ -225,12 +225,12 @@ export class TInt32Array { let int32 = new Int32Array([1, 2, 3]); let res = int32.join(); console.log(res); // "1,2,3" - + // expect(res).toEqual("1,2,3"); res = int32.join(" / "); console.log(res); // "1 / 2 / 3" - + // expect(res).toEqual("1 / 2 / 3"); res = int32.join(""); @@ -265,7 +265,7 @@ export class TInt32Array { let total = new Int32Array([0, 1, 2, 3]); let res = total.reduce((accumulator : number, currentValue : number, _ : number, _a : Int32Array) : number => accumulator + currentValue); console.log(res); // 6 - + // expect(res).toEqual(6); total = new Int32Array([0, 1, 2, 3]); @@ -279,7 +279,7 @@ export class TInt32Array { let total = new Int32Array([0, 1, 2, 3]); let res = total.reduceRight((accumulator : number, currentValue : number, _ : number, _a : Int32Array) : number => accumulator + currentValue); console.log(res); // 6 - + // expect(res).toEqual(6); total = new Int32Array([0, 1, 2, 3]); @@ -303,17 +303,17 @@ export class TInt32Array { let int32 = new Int32Array([1, 2, 3]); let res = int32.slice(1); console.log(res.toString()); // "2,3" - + // expect(res.toString()).toEqual("2,3"); res = int32.slice(2); console.log(res.toString()); // "3" - + // expect(res.toString()).toEqual("3"); res = int32.slice(-2); console.log(res.toString()); // "2,3" - + // expect(res.toString()).toEqual("2,3"); res = int32.slice(0, 1); @@ -327,7 +327,7 @@ export class TInt32Array { let numbers = new Int32Array([40, 1, 5]); numbers.sort(); console.log(numbers.toString()); // "1,5,40" - + // expect(numbers.toString()).toEqual("1,5,40"); numbers.sort((a, b) : number => a - b); @@ -379,7 +379,7 @@ export class TInt32Array { const positives = new Int32Array([10, 20, 30, 40, 50]); console.log(int32.some((element : number, index : number, array : Int32Array) : boolean => element < 0)); // true - + // expect(int32.some((element : number, index : number, array : Int32Array) : boolean => element < 0)).toEqual(true); console.log(positives.some((element : number, index : number, array : Int32Array) : boolean => element < 0)); // false diff --git a/uni_modules/uts-tests/utssdk/TInt8Array.uts b/uni_modules/uts-tests/utssdk/TInt8Array.uts index 966509fe1efb5b1e3709051fa679c04914bf289a..7c1b82e8eb7c805d339c069d26e1d7a2fdb7b887 100644 --- a/uni_modules/uts-tests/utssdk/TInt8Array.uts +++ b/uni_modules/uts-tests/utssdk/TInt8Array.uts @@ -8,7 +8,7 @@ import { export class TInt8Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testConstructor(); this.testSet(); @@ -36,7 +36,7 @@ export class TInt8Array { //#endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testConstructor() { let buffer = new ArrayBuffer(16); diff --git a/uni_modules/uts-tests/utssdk/TUInt8Array.uts b/uni_modules/uts-tests/utssdk/TUInt8Array.uts index 7e394cb99ed7963bca0aa45f36d4109b10861676..85921cc1f8e8106398ffba9fa148dd86aeaecfc6 100644 --- a/uni_modules/uts-tests/utssdk/TUInt8Array.uts +++ b/uni_modules/uts-tests/utssdk/TUInt8Array.uts @@ -7,7 +7,7 @@ import { export class TUint8Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testMAX(); this.testConstructor(); @@ -35,7 +35,7 @@ export class TUint8Array { this.arrayBufferSlice(); // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB from() { var s = new Set([1, 2, 3]); diff --git a/uni_modules/uts-tests/utssdk/TUInt8ClampedArray.uts b/uni_modules/uts-tests/utssdk/TUInt8ClampedArray.uts index 56c9321b5dbe5bcda319f397dfccee5dbc6411ab..c5bb397b24be19d088c6508316a3b887372ae755 100644 --- a/uni_modules/uts-tests/utssdk/TUInt8ClampedArray.uts +++ b/uni_modules/uts-tests/utssdk/TUInt8ClampedArray.uts @@ -7,7 +7,7 @@ import { export class TUint8ClampedArray { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testMAX(); this.testConstructor(); @@ -36,7 +36,7 @@ export class TUint8ClampedArray { // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testMAX() { let uint8Clamped = new Uint8ClampedArray(16); diff --git a/uni_modules/uts-tests/utssdk/TUint16Array.uts b/uni_modules/uts-tests/utssdk/TUint16Array.uts index 700ec419c1ded7e67a6c3f73a07a05260ee0cb2c..7adc0dcfa4aaaf6d250b17e25ff325a46ac7b511 100644 --- a/uni_modules/uts-tests/utssdk/TUint16Array.uts +++ b/uni_modules/uts-tests/utssdk/TUint16Array.uts @@ -7,7 +7,7 @@ import { export class TUint16Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testuint16(); this.testConstructor(); this.testSet(); @@ -35,7 +35,7 @@ export class TUint16Array { // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testuint16() { let uint16 = new Uint16Array(2); uint16[0] = 42; diff --git a/uni_modules/uts-tests/utssdk/TUint32Array.uts b/uni_modules/uts-tests/utssdk/TUint32Array.uts index 8c1a02bdd0567b9fa31ff48a68637ee76ef30784..6dc322c0594ab6fcef1319a48d8064824b893573 100644 --- a/uni_modules/uts-tests/utssdk/TUint32Array.uts +++ b/uni_modules/uts-tests/utssdk/TUint32Array.uts @@ -7,7 +7,7 @@ import { export class TUint32Array { test() { - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB this.testuint32(); this.testConstructor(); @@ -36,7 +36,7 @@ export class TUint32Array { // #endif } - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB + // #ifdef APP-ANDROID || WEB testuint32() { let uint32 = new Uint32Array(2); uint32[0] = 42; diff --git a/uni_modules/uts-tests/utssdk/index.uts b/uni_modules/uts-tests/utssdk/index.uts index 023231e26d3073cb4a24fb6d04fe8535cf01dfd4..2c4c08452a9239f6a18abff4a241e81e6d5cf4bd 100644 --- a/uni_modules/uts-tests/utssdk/index.uts +++ b/uni_modules/uts-tests/utssdk/index.uts @@ -3,10 +3,10 @@ import { testDate } from './Date.uts' import { testString } from './String.uts' import { testError } from './Error.uts' import { testKeyWord } from './KeyWord.uts' -import { testJSON } from './JSON.uts' -import { testJSONLarge } from './JSON_large.uts' -import { testUTSJSONObject } from './UTSJSONObject.uts' -import { testConsole } from './console.uts' +import { testJSON } from './JSON.uts' +import { testJSONLarge } from './JSON_large.uts' +import { testUTSJSONObject } from './UTSJSONObject.uts' +import { testConsole } from './console.uts' import { testNumber } from './Number.uts' import { testMap } from './Map.uts' import { testSet } from './Set.uts' @@ -16,9 +16,9 @@ import { testRegExp } from './RegExp.uts' import { testForLoop } from './ForLoop.uts' import { testGlobal } from './Global.uts' import { testType } from './Type.uts' -export { Result } from './tests.uts' -import { testArrayBuffer } from './ArrayBuffer.uts' -import { testNativeCode } from './NativeCode.uts' +export { Result } from './tests.uts' +import { testArrayBuffer } from './ArrayBuffer.uts' +import { testNativeCode } from './NativeCode.uts' // Promise、Proxy、Reflect、Weakmap、WeakSet 不支持 @@ -37,22 +37,22 @@ export function runTests() : UTSJSONObject { const KeyWordRes = testKeyWord(); const ForLoopRes = testForLoop(); const GlobalRes = testGlobal(); - const TypeRes = testType(); + const TypeRes = testType(); const JSONLargeRes = testJSONLarge(); - const consoleRes = testConsole(); - const UTSJSONObjectRes = testUTSJSONObject(); - - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB - const ArrayBufferRes = testArrayBuffer(); - // #endif + const consoleRes = testConsole(); + const UTSJSONObjectRes = testUTSJSONObject(); + + // #ifdef APP-ANDROID || WEB + const ArrayBufferRes = testArrayBuffer(); + // #endif const NativeCodeRes = testNativeCode(); return { Array: ArrayRes, Date: DateRes, String: StringRes, Error: ErrorRes, - Json: JsonRes, - JSONLarge:JSONLargeRes, + Json: JsonRes, + JSONLarge: JSONLargeRes, Number: NumberRes, Map: MapRes, Set: SetRes, @@ -61,13 +61,13 @@ export function runTests() : UTSJSONObject { RegExp: RegExpRes, KeyWord: KeyWordRes, ForLoop: ForLoopRes, - Global: GlobalRes, - Type: TypeRes, - console:consoleRes, - UTSJSONObject:UTSJSONObjectRes, - // #ifdef (UNI-APP-X && APP-ANDROID) || WEB - ArrayBuffer:ArrayBufferRes, - // #endif - NativeCode:NativeCodeRes + Global: GlobalRes, + Type: TypeRes, + console: consoleRes, + UTSJSONObject: UTSJSONObjectRes, + // #ifdef APP-ANDROID || WEB + ArrayBuffer: ArrayBufferRes, + // #endif + NativeCode: NativeCodeRes } } \ No newline at end of file