From 97e9fb7c5fa34b5fdf737c3e037a1596bf3cb082 Mon Sep 17 00:00:00 2001 From: Marc Pichler Date: Tue, 11 Feb 2025 10:55:18 +0100 Subject: [PATCH] chore: clean up merge --- .../test/common/hex-to-base64.test.ts | 34 -------- .../test/common/utils/wrap.test.ts | 82 ------------------- 2 files changed, 116 deletions(-) delete mode 100644 packages/opentelemetry-core/test/common/hex-to-base64.test.ts delete mode 100644 packages/opentelemetry-core/test/common/utils/wrap.test.ts diff --git a/packages/opentelemetry-core/test/common/hex-to-base64.test.ts b/packages/opentelemetry-core/test/common/hex-to-base64.test.ts deleted file mode 100644 index 3249621072f..00000000000 --- a/packages/opentelemetry-core/test/common/hex-to-base64.test.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from 'assert'; -import { hexToBase64 } from '../../src/platform'; - -describe('hexToBase64', () => { - it('convert hex to base64', () => { - const id1 = '7deb739e02e44ef2'; - const id2 = '12abc034d567e89ff26e608c8cf42c80'; - const id3 = id2.toUpperCase(); - assert.strictEqual(hexToBase64(id1), 'fetzngLkTvI='); - assert.strictEqual(hexToBase64(id2), 'EqvANNVn6J/ybmCMjPQsgA=='); - assert.strictEqual(hexToBase64(id3), 'EqvANNVn6J/ybmCMjPQsgA=='); - // Don't use the preallocated path - assert.strictEqual( - hexToBase64(id2.repeat(2)), - 'EqvANNVn6J/ybmCMjPQsgBKrwDTVZ+if8m5gjIz0LIA=' - ); - }); -}); diff --git a/packages/opentelemetry-core/test/common/utils/wrap.test.ts b/packages/opentelemetry-core/test/common/utils/wrap.test.ts deleted file mode 100644 index 6881c34bd84..00000000000 --- a/packages/opentelemetry-core/test/common/utils/wrap.test.ts +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import * as assert from 'assert'; - -import { isWrapped, ShimWrapped } from '../../../src'; - -function makeWrapped( - wrapped: unknown, - unwrap: any, - original: any -): ShimWrapped { - const wrapper = function () {}; - defineProperty(wrapper, '__wrapped', wrapped); - defineProperty(wrapper, '__unwrap', unwrap); - defineProperty(wrapper, '__original', original); - return wrapper as unknown as ShimWrapped; -} - -function defineProperty(obj: any, name: string, value: unknown) { - // eslint-disable-next-line no-prototype-builtins - const enumerable = !!obj[name] && obj.propertyIsEnumerable(name); - Object.defineProperty(obj, name, { - configurable: true, - enumerable: enumerable, - writable: true, - value: value, - }); -} - -const notWrappedFunctions: any[] = []; -notWrappedFunctions.push( - makeWrapped( - false, - () => {}, - () => {} - ) -); -notWrappedFunctions.push(makeWrapped(false, 'foo', () => {})); -notWrappedFunctions.push(makeWrapped(false, () => {}, 'foo')); -notWrappedFunctions.push({ - __wrapped: true, - __unwrap: function () {}, - __original: function () {}, -}); - -describe('utils-wrap', () => { - describe('isWrapped', () => { - it('should return true when function was wrapped', () => { - const wrapped: ShimWrapped = makeWrapped( - true, - () => {}, - () => {} - ); - assert.strictEqual(isWrapped(wrapped), true, 'function is not wrapped'); - }); - - it('should return false when function is not wrapped', () => { - notWrappedFunctions.forEach((wrapped: unknown, index: number) => { - const result = isWrapped(wrapped as ShimWrapped); - assert.strictEqual( - result, - false, - `function number #${index} is wrapped` - ); - }); - }); - }); -});