Skip to content

Commit 853f98a

Browse files
Test updates.
1 parent ab825ed commit 853f98a

15 files changed

Lines changed: 57 additions & 19 deletions

benchmarking/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ static void DictionaryTests()
193193
_ => () => new ConcurrentDictionary<int, object>());
194194

195195
report.AddBenchmark("LockSynchronized Dictionary",
196-
_ => () => new LockSynchronizedDictionaryWrapper<int, object>());
196+
_ => () => new LockSynchronizedDictionary<int, object>());
197197
//report.AddBenchmark("ReadWriteSynchronized Dictionary",
198198
// _ => () => new ReadWriteSynchronizedDictionaryWrapper<int, object>());
199199

source/Synchronized/LockSynchronizedDictionaryWrapper.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ public class LockSynchronizedDictionaryWrapper<TKey, TValue>
6565
public LockSynchronizedDictionaryWrapper(IDictionary<TKey, TValue> dictionary) : base(dictionary)
6666
{
6767
}
68+
}
6869

69-
public LockSynchronizedDictionaryWrapper(int capacity = 0) : this(new Dictionary<TKey, TValue>(capacity)) { }
70+
[ExcludeFromCodeCoverage]
71+
public class LockSynchronizedDictionary<TKey, TValue>
72+
: LockSynchronizedDictionaryWrapper<TKey, TValue>
73+
{
74+
public LockSynchronizedDictionary(int capacity = 0) : base(new Dictionary<TKey, TValue>(capacity)) { }
7075
}

source/Synchronized/LockSynchronizedList.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
namespace Open.Collections.Synchronized;
55

66
[ExcludeFromCodeCoverage]
7-
public class LockSynchronizedList<T> : LockSynchronizedListWrapper<T>
7+
public sealed class LockSynchronizedList<T>
8+
: LockSynchronizedListWrapper<T>
89
{
910
public LockSynchronizedList(int capacity = 0) : base(new List<T>(capacity)) { }
1011
public LockSynchronizedList(IEnumerable<T> collection) : base(new List<T>(collection)) { }

source/Synchronized/ReadWriteSynchronizedDictionaryWrapper.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ public class ReadWriteSynchronizedDictionaryWrapper<TKey, TValue>
102102
public ReadWriteSynchronizedDictionaryWrapper(IDictionary<TKey, TValue> dictionary, bool owner = false) : base(dictionary, owner)
103103
{
104104
}
105+
}
105106

106-
public ReadWriteSynchronizedDictionaryWrapper(int capacity = 0) : this(new Dictionary<TKey, TValue>(capacity)) { }
107+
[ExcludeFromCodeCoverage]
108+
public class ReadWriteSynchronizedDictionary<TKey, TValue>
109+
: ReadWriteSynchronizedDictionaryWrapper<TKey, TValue>
110+
{
111+
public ReadWriteSynchronizedDictionary(int capacity = 0) : base(new Dictionary<TKey, TValue>(capacity)) { }
107112
}

source/Synchronized/ReadWriteSynchronizedList.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
namespace Open.Collections.Synchronized;
55

66
[ExcludeFromCodeCoverage]
7-
public sealed class ReadWriteSynchronizedList<T> : ReadWriteSynchronizedListWrapper<T>
7+
public sealed class ReadWriteSynchronizedList<T>
8+
: ReadWriteSynchronizedListWrapper<T>
89
{
910
public ReadWriteSynchronizedList(int capacity = 0)
1011
: base(new List<T>(capacity)) { }

source/Synchronized/TrackedDictionaryWrapper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ public bool SetValue(TKey key, TValue value)
5858
private bool SetValueInternal(TKey key, TValue value)
5959
{
6060
bool changing
61-
= InternalSource.TryGetValue(key, out var current)
62-
&& !(current?.Equals(value) ?? value is null);
61+
= !InternalSource.TryGetValue(key, out var current)
62+
|| !(current?.Equals(value) ?? value is null);
6363
if (changing)
6464
InternalSource[key] = value;
6565
return changing;

source/Synchronized/TrackedListWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public bool Replace(T target, T replacement, bool throwIfNotFound = false)
114114
}
115115
}
116116

117-
public class TrackedList<T> : TrackedListWrapper<T>
117+
public sealed class TrackedList<T> : TrackedListWrapper<T>
118118
{
119119
[ExcludeFromCodeCoverage]
120120
public TrackedList(int capacity, ModificationSynchronizer? sync = null)

source/Synchronized/TrackedOrderedDictionaryWrapper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public TrackedOrderedDictionaryWrapper(IOrderedDictionary<TKey, TValue> dictiona
149149
}
150150
}
151151

152-
public class TrackedOrderedDictionary<TKey, TValue>
152+
public sealed class TrackedOrderedDictionary<TKey, TValue>
153153
: TrackedOrderedDictionaryWrapper<TKey, TValue>
154154
{
155155

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
using Open.Collections.Synchronized;
22

33
namespace Open.Collections.Tests.Collections;
4-
public class LockSyncDictionaryTests : BasicDictionaryTests<LockSynchronizedDictionaryWrapper<int, int>>
4+
public class LockSyncDictionaryTests
5+
: BasicDictionaryTests<LockSynchronizedDictionary<int, int>>
56
{
67
public LockSyncDictionaryTests() : base(new())
78
{
89
}
910
}
1011

11-
public class LockSyncOrderedDictionaryTests : BasicDictionaryTests<LockSynchronizedDictionaryWrapper<int, int>>
12+
public class LockSyncOrderedDictionaryTests
13+
: BasicDictionaryTests<LockSynchronizedDictionary<int, int>>
1214
{
13-
public LockSyncOrderedDictionaryTests() : base(new(new OrderedDictionary<int, int>()))
15+
public LockSyncOrderedDictionaryTests() : base(new())
1416
{
1517
}
1618
}

testing/Open.Collections.Tests/Collections/LockSyncLinkedListTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using Open.Collections.Synchronized;
22

33
namespace Open.Collections.Tests.Collections;
4-
public class LockSyncLinkedListTests : BasicLinkedListTests<LockSynchronizedLinkedList<int>>
4+
public class LockSyncLinkedListTests
5+
: BasicLinkedListTests<LockSynchronizedLinkedList<int>>
56
{
67
public LockSyncLinkedListTests() : base(new())
78
{

0 commit comments

Comments
 (0)