mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Update to RingRTC v2.35.0

Browse source 
Co-authored-by: ayumi yu <ayumi@signal.org>
Co-authored-by: ayumi-signal <143036029+ayumi-signal@users.noreply.github.com>
This commit is contained in:
Jim Gustafson 2024-01-04 18:25:51 -08:00 • committed by Scott Nonnenberg
parent a30f277276
commit 6579b1a70a
9 changed files with 40 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

158
ts/test-both/calling/findBestMatchingDevice_test.ts
View file

@ -2,20 +2,12 @@
// SPDX-License-Identifier: AGPL-3.0-only
import { assert } from 'chai';
import { AudioDeviceModule } from '../../calling/audioDeviceModule';
import { findBestMatchingAudioDeviceIndex } from '../../calling/findBestMatchingDevice';
describe('"find best matching device" helpers', () => {
describe('findBestMatchingAudioDeviceIndex', () => {
type AdmOptionsType = Readonly<{
previousAudioDeviceModule: AudioDeviceModule;
currentAudioDeviceModule: AudioDeviceModule;
}>;
const itReturnsUndefinedIfNoDevicesAreAvailable = (
admOptions: AdmOptionsType
) => {
const itReturnsUndefinedIfNoDevicesAreAvailable = () => {
it('returns undefined if no devices are available', () => {
[
undefined,
@ -25,16 +17,13 @@ describe('"find best matching device" helpers', () => {
findBestMatchingAudioDeviceIndex({
available: [],
preferred,
...admOptions,
})
);
});
});
};
const itReturnsTheFirstAvailableDeviceIfNoneIsPreferred = (
admOptions: AdmOptionsType
) => {
const itReturnsTheFirstAvailableDeviceIfNoneIsPreferred = () => {
it('returns the first available device if none is preferred', () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
@ -44,14 +33,13 @@ describe('"find best matching device" helpers', () => {
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: undefined,
...admOptions,
}),
0
);
});
};
const testUniqueIdMatch = (admOptions: AdmOptionsType) => {
const testUniqueIdMatch = () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
available: [
@ -60,13 +48,12 @@ describe('"find best matching device" helpers', () => {
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: { name: 'Ignored', index: 99, uniqueId: 'device-C' },
...admOptions,
}),
2
);
};
const testNameMatch = (admOptions: AdmOptionsType) => {
const testNameMatch = () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
available: [
@ -75,123 +62,32 @@ describe('"find best matching device" helpers', () => {
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: { name: 'C', index: 99, uniqueId: 'ignored' },
...admOptions,
}),
2
);
};
const itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound = (
admOptions: AdmOptionsType
) => {
it('returns the first available device if the preferred device is not found', () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
available: [
{ name: 'A', index: 123, uniqueId: 'device-A' },
{ name: 'B', index: 456, uniqueId: 'device-B' },
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: { name: 'X', index: 123, uniqueId: 'Y' },
...admOptions,
}),
0
);
});
};
describe('with default audio device module', () => {
const admOptions = {
previousAudioDeviceModule: AudioDeviceModule.Default,
currentAudioDeviceModule: AudioDeviceModule.Default,
const itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound =
() => {
it('returns the first available device if the preferred device is not found', () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
available: [
{ name: 'A', index: 123, uniqueId: 'device-A' },
{ name: 'B', index: 456, uniqueId: 'device-B' },
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: { name: 'X', index: 123, uniqueId: 'Y' },
}),
0
);
});
};
itReturnsUndefinedIfNoDevicesAreAvailable(admOptions);
describe('find best matching device', () => {
itReturnsUndefinedIfNoDevicesAreAvailable();
itReturnsTheFirstAvailableDeviceIfNoneIsPreferred(admOptions);
it('returns a unique ID match if it exists', () => {
testUniqueIdMatch(admOptions);
});
it('returns a name match if it exists', () => {
testNameMatch(admOptions);
});
itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound(
admOptions
);
});
describe('when going from the default to Windows ADM2', () => {
const admOptions = {
previousAudioDeviceModule: AudioDeviceModule.Default,
currentAudioDeviceModule: AudioDeviceModule.WindowsAdm2,
};
itReturnsUndefinedIfNoDevicesAreAvailable(admOptions);
itReturnsTheFirstAvailableDeviceIfNoneIsPreferred(admOptions);
it('returns 0 if that was the previous preferred index (and a device is available)', () => {
assert.strictEqual(
findBestMatchingAudioDeviceIndex({
available: [
{ name: 'A', index: 123, uniqueId: 'device-A' },
{ name: 'B', index: 456, uniqueId: 'device-B' },
],
preferred: { name: 'B', index: 0, uniqueId: 'device-B' },
...admOptions,
}),
0
);
});
it('returns a unique ID match if it exists and the preferred index is not 0', () => {
testUniqueIdMatch(admOptions);
});
it('returns a name match if it exists and the preferred index is not 0', () => {
testNameMatch(admOptions);
});
itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound(
admOptions
);
});
describe('when going "backwards" from Windows ADM2 to the default', () => {
const admOptions = {
previousAudioDeviceModule: AudioDeviceModule.WindowsAdm2,
currentAudioDeviceModule: AudioDeviceModule.Default,
};
itReturnsUndefinedIfNoDevicesAreAvailable(admOptions);
itReturnsTheFirstAvailableDeviceIfNoneIsPreferred(admOptions);
it('returns a unique ID match if it exists', () => {
testUniqueIdMatch(admOptions);
});
it('returns a name match if it exists', () => {
testNameMatch(admOptions);
});
itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound(
admOptions
);
});
describe('with Windows ADM2', () => {
const admOptions = {
previousAudioDeviceModule: AudioDeviceModule.WindowsAdm2,
currentAudioDeviceModule: AudioDeviceModule.WindowsAdm2,
};
itReturnsUndefinedIfNoDevicesAreAvailable(admOptions);
itReturnsTheFirstAvailableDeviceIfNoneIsPreferred(admOptions);
itReturnsTheFirstAvailableDeviceIfNoneIsPreferred();
[0, 1].forEach(index => {
it(`returns ${index} if that was the previous preferred index (and a device is available)`, () => {
@ -203,7 +99,6 @@ describe('"find best matching device" helpers', () => {
{ name: 'C', index: 789, uniqueId: 'device-C' },
],
preferred: { name: 'C', index, uniqueId: 'device-C' },
...admOptions,
}),
index
);
@ -215,23 +110,20 @@ describe('"find best matching device" helpers', () => {
findBestMatchingAudioDeviceIndex({
available: [{ name: 'A', index: 123, uniqueId: 'device-A' }],
preferred: { name: 'C', index: 1, uniqueId: 'device-C' },
...admOptions,
}),
0
);
});
it('returns a unique ID match if it exists and the preferred index is not 0 or 1', () => {
testUniqueIdMatch(admOptions);
testUniqueIdMatch();
});
it('returns a name match if it exists and the preferred index is not 0 or 1', () => {
testNameMatch(admOptions);
testNameMatch();
});
itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound(
admOptions
);
itReturnsTheFirstAvailableDeviceIfThePreferredDeviceIsNotFound();
});
});
});