Skip to content

Commit 01b34ae

Browse files
author
喵喵大人
authored
Merge pull request #25 from CatLib/feature/1.2.7
Feature/1.2.7
2 parents 84b5df3 + 5fe164b commit 01b34ae

File tree

16 files changed

+301
-281
lines changed

16 files changed

+301
-281
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
**使用Nuget安装**
2929

3030
```PM
31-
Install-Package CatLib.Core -Version 1.2.6
31+
Install-Package CatLib.Core -Version 1.2.7
3232
```
3333

3434
**直接下载发布版本**

‎src/CatLib.Core.NetStandard/CatLib.Core.NetStandard.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
<Compile Include="..\CatLib.Core\Support\QuickList\InternalList.cs" Link="Support\QuickList\InternalList.cs" />
101101
<Compile Include="..\CatLib.Core\Support\QuickList\IQuickList.cs" Link="Support\QuickList\IQuickList.cs" />
102102
<Compile Include="..\CatLib.Core\Support\QuickList\QuickList.cs" Link="Support\QuickList\QuickList.cs" />
103+
<Compile Include="..\CatLib.Core\Support\RingBuffer\IRingBuffer.cs" Link="Support\RingBuffer\IRingBuffer.cs" />
103104
<Compile Include="..\CatLib.Core\Support\RingBuffer\RingBuffer.cs" Link="Support\RingBuffer\RingBuffer.cs" />
104105
<Compile Include="..\CatLib.Core\Support\SortSet\ISortSet.cs" Link="Support\SortSet\ISortSet.cs" />
105106
<Compile Include="..\CatLib.Core\Support\SortSet\SortSet.cs" Link="Support\SortSet\SortSet.cs" />
@@ -115,8 +116,6 @@
115116
<Compile Include="..\CatLib.Core\Support\Util\Dict.cs" Link="Support\Util\Dict.cs" />
116117
<Compile Include="..\CatLib.Core\Support\Util\Enum.cs" Link="Support\Util\Enum.cs" />
117118
<Compile Include="..\CatLib.Core\Support\Util\IAwait.cs" Link="Support\Util\IAwait.cs" />
118-
<Compile Include="..\CatLib.Core\Support\Util\IReferenceCount.cs" Link="Support\Util\IReferenceCount.cs" />
119-
<Compile Include="..\CatLib.Core\Support\Util\ReferenceCount.cs" Link="Support\Util\ReferenceCount.cs" />
120119
<Compile Include="..\CatLib.Core\Support\Util\Str.cs" Link="Support\Util\Str.cs" />
121120
<Compile Include="..\CatLib.Core\Support\Util\SystemTime.cs" Link="Support\Util\SystemTime.cs" />
122121
<Compile Include="..\CatLib.Core\Support\Util\Util.cs" Link="Support\Util\Util.cs" />

‎src/CatLib.Core.Tests/CatLib.Core.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
<Compile Include="Support\Util\ArrTests.cs" />
5757
<Compile Include="Support\Util\DictTests.cs" />
5858
<Compile Include="Support\Util\EnumTests.cs" />
59-
<Compile Include="Support\Util\ReferenceCountTests.cs" />
6059
<Compile Include="Support\Util\StrTests.cs" />
6160
<Compile Include="Support\Util\SystemTimeTests.cs" />
6261
<Compile Include="Support\VersionTests.cs" />

‎src/CatLib.Core.Tests/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525

2626
[assembly: Guid("3c9f4024-910c-4881-a04d-34a6c3a09019")]
2727

28-
[assembly: AssemblyVersion("1.2.6.0")]
29-
[assembly: AssemblyFileVersion("1.2.6.0")]
28+
[assembly: AssemblyVersion("1.2.7.0")]
29+
[assembly: AssemblyFileVersion("1.2.7.0")]

‎src/CatLib.Core.Tests/Support/SortSet/SortSetTests.cs‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@
99
* Document: http://catlib.io/
1010
*/
1111

12+
using Microsoft.VisualStudio.TestTools.UnitTesting;
1213
using System;
1314
using System.Collections.Generic;
14-
using System.Reflection;
15-
using Microsoft.VisualStudio.TestTools.UnitTesting;
1615

1716
namespace CatLib.Tests.Stl
1817
{
@@ -30,6 +29,56 @@ public int Compare(int x, int y)
3029
}
3130
}
3231

32+
[TestMethod]
33+
public void TestRandValue()
34+
{
35+
var sortSets = new SortSet<int, int>();
36+
var random = new Random();
37+
38+
for (var i = 1000; i >= 1; i--)
39+
{
40+
sortSets.Add(i, random.Next(0, 1000));
41+
}
42+
43+
for (var i = 1; i <= 1000; i++)
44+
{
45+
if (sortSets.Remove(i))
46+
{
47+
continue;
48+
}
49+
50+
Assert.Fail("can not remove i : " + i);
51+
}
52+
53+
Assert.AreEqual(0, sortSets.Count);
54+
foreach (var sortSet in sortSets)
55+
{
56+
Assert.Fail();
57+
}
58+
}
59+
60+
[TestMethod]
61+
public void TestRank()
62+
{
63+
var sortSets = new SortSet<int, int>();
64+
65+
sortSets.Add(1000, 85);
66+
sortSets.Add(999, 75);
67+
sortSets.Add(998, 185);
68+
sortSets.Add(997, 85);
69+
sortSets.Add(996, 185);
70+
sortSets.Add(995, 85);
71+
72+
Assert.AreEqual(1, sortSets.GetRank(995));
73+
Assert.AreEqual(995, sortSets.GetElementByRank(1));
74+
Assert.AreEqual(997, sortSets.GetElementByRank(2));
75+
Assert.AreEqual(1000, sortSets.GetElementByRank(3));
76+
Assert.AreEqual(996, sortSets.GetElementByRank(4));
77+
Assert.AreEqual(998, sortSets.GetElementByRank(5));
78+
79+
Assert.AreEqual(3, sortSets.GetRangeCount(80, 90));
80+
}
81+
3382
[TestMethod]
3483
public void TestCustomComparer()
3584
{

‎src/CatLib.Core.Tests/Support/Util/ReferenceCountTests.cs‎

Lines changed: 0 additions & 119 deletions
This file was deleted.

‎src/CatLib.Core/CatLib.Core.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<Compile Include="Support\QuickList\InternalList.cs" />
8484
<Compile Include="Support\QuickList\IQuickList.cs" />
8585
<Compile Include="Support\QuickList\QuickList.cs" />
86+
<Compile Include="Support\RingBuffer\IRingBuffer.cs" />
8687
<Compile Include="Support\RingBuffer\RingBuffer.cs" />
8788
<Compile Include="Support\Util\Dict.cs" />
8889
<Compile Include="Support\SortSet\ISortSet.cs" />
@@ -98,8 +99,6 @@
9899
<Compile Include="Support\Util\Arr.cs" />
99100
<Compile Include="Support\Util\Enum.cs" />
100101
<Compile Include="Support\Util\IAwait.cs" />
101-
<Compile Include="Support\Util\IReferenceCount.cs" />
102-
<Compile Include="Support\Util\ReferenceCount.cs" />
103102
<Compile Include="Support\Util\Str.cs" />
104103
<Compile Include="Support\Util\SystemTime.cs" />
105104
<Compile Include="Support\Util\Util.cs" />

‎src/CatLib.Core/CatLib/Application.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
using System;
1313
using System.Collections.Generic;
14-
using System.Reflection;
1514
using System.Threading;
1615

1716
namespace CatLib

‎src/CatLib.Core/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
[assembly: Guid("4204658e-81fd-4106-a347-890cd369c8a4")]
2828

29-
[assembly: AssemblyVersion("1.2.6.0")]
30-
[assembly: AssemblyFileVersion("1.2.6.0")]
29+
[assembly: AssemblyVersion("1.2.7.0")]
30+
[assembly: AssemblyFileVersion("1.2.7.0")]
3131

3232
[assembly: InternalsVisibleTo("Assembly-CSharp-Editor"),
3333
InternalsVisibleTo("Assembly-CSharp-Editor-firstpass"),

‎src/CatLib.Core/Support/Container/BindDataExtend.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,22 @@ public static IBindData OnResolving(this IBindData bindData, Action<object> acti
3434
});
3535
}
3636

37+
/// <summary>
38+
/// 解决服务时触发的回调
39+
/// </summary>
40+
/// <param name="bindData">绑定数据</param>
41+
/// <param name="action">解决事件</param>
42+
/// <returns>服务绑定数据</returns>
43+
public static IBindData OnResolving(this IBindData bindData, Action action)
44+
{
45+
Guard.Requires<ArgumentNullException>(action != null);
46+
return bindData.OnResolving((_, instance) =>
47+
{
48+
action();
49+
return instance;
50+
});
51+
}
52+
3753
/// <summary>
3854
/// 当静态服务被释放时
3955
/// </summary>

0 commit comments

Comments
 (0)