From 80b082178129bcfdecef9ad438d238bcea7872f3 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 3 Aug 2020 11:45:02 +1000 Subject: [PATCH] move unit tests to sub folder --- package.json | 4 ++-- .../crypto/MessageEncrypter_test.ts | 12 +++++----- .../{ => unit}/messages/ChatMessage_test.ts | 6 ++--- .../messages/ClosedGroupChatMessage_test.ts | 12 +++++----- .../messages/DeviceLinkMessage_test.ts | 8 +++---- .../messages/DeviceUnlinkMessage_test.ts | 6 ++--- .../messages/EndSessionMessage_test.ts | 6 ++--- .../messages/GroupInvitationMessage_test.ts | 6 ++--- .../messages/OpenGroupMessage_test.ts | 6 ++--- .../messages/ReceiptMessage_test.ts | 6 ++--- .../SessionEstablishedMessage_test.ts | 6 ++--- .../messages/SessionResetMessage_test.ts | 6 ++--- .../{ => unit}/messages/TypingMessage_test.ts | 11 ++++----- .../protocols/MultiDeviceProtocol_test.ts | 12 +++++----- .../protocols/SessionProtocol_test.ts | 12 +++++----- .../{ => unit}/sending/MessageQueue_test.ts | 23 ++++++++++--------- .../{ => unit}/sending/MessageSender_test.ts | 18 +++++++-------- .../sending/PendingMessageCache_test.ts | 8 +++---- .../session/{ => unit}/utils/JobQueue_test.ts | 4 ++-- .../session/{ => unit}/utils/Messages_test.ts | 10 ++++---- .../session/{ => unit}/utils/Promise_test.ts | 2 +- .../session/{ => unit}/utils/String_test.ts | 4 ++-- .../{ => unit}/utils/SyncMessage_test.ts | 10 ++++---- 23 files changed, 99 insertions(+), 99 deletions(-) rename ts/test/session/{ => unit}/crypto/MessageEncrypter_test.ts (93%) rename ts/test/session/{ => unit}/messages/ChatMessage_test.ts (96%) rename ts/test/session/{ => unit}/messages/ClosedGroupChatMessage_test.ts (89%) rename ts/test/session/{ => unit}/messages/DeviceLinkMessage_test.ts (95%) rename ts/test/session/{ => unit}/messages/DeviceUnlinkMessage_test.ts (83%) rename ts/test/session/{ => unit}/messages/EndSessionMessage_test.ts (92%) rename ts/test/session/{ => unit}/messages/GroupInvitationMessage_test.ts (87%) rename ts/test/session/{ => unit}/messages/OpenGroupMessage_test.ts (93%) rename ts/test/session/{ => unit}/messages/ReceiptMessage_test.ts (92%) rename ts/test/session/{ => unit}/messages/SessionEstablishedMessage_test.ts (83%) rename ts/test/session/{ => unit}/messages/SessionResetMessage_test.ts (92%) rename ts/test/session/{ => unit}/messages/TypingMessage_test.ts (90%) rename ts/test/session/{ => unit}/protocols/MultiDeviceProtocol_test.ts (97%) rename ts/test/session/{ => unit}/protocols/SessionProtocol_test.ts (97%) rename ts/test/session/{ => unit}/sending/MessageQueue_test.ts (94%) rename ts/test/session/{ => unit}/sending/MessageSender_test.ts (93%) rename ts/test/session/{ => unit}/sending/PendingMessageCache_test.ts (97%) rename ts/test/session/{ => unit}/utils/JobQueue_test.ts (96%) rename ts/test/session/{ => unit}/utils/Messages_test.ts (94%) rename ts/test/session/{ => unit}/utils/Promise_test.ts (98%) rename ts/test/session/{ => unit}/utils/String_test.ts (98%) rename ts/test/session/{ => unit}/utils/SyncMessage_test.ts (92%) diff --git a/package.json b/package.json index b3202f766..78a64be3e 100644 --- a/package.json +++ b/package.json @@ -31,9 +31,9 @@ "test-lib-view": "NODE_ENV=test-lib yarn run start", "test-loki-view": "NODE_ENV=test-loki yarn run start", "test-electron": "yarn grunt test", - "test-integration": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --timeout 10000 ts/test/session/integration/integration_test.js", + "test-integration": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --full-trace --timeout 10000 ts/test/session/integration/integration_test.js", "test-node": "mocha --recursive --exit test/app test/modules ts/test libloki/test/node --timeout 10000", - "test-session": "mocha --recursive --exit ts/test/session --timeout 10000", + "test-session": "mocha --recursive --exit ts/test/session/unit --full-trace --timeout 10000", "test-medium-groups": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --timeout 10000 integration_test/integration_test.js --grep 'senderkeys'", "test-groups": "ELECTRON_DISABLE_SANDBOX=1 mocha --exit --timeout 10000 integration_test/integration_test.js --grep 'Closed groups'", "eslint": "eslint --cache .", diff --git a/ts/test/session/crypto/MessageEncrypter_test.ts b/ts/test/session/unit/crypto/MessageEncrypter_test.ts similarity index 93% rename from ts/test/session/crypto/MessageEncrypter_test.ts rename to ts/test/session/unit/crypto/MessageEncrypter_test.ts index 6fcb3119e..eb85516e2 100644 --- a/ts/test/session/crypto/MessageEncrypter_test.ts +++ b/ts/test/session/unit/crypto/MessageEncrypter_test.ts @@ -1,13 +1,13 @@ import { expect } from 'chai'; import * as crypto from 'crypto'; import * as sinon from 'sinon'; -import { MessageEncrypter } from '../../../session/crypto'; -import { EncryptionType } from '../../../session/types/EncryptionType'; -import { Stubs, TestUtils } from '../../test-utils'; -import { UserUtil } from '../../../util'; -import { SignalService } from '../../../protobuf'; +import { MessageEncrypter } from '../../../../session/crypto'; +import { EncryptionType } from '../../../../session/types/EncryptionType'; +import { Stubs, TestUtils } from '../../../test-utils'; +import { UserUtil } from '../../../../util'; +import { SignalService } from '../../../../protobuf'; -import * as Ratchet from '../../../session/medium_group/ratchet'; +import * as Ratchet from '../../../../session/medium_group/ratchet'; // tslint:disable-next-line: max-func-body-length describe('MessageEncrypter', () => { diff --git a/ts/test/session/messages/ChatMessage_test.ts b/ts/test/session/unit/messages/ChatMessage_test.ts similarity index 96% rename from ts/test/session/messages/ChatMessage_test.ts rename to ts/test/session/unit/messages/ChatMessage_test.ts index 8e807f7b8..a4a365ac9 100644 --- a/ts/test/session/messages/ChatMessage_test.ts +++ b/ts/test/session/unit/messages/ChatMessage_test.ts @@ -5,11 +5,11 @@ import { ChatMessage, Preview, Quote, -} from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; +} from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import { TextEncoder } from 'util'; import { toNumber } from 'lodash'; -import { Constants } from '../../../session'; +import { Constants } from '../../../../session'; describe('ChatMessage', () => { it('can create empty message with just a timestamp', () => { diff --git a/ts/test/session/messages/ClosedGroupChatMessage_test.ts b/ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts similarity index 89% rename from ts/test/session/messages/ClosedGroupChatMessage_test.ts rename to ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts index 4b6408aae..74692fd58 100644 --- a/ts/test/session/messages/ClosedGroupChatMessage_test.ts +++ b/ts/test/session/unit/messages/ClosedGroupChatMessage_test.ts @@ -3,13 +3,13 @@ import { expect } from 'chai'; import { ChatMessage, ClosedGroupChatMessage, -} from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; +} from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import { TextEncoder } from 'util'; -import { TestUtils } from '../../test-utils'; -import { StringUtils } from '../../../session/utils'; -import { PubKey } from '../../../session/types'; -import { Constants } from '../../../session'; +import { TestUtils } from '../../../test-utils'; +import { StringUtils } from '../../../../session/utils'; +import { PubKey } from '../../../../session/types'; +import { Constants } from '../../../../session'; describe('ClosedGroupChatMessage', () => { let groupId: PubKey; diff --git a/ts/test/session/messages/DeviceLinkMessage_test.ts b/ts/test/session/unit/messages/DeviceLinkMessage_test.ts similarity index 95% rename from ts/test/session/messages/DeviceLinkMessage_test.ts rename to ts/test/session/unit/messages/DeviceLinkMessage_test.ts index 785bfa018..420d7f82f 100644 --- a/ts/test/session/messages/DeviceLinkMessage_test.ts +++ b/ts/test/session/unit/messages/DeviceLinkMessage_test.ts @@ -4,10 +4,10 @@ import { beforeEach } from 'mocha'; import { DeviceLinkGrantMessage, DeviceLinkRequestMessage, -} from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; -import { LokiProfile } from '../../../types/Message'; -import { Constants } from '../../../session'; +} from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; +import { LokiProfile } from '../../../../types/Message'; +import { Constants } from '../../../../session'; describe('DeviceLinkMessage', () => { let linkRequestMessage: DeviceLinkRequestMessage; diff --git a/ts/test/session/messages/DeviceUnlinkMessage_test.ts b/ts/test/session/unit/messages/DeviceUnlinkMessage_test.ts similarity index 83% rename from ts/test/session/messages/DeviceUnlinkMessage_test.ts rename to ts/test/session/unit/messages/DeviceUnlinkMessage_test.ts index a26e1ba53..af8c66f34 100644 --- a/ts/test/session/messages/DeviceUnlinkMessage_test.ts +++ b/ts/test/session/unit/messages/DeviceUnlinkMessage_test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; -import { DeviceUnlinkMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; -import { Constants } from '../../../session'; +import { DeviceUnlinkMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; +import { Constants } from '../../../../session'; describe('DeviceUnlinkMessage', () => { let message: DeviceUnlinkMessage; diff --git a/ts/test/session/messages/EndSessionMessage_test.ts b/ts/test/session/unit/messages/EndSessionMessage_test.ts similarity index 92% rename from ts/test/session/messages/EndSessionMessage_test.ts rename to ts/test/session/unit/messages/EndSessionMessage_test.ts index 53e49f8df..fed88af24 100644 --- a/ts/test/session/messages/EndSessionMessage_test.ts +++ b/ts/test/session/unit/messages/EndSessionMessage_test.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; -import { EndSessionMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; +import { EndSessionMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import { TextEncoder } from 'util'; -import { Constants } from '../../../session'; +import { Constants } from '../../../../session'; describe('EndSessionMessage', () => { let message: EndSessionMessage; diff --git a/ts/test/session/messages/GroupInvitationMessage_test.ts b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts similarity index 87% rename from ts/test/session/messages/GroupInvitationMessage_test.ts rename to ts/test/session/unit/messages/GroupInvitationMessage_test.ts index 5dddd2ecb..72bda5fb7 100644 --- a/ts/test/session/messages/GroupInvitationMessage_test.ts +++ b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; -import { GroupInvitationMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; -import { Constants } from '../../../session'; +import { GroupInvitationMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; +import { Constants } from '../../../../session'; describe('GroupInvitationMessage', () => { let message: GroupInvitationMessage; diff --git a/ts/test/session/messages/OpenGroupMessage_test.ts b/ts/test/session/unit/messages/OpenGroupMessage_test.ts similarity index 93% rename from ts/test/session/messages/OpenGroupMessage_test.ts rename to ts/test/session/unit/messages/OpenGroupMessage_test.ts index c3244ca75..48b6a4197 100644 --- a/ts/test/session/messages/OpenGroupMessage_test.ts +++ b/ts/test/session/unit/messages/OpenGroupMessage_test.ts @@ -3,9 +3,9 @@ import { expect } from 'chai'; import { AttachmentPointer, OpenGroupMessage, -} from '../../../session/messages/outgoing'; -import * as MIME from '../../../../ts/types/MIME'; -import { OpenGroup } from '../../../session/types'; +} from '../../../../session/messages/outgoing'; +import * as MIME from '../../../../../ts/types/MIME'; +import { OpenGroup } from '../../../../session/types'; describe('OpenGroupMessage', () => { const group = new OpenGroup({ diff --git a/ts/test/session/messages/ReceiptMessage_test.ts b/ts/test/session/unit/messages/ReceiptMessage_test.ts similarity index 92% rename from ts/test/session/messages/ReceiptMessage_test.ts rename to ts/test/session/unit/messages/ReceiptMessage_test.ts index 9643f92a9..bcc0f25ac 100644 --- a/ts/test/session/messages/ReceiptMessage_test.ts +++ b/ts/test/session/unit/messages/ReceiptMessage_test.ts @@ -4,10 +4,10 @@ import { beforeEach } from 'mocha'; import { DeliveryReceiptMessage, ReadReceiptMessage, -} from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; +} from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import { toNumber } from 'lodash'; -import { Constants } from '../../../session'; +import { Constants } from '../../../../session'; describe('ReceiptMessage', () => { let readMessage: ReadReceiptMessage; diff --git a/ts/test/session/messages/SessionEstablishedMessage_test.ts b/ts/test/session/unit/messages/SessionEstablishedMessage_test.ts similarity index 83% rename from ts/test/session/messages/SessionEstablishedMessage_test.ts rename to ts/test/session/unit/messages/SessionEstablishedMessage_test.ts index 270c4364d..e84693204 100644 --- a/ts/test/session/messages/SessionEstablishedMessage_test.ts +++ b/ts/test/session/unit/messages/SessionEstablishedMessage_test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; -import { SessionEstablishedMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; -import { Constants } from '../../../session'; +import { SessionEstablishedMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; +import { Constants } from '../../../../session'; describe('SessionEstablishedMessage', () => { let message: SessionEstablishedMessage; diff --git a/ts/test/session/messages/SessionResetMessage_test.ts b/ts/test/session/unit/messages/SessionResetMessage_test.ts similarity index 92% rename from ts/test/session/messages/SessionResetMessage_test.ts rename to ts/test/session/unit/messages/SessionResetMessage_test.ts index 2013e380b..9857be5db 100644 --- a/ts/test/session/messages/SessionResetMessage_test.ts +++ b/ts/test/session/unit/messages/SessionResetMessage_test.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import { beforeEach } from 'mocha'; -import { SessionRequestMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; +import { SessionRequestMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import { TextDecoder, TextEncoder } from 'util'; -import { Constants } from '../../../session'; +import { Constants } from '../../../../session'; describe('SessionRequestMessage', () => { let message: SessionRequestMessage; diff --git a/ts/test/session/messages/TypingMessage_test.ts b/ts/test/session/unit/messages/TypingMessage_test.ts similarity index 90% rename from ts/test/session/messages/TypingMessage_test.ts rename to ts/test/session/unit/messages/TypingMessage_test.ts index f89a19abc..2d3c981a6 100644 --- a/ts/test/session/messages/TypingMessage_test.ts +++ b/ts/test/session/unit/messages/TypingMessage_test.ts @@ -1,13 +1,12 @@ import { expect } from 'chai'; -import { TypingMessage } from '../../../session/messages/outgoing'; -import { SignalService } from '../../../protobuf'; -import { TextEncoder } from 'util'; +import { TypingMessage } from '../../../../session/messages/outgoing'; +import { SignalService } from '../../../../protobuf'; import Long from 'long'; import { toNumber } from 'lodash'; -import { StringUtils } from '../../../session/utils'; -import { TestUtils } from '../../test-utils'; -import { Constants } from '../../../session'; +import { StringUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../test-utils'; +import { Constants } from '../../../../session'; describe('TypingMessage', () => { it('has Action.STARTED if isTyping = true', () => { diff --git a/ts/test/session/protocols/MultiDeviceProtocol_test.ts b/ts/test/session/unit/protocols/MultiDeviceProtocol_test.ts similarity index 97% rename from ts/test/session/protocols/MultiDeviceProtocol_test.ts rename to ts/test/session/unit/protocols/MultiDeviceProtocol_test.ts index e1d248121..c44544b5a 100644 --- a/ts/test/session/protocols/MultiDeviceProtocol_test.ts +++ b/ts/test/session/unit/protocols/MultiDeviceProtocol_test.ts @@ -1,11 +1,11 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import { TestUtils } from '../../test-utils'; -import { PairingAuthorisation } from '../../../../js/modules/data'; -import { MultiDeviceProtocol } from '../../../session/protocols'; -import { PubKey } from '../../../session/types'; -import { UserUtil } from '../../../util'; -import { StringUtils } from '../../../session/utils'; +import { TestUtils } from '../../../test-utils'; +import { PairingAuthorisation } from '../../../../../js/modules/data'; +import { MultiDeviceProtocol } from '../../../../session/protocols'; +import { PubKey } from '../../../../session/types'; +import { UserUtil } from '../../../../util'; +import { StringUtils } from '../../../../session/utils'; function generateFakeAuthorisations( primary: PubKey, diff --git a/ts/test/session/protocols/SessionProtocol_test.ts b/ts/test/session/unit/protocols/SessionProtocol_test.ts similarity index 97% rename from ts/test/session/protocols/SessionProtocol_test.ts rename to ts/test/session/unit/protocols/SessionProtocol_test.ts index e836c4488..8f827530c 100644 --- a/ts/test/session/protocols/SessionProtocol_test.ts +++ b/ts/test/session/unit/protocols/SessionProtocol_test.ts @@ -1,12 +1,12 @@ import { expect } from 'chai'; -import { SessionProtocol } from '../../../session/protocols'; import * as sinon from 'sinon'; -import { Stubs, TestUtils } from '../../test-utils'; -import { UserUtil } from '../../../util'; -import { SessionRequestMessage } from '../../../session/messages/outgoing'; +import { SessionProtocol } from '../../../../session/protocols'; +import { Stubs, TestUtils } from '../../../test-utils'; +import { UserUtil } from '../../../../util'; +import { SessionRequestMessage } from '../../../../session/messages/outgoing'; import { TextEncoder } from 'util'; -import { MessageSender } from '../../../session/sending'; -import { PubKey } from '../../../session/types'; +import { MessageSender } from '../../../../session/sending'; +import { PubKey } from '../../../../session/types'; // tslint:disable-next-line: max-func-body-length describe('SessionProtocol', () => { diff --git a/ts/test/session/sending/MessageQueue_test.ts b/ts/test/session/unit/sending/MessageQueue_test.ts similarity index 94% rename from ts/test/session/sending/MessageQueue_test.ts rename to ts/test/session/unit/sending/MessageQueue_test.ts index 6b4315c03..dc48fc8b9 100644 --- a/ts/test/session/sending/MessageQueue_test.ts +++ b/ts/test/session/unit/sending/MessageQueue_test.ts @@ -1,24 +1,25 @@ import chai from 'chai'; import * as sinon from 'sinon'; import _ from 'lodash'; -import { GroupUtils, PromiseUtils } from '../../../session/utils'; -import { Stubs, TestUtils } from '../../../test/test-utils'; -import { MessageQueue } from '../../../session/sending/MessageQueue'; +import { describe } from 'mocha'; + +import { GroupUtils, PromiseUtils } from '../../../../session/utils'; +import { Stubs, TestUtils } from '../../../../test/test-utils'; +import { MessageQueue } from '../../../../session/sending/MessageQueue'; import { ClosedGroupMessage, ContentMessage, OpenGroupMessage, -} from '../../../session/messages/outgoing'; -import { PrimaryPubKey, PubKey, RawMessage } from '../../../session/types'; -import { UserUtil } from '../../../util'; -import { MessageSender } from '../../../session/sending'; +} from '../../../../session/messages/outgoing'; +import { PrimaryPubKey, PubKey, RawMessage } from '../../../../session/types'; +import { UserUtil } from '../../../../util'; +import { MessageSender } from '../../../../session/sending'; import { MultiDeviceProtocol, SessionProtocol, -} from '../../../session/protocols'; -import { PendingMessageCacheStub } from '../../test-utils/stubs'; -import { describe } from 'mocha'; -import { TestSyncMessage } from '../../test-utils/stubs/messages/TestSyncMessage'; +} from '../../../../session/protocols'; +import { PendingMessageCacheStub } from '../../../test-utils/stubs'; +import { TestSyncMessage } from '../../../test-utils/stubs/messages/TestSyncMessage'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised'); diff --git a/ts/test/session/sending/MessageSender_test.ts b/ts/test/session/unit/sending/MessageSender_test.ts similarity index 93% rename from ts/test/session/sending/MessageSender_test.ts rename to ts/test/session/unit/sending/MessageSender_test.ts index 1a6e33ee0..1b1411572 100644 --- a/ts/test/session/sending/MessageSender_test.ts +++ b/ts/test/session/unit/sending/MessageSender_test.ts @@ -2,15 +2,15 @@ import { expect } from 'chai'; import * as crypto from 'crypto'; import * as sinon from 'sinon'; import { toNumber } from 'lodash'; -import { MessageSender } from '../../../session/sending'; -import LokiMessageAPI from '../../../../js/modules/loki_message_api'; -import { TestUtils } from '../../test-utils'; -import { UserUtil } from '../../../util'; -import { MessageEncrypter } from '../../../session/crypto'; -import { SignalService } from '../../../protobuf'; -import { OpenGroupMessage } from '../../../session/messages/outgoing'; -import { EncryptionType } from '../../../session/types/EncryptionType'; -import { PubKey } from '../../../session/types'; +import { MessageSender } from '../../../../session/sending'; +import LokiMessageAPI from '../../../../../js/modules/loki_message_api'; +import { TestUtils } from '../../../test-utils'; +import { UserUtil } from '../../../../util'; +import { MessageEncrypter } from '../../../../session/crypto'; +import { SignalService } from '../../../../protobuf'; +import { OpenGroupMessage } from '../../../../session/messages/outgoing'; +import { EncryptionType } from '../../../../session/types/EncryptionType'; +import { PubKey } from '../../../../session/types'; describe('MessageSender', () => { const sandbox = sinon.createSandbox(); diff --git a/ts/test/session/sending/PendingMessageCache_test.ts b/ts/test/session/unit/sending/PendingMessageCache_test.ts similarity index 97% rename from ts/test/session/sending/PendingMessageCache_test.ts rename to ts/test/session/unit/sending/PendingMessageCache_test.ts index 995d424e3..63177c380 100644 --- a/ts/test/session/sending/PendingMessageCache_test.ts +++ b/ts/test/session/unit/sending/PendingMessageCache_test.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; import * as _ from 'lodash'; -import { MessageUtils } from '../../../session/utils'; -import { TestUtils } from '../../../test/test-utils'; -import { PendingMessageCache } from '../../../session/sending/PendingMessageCache'; -import { SessionProtocol } from '../../../session/protocols'; +import { MessageUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../../test/test-utils'; +import { PendingMessageCache } from '../../../../session/sending/PendingMessageCache'; +import { SessionProtocol } from '../../../../session/protocols'; // Equivalent to Data.StorageItem interface StorageItem { diff --git a/ts/test/session/utils/JobQueue_test.ts b/ts/test/session/unit/utils/JobQueue_test.ts similarity index 96% rename from ts/test/session/utils/JobQueue_test.ts rename to ts/test/session/unit/utils/JobQueue_test.ts index 379641ae4..1abb38b87 100644 --- a/ts/test/session/utils/JobQueue_test.ts +++ b/ts/test/session/unit/utils/JobQueue_test.ts @@ -1,7 +1,7 @@ import chai from 'chai'; import { v4 as uuid } from 'uuid'; -import { JobQueue } from '../../../session/utils/JobQueue'; -import { TestUtils } from '../../test-utils'; +import { JobQueue } from '../../../../session/utils/JobQueue'; +import { TestUtils } from '../../../test-utils'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised'); diff --git a/ts/test/session/utils/Messages_test.ts b/ts/test/session/unit/utils/Messages_test.ts similarity index 94% rename from ts/test/session/utils/Messages_test.ts rename to ts/test/session/unit/utils/Messages_test.ts index cd8b052b9..596bbfe88 100644 --- a/ts/test/session/utils/Messages_test.ts +++ b/ts/test/session/unit/utils/Messages_test.ts @@ -1,14 +1,14 @@ import chai from 'chai'; import * as sinon from 'sinon'; import crypto from 'crypto'; -import { TestUtils } from '../../test-utils/'; -import { MessageUtils } from '../../../session/utils/'; -import { EncryptionType, PubKey } from '../../../session/types/'; -import { SessionProtocol } from '../../../session/protocols'; +import { TestUtils } from '../../../test-utils'; +import { MessageUtils } from '../../../../session/utils'; +import { EncryptionType, PubKey } from '../../../../session/types'; +import { SessionProtocol } from '../../../../session/protocols'; import { MediumGroupChatMessage, SessionRequestMessage, -} from '../../../session/messages/outgoing'; +} from '../../../../session/messages/outgoing'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised'); diff --git a/ts/test/session/utils/Promise_test.ts b/ts/test/session/unit/utils/Promise_test.ts similarity index 98% rename from ts/test/session/utils/Promise_test.ts rename to ts/test/session/unit/utils/Promise_test.ts index 476a2ff6a..b83e1d071 100644 --- a/ts/test/session/utils/Promise_test.ts +++ b/ts/test/session/unit/utils/Promise_test.ts @@ -1,7 +1,7 @@ import chai from 'chai'; import * as sinon from 'sinon'; -import { PromiseUtils } from '../../../session/utils/'; +import { PromiseUtils } from '../../../../session/utils'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised'); diff --git a/ts/test/session/utils/String_test.ts b/ts/test/session/unit/utils/String_test.ts similarity index 98% rename from ts/test/session/utils/String_test.ts rename to ts/test/session/unit/utils/String_test.ts index f9b3be86d..5e42bf731 100644 --- a/ts/test/session/utils/String_test.ts +++ b/ts/test/session/unit/utils/String_test.ts @@ -2,8 +2,8 @@ import chai from 'chai'; import ByteBuffer from 'bytebuffer'; // Can't import type as StringUtils.Encoding -import { Encoding } from '../../../session/utils/String'; -import { StringUtils } from '../../../session/utils/'; +import { Encoding } from '../../../../session/utils/String'; +import { StringUtils } from '../../../../session/utils'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised'); diff --git a/ts/test/session/utils/SyncMessage_test.ts b/ts/test/session/unit/utils/SyncMessage_test.ts similarity index 92% rename from ts/test/session/utils/SyncMessage_test.ts rename to ts/test/session/unit/utils/SyncMessage_test.ts index ff6f168d9..39178028e 100644 --- a/ts/test/session/utils/SyncMessage_test.ts +++ b/ts/test/session/unit/utils/SyncMessage_test.ts @@ -1,11 +1,11 @@ import chai from 'chai'; import * as sinon from 'sinon'; -import { SyncMessageUtils } from '../../../session/utils/'; -import { TestUtils } from '../../test-utils'; -import { UserUtil } from '../../../util'; -import { MultiDeviceProtocol } from '../../../session/protocols'; -import { SyncMessage } from '../../../session/messages/outgoing'; +import { SyncMessageUtils } from '../../../../session/utils'; +import { TestUtils } from '../../../test-utils'; +import { UserUtil } from '../../../../util'; +import { MultiDeviceProtocol } from '../../../../session/protocols'; +import { SyncMessage } from '../../../../session/messages/outgoing'; // tslint:disable-next-line: no-require-imports no-var-requires const chaiAsPromised = require('chai-as-promised');