diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2023-07-01 04:14:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-01 02:14:34 +0000 |
| commit | e9848339ddac3d6fe32a0ce0fbe6029c4ad40429 (patch) | |
| tree | 8674ac269970ae79efca9a080ec626a62918505e /src/Ryujinx.Tests/Audio/Renderer/Server | |
| parent | 6e28a4dd13df0ab866e6a178086abe36ca4a2b25 (diff) | |
[Ryujinx.Tests] Address dotnet-format issues (#5389)
* dotnet format style --severity info
Some changes were manually reverted.
* dotnet format analyzers --serverity info
Some changes have been minimally adapted.
* Restore a few unused methods and variables
* Fix new dotnet-format issues after rebase
* Address review comments
* Address most dotnet format whitespace warnings
* Apply dotnet format whitespace formatting
A few of them have been manually reverted and the corresponding warning was silenced
* Format if-blocks correctly
* Run dotnet format after rebase and remove unused usings
- analyzers
- style
- whitespace
* Add comments to disabled warnings
* Simplify properties and array initialization, Use const when possible, Remove trailing commas
* cpu tests: Disable CA2211 for CodeBaseAddress and DataBaseAddress
* Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas"
This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e.
* dotnet format whitespace after rebase
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* First dotnet format pass
* Fix naming rule violations
* Remove naming rule violation exceptions
* Fix comment style
* Use targeted new
* Remove redundant code
* Remove comment alignment
* Remove naming rule exceptions
* Add trailing commas
* Use nameof expression
* Reformat to add remaining trailing commas
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.Tests/Audio/Renderer/Server')
| -rw-r--r-- | src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs | 26 | ||||
| -rw-r--r-- | src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs | 23 |
2 files changed, 24 insertions, 25 deletions
diff --git a/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs index df946a12..55758188 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Server/BehaviourContextTests.cs @@ -8,7 +8,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestCheckFeature() { - int latestRevision = BehaviourContext.BaseRevisionMagic + BehaviourContext.LastRevision; + int latestRevision = BehaviourContext.BaseRevisionMagic + BehaviourContext.LastRevision; int previousRevision = BehaviourContext.BaseRevisionMagic + (BehaviourContext.LastRevision - 1); int invalidRevision = BehaviourContext.BaseRevisionMagic + (BehaviourContext.LastRevision + 1); @@ -22,7 +22,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestsMemoryPoolForceMappingEnabled() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision1); @@ -36,7 +36,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision1() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision1); @@ -62,7 +62,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision2() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision2); @@ -88,7 +88,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision3() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision3); @@ -114,7 +114,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision4() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision4); @@ -140,7 +140,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision5() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision5); @@ -166,7 +166,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision6() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision6); @@ -192,7 +192,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision7() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision7); @@ -218,7 +218,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision8() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision8); @@ -244,7 +244,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision9() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision9); @@ -270,7 +270,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestRevision10() { - BehaviourContext behaviourContext = new BehaviourContext(); + BehaviourContext behaviourContext = new(); behaviourContext.SetUserRevision(BehaviourContext.BaseRevisionMagic + BehaviourContext.Revision10); @@ -293,4 +293,4 @@ namespace Ryujinx.Tests.Audio.Renderer.Server Assert.AreEqual(2, behaviourContext.GetPerformanceMetricsDataFormat()); } } -}
\ No newline at end of file +} diff --git a/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs b/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs index d2c2e6cb..4c931d9e 100644 --- a/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs +++ b/src/Ryujinx.Tests/Audio/Renderer/Server/PoolMapperTests.cs @@ -15,13 +15,13 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestInitializeSystemPool() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; Assert.IsFalse(poolMapper.InitializeSystemPool(ref memoryPoolCpu, CpuAddress, CpuSize)); Assert.IsTrue(poolMapper.InitializeSystemPool(ref memoryPoolDsp, CpuAddress, CpuSize)); @@ -34,7 +34,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestGetProcessHandle() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); @@ -45,13 +45,13 @@ namespace Ryujinx.Tests.Audio.Renderer.Server [Test] public void TestMappings() { - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); MemoryPoolState memoryPoolDsp = MemoryPoolState.Create(MemoryPoolState.LocationType.Dsp); MemoryPoolState memoryPoolCpu = MemoryPoolState.Create(MemoryPoolState.LocationType.Cpu); const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; memoryPoolDsp.SetCpuAddress(CpuAddress, CpuSize); memoryPoolCpu.SetCpuAddress(CpuAddress, CpuSize); @@ -72,10 +72,10 @@ namespace Ryujinx.Tests.Audio.Renderer.Server { const CpuAddress CpuAddress = 0x20000; const DspAddress DspAddress = CpuAddress; // TODO: DSP LLE - const ulong CpuSize = 0x1000; + const ulong CpuSize = 0x1000; - const int MemoryPoolStateArraySize = 0x10; - const CpuAddress CpuAddressRegionEnding = CpuAddress * MemoryPoolStateArraySize; + const int MemoryPoolStateArraySize = 0x10; + const CpuAddress CpuAddressRegionEnding = CpuAddress * MemoryPoolStateArraySize; MemoryPoolState[] memoryPoolStateArray = new MemoryPoolState[MemoryPoolStateArraySize]; @@ -85,13 +85,12 @@ namespace Ryujinx.Tests.Audio.Renderer.Server memoryPoolStateArray[i].SetCpuAddress(CpuAddress + (ulong)i * CpuSize, CpuSize); } - ErrorInfo errorInfo; AddressInfo addressInfo = AddressInfo.Create(); - PoolMapper poolMapper = new PoolMapper(DummyProcessHandle, true); + PoolMapper poolMapper = new(DummyProcessHandle, true); - Assert.IsTrue(poolMapper.TryAttachBuffer(out errorInfo, ref addressInfo, 0, 0)); + Assert.IsTrue(poolMapper.TryAttachBuffer(out ErrorInfo errorInfo, ref addressInfo, 0, 0)); Assert.AreEqual(ResultCode.InvalidAddressInfo, errorInfo.ErrorCode); Assert.AreEqual(0, errorInfo.ExtraErrorInfo); @@ -105,7 +104,7 @@ namespace Ryujinx.Tests.Audio.Renderer.Server poolMapper = new PoolMapper(DummyProcessHandle, false); - Assert.IsFalse(poolMapper.TryAttachBuffer(out errorInfo, ref addressInfo, 0, 0)); + Assert.IsFalse(poolMapper.TryAttachBuffer(out _, ref addressInfo, 0, 0)); addressInfo.ForceMappedDspAddress = 0; |
