Skip to content

Commit cbac4b9

Browse files
xm-ixm-i
committed
WinUIViewと、それ以外をプロジェクト分割
1 parent bafcc1f commit cbac4b9

File tree

134 files changed

+340
-411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+340
-411
lines changed

‎RemoteLogViewer.Tests/Models/Ssh/FileViewer/ByteOffsetMap/ByteOffsetIndexTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Models/Ssh/FileViewer/ByteOffsetMap/ByteOffsetIndexTests.cs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
using RemoteLogViewer.Models.Ssh.FileViewer.ByteOffsetMap;
1+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
22
using Shouldly;
33

4-
namespace RemoteLogViewer.Tests.Models.Ssh.FileViewer.ByteOffsetMap;
4+
namespace RemoteLogViewer.Core.Tests.Models.Ssh.FileViewer.ByteOffsetMap;
55

66
public class ByteOffsetIndexTests {
77
[Fact]
@@ -56,18 +56,4 @@ public void Reset_ShouldClearAllEntries() {
5656
index.Count.ShouldBe(0);
5757
index.Find(100).ShouldBe(new (0,0));
5858
}
59-
60-
[Fact]
61-
public void Find_WithUnsortedAdds_ShouldReflectInsertionOrderIteration() {
62-
// 実装は昇順挿入を前提としているため、無秩序な挿入では期待しない結果になる可能性がある。
63-
var index = new ByteOffsetIndex();
64-
index.Add(new (100,1000));
65-
index.Add(new (10,100)); // 大きい行番号の後に小さい行番号を追加
66-
67-
//走査は最初に "< targetLine" を満たさなくなったところで打ち切るため、targetLine=50 は100 に到達して既定値を返す
68-
index.Find(50).ShouldBe(new (0,0));
69-
// targetLine=150 の場合は両方 (100 <150,10 <150) を走査し、最後に見た10 のエントリが結果になる
70-
//これにより順序を崩した挿入で単調性が崩れることを示す
71-
index.Find(150).ShouldBe(new (10,100));
72-
}
7359
}

‎RemoteLogViewer.Tests/Models/Ssh/FileViewer/Operation/BuildByteOffsetMapOperationTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Models/Ssh/FileViewer/Operation/BuildByteOffsetMapOperationTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using RemoteLogViewer.Models.Ssh.FileViewer.Operation;
2-
using RemoteLogViewer.Models.Ssh.FileViewer.ByteOffsetMap;
3-
using RemoteLogViewer.Services.Ssh;
4-
using Shouldly;
1+
using Microsoft.Extensions.Logging;
52
using Moq;
63
using R3;
7-
using Microsoft.Extensions.Logging;
4+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
5+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.Operation;
6+
using RemoteLogViewer.Core.Services.Ssh;
7+
using Shouldly;
88

9-
namespace RemoteLogViewer.Tests.Models.Ssh.FileViewer.Operation;
9+
namespace RemoteLogViewer.Core.Tests.Models.Ssh.FileViewer.Operation;
1010

1111
public class BuildByteOffsetMapOperationTests {
1212
[Fact]

‎RemoteLogViewer.Tests/Models/Ssh/FileViewer/Operation/GrepOperationTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Models/Ssh/FileViewer/Operation/GrepOperationTests.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
using RemoteLogViewer.Models.Ssh.FileViewer.Operation;
2-
using RemoteLogViewer.Models.Ssh.FileViewer.ByteOffsetMap;
3-
using RemoteLogViewer.Services.Ssh;
4-
using RemoteLogViewer.Models.Ssh.FileViewer; // TextLine
5-
using Shouldly;
1+
// TextLine
2+
3+
using Microsoft.Extensions.Logging;
64
using Moq;
75
using R3;
8-
using Microsoft.Extensions.Logging;
6+
using RemoteLogViewer.Core.Models.Ssh.FileViewer;
7+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
8+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.Operation;
9+
using RemoteLogViewer.Core.Services.Ssh;
10+
using Shouldly;
911

10-
namespace RemoteLogViewer.Tests.Models.Ssh.FileViewer.Operation;
12+
namespace RemoteLogViewer.Core.Tests.Models.Ssh.FileViewer.Operation;
1113

1214
public class GrepOperationTests {
1315
[Fact]

‎RemoteLogViewer.Tests/Models/Ssh/FileViewer/Operation/SaveRangeContentOperationTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Models/Ssh/FileViewer/Operation/SaveRangeContentOperationTests.cs‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
using RemoteLogViewer.Models.Ssh.FileViewer.Operation;
2-
using RemoteLogViewer.Models.Ssh.FileViewer.ByteOffsetMap;
3-
using RemoteLogViewer.Models.Ssh.FileViewer; // TextLine
4-
using RemoteLogViewer.Services.Ssh;
5-
using Shouldly;
1+
// TextLine
2+
3+
using Microsoft.Extensions.Logging;
64
using Moq;
75
using R3;
8-
using Microsoft.Extensions.Logging;
6+
using RemoteLogViewer.Core.Models.Ssh.FileViewer;
7+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
8+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.Operation;
9+
using RemoteLogViewer.Core.Services.Ssh;
10+
using Shouldly;
911

10-
namespace RemoteLogViewer.Tests.Models.Ssh.FileViewer.Operation;
12+
namespace RemoteLogViewer.Core.Tests.Models.Ssh.FileViewer.Operation;
1113

1214
public class SaveRangeContentOperationTests {
1315
private IByteOffsetIndex CreateIndex(params ByteOffset[] values) {

‎RemoteLogViewer.Tests/Models/Ssh/FileViewer/Operation/TailFollowOperationTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Models/Ssh/FileViewer/Operation/TailFollowOperationTests.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using RemoteLogViewer.Models.Ssh.FileViewer.Operation;
2-
using RemoteLogViewer.Models.Ssh.FileViewer.ByteOffsetMap;
3-
using RemoteLogViewer.Services.Ssh;
4-
using Shouldly;
1+
using Microsoft.Extensions.Logging;
52
using Moq;
63
using R3;
7-
using Microsoft.Extensions.Logging;
4+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
5+
using RemoteLogViewer.Core.Models.Ssh.FileViewer.Operation;
6+
using RemoteLogViewer.Core.Services.Ssh;
7+
using Shouldly;
88

9-
namespace RemoteLogViewer.Tests.Models.Ssh.FileViewer.Operation;
9+
namespace RemoteLogViewer.Core.Tests.Models.Ssh.FileViewer.Operation;
1010

1111
public class TailFollowOperationTests {
1212
[Fact]

‎RemoteLogViewer.Tests/RemoteLogViewer.Tests.csproj‎ renamed to ‎RemoteLogViewer.Core.Tests/RemoteLogViewer.Core.Tests.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<IsPackable>false</IsPackable>
87
<PlatformTarget>x64</PlatformTarget>
9-
<UseWinUI>true</UseWinUI>
108
</PropertyGroup>
119

1210
<ItemGroup>
@@ -20,7 +18,7 @@
2018
</ItemGroup>
2119

2220
<ItemGroup>
23-
<ProjectReference Include="..\RemoteLogViewer\RemoteLogViewer.csproj" />
21+
<ProjectReference Include="..\RemoteLogViewer.Core\RemoteLogViewer.Core.csproj" />
2422
</ItemGroup>
2523

2624
<ItemGroup>

‎RemoteLogViewer.Tests/TestHelpers/AsyncHelper.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/TestHelpers/AsyncHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Diagnostics;
22

3-
namespace RemoteLogViewer.Tests.TestHelpers;
3+
namespace RemoteLogViewer.Core.Tests.TestHelpers;
44
internal class AsyncHelper {
55
public static async Task WaitUntilAsync<T>(Func<T> valueFunc, T expected, int timeoutMs = 1000, int intervalMs = 5) {
66
var sw = Stopwatch.StartNew();

‎RemoteLogViewer.Core.Tests/TestHelpers/GlobalUsing.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
global using static RemoteLogViewer.Core.Tests.TestHelpers.AsyncHelper;

‎RemoteLogViewer.Tests/Utils/Extensions/ObservableExTests.cs‎ renamed to ‎RemoteLogViewer.Core.Tests/Utils/Extensions/ObservableExTests.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
using Microsoft.Extensions.Time.Testing;
2-
32
using R3;
4-
5-
using RemoteLogViewer.Utils.Extensions;
6-
3+
using RemoteLogViewer.Core.Utils.Extensions;
74
using Shouldly;
85

9-
namespace RemoteLogViewer.Tests.Utils.Extensions;
6+
namespace RemoteLogViewer.Core.Tests.Utils.Extensions;
107

118
public class ObservableExTests {
129
#region ChunkForAddRange

‎RemoteLogViewer.Core/Models/Ssh/FileViewer/ByteOffsetMap/ByteOffset.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
namespace RemoteLogViewer.Core.Models.Ssh.FileViewer.ByteOffsetMap;
2+
3+
public record ByteOffset(long LineNumber, ulong Bytes);

0 commit comments

Comments
 (0)