Skip to content

Commit f7b06c8

Browse files
IvanMurzakIvanMurzak
committed
Improving tests stability
1 parent 3c5aeac commit f7b06c8

File tree

7 files changed

+55
-245
lines changed

7 files changed

+55
-245
lines changed

‎Assets/_PackageRoot/Tests/Editor/TestCache.cs‎

Lines changed: 10 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ public async UniTask LoadSprite(string url)
1717
Assert.IsNotNull(sprite);
1818
}
1919

20-
[UnityTest] public IEnumerator LoadingFromMemoryCache_NoLogs()
21-
{
22-
ImageLoader.settings.debugLevel = DebugLevel.Error;
23-
yield return LoadingFromMemoryCache();
24-
}
20+
[UnityTest] public IEnumerator LoadingFromMemoryCache_NoLogs() => TestUtils.RunNoLogs(LoadingFromMemoryCache);
2521
[UnityTest] public IEnumerator LoadingFromMemoryCache()
2622
{
2723
ImageLoader.settings.useMemoryCache = true;
@@ -34,11 +30,7 @@ [UnityTest] public IEnumerator LoadingFromMemoryCache()
3430
Assert.IsTrue(ImageLoader.MemoryCacheContains(imageURL));
3531
}
3632
}
37-
[UnityTest] public IEnumerator LoadingFromDiskCache_NoLogs()
38-
{
39-
ImageLoader.settings.debugLevel = DebugLevel.Error;
40-
yield return LoadingFromDiskCache();
41-
}
33+
[UnityTest] public IEnumerator LoadingFromDiskCache_NoLogs() => TestUtils.RunNoLogs(LoadingFromDiskCache);
4234
[UnityTest] public IEnumerator LoadingFromDiskCache()
4335
{
4436
ImageLoader.settings.useMemoryCache = false;
@@ -51,11 +43,7 @@ [UnityTest] public IEnumerator LoadingFromDiskCache()
5143
Assert.IsTrue(ImageLoader.DiskCacheContains(imageURL));
5244
}
5345
}
54-
[UnityTest] public IEnumerator DiskCacheEnable_NoLogs()
55-
{
56-
ImageLoader.settings.debugLevel = DebugLevel.Error;
57-
yield return DiskCacheEnable();
58-
}
46+
[UnityTest] public IEnumerator DiskCacheEnable_NoLogs() => TestUtils.RunNoLogs(DiskCacheEnable);
5947
[UnityTest] public IEnumerator DiskCacheEnable()
6048
{
6149
ImageLoader.settings.useDiskCache = true;
@@ -66,11 +54,7 @@ [UnityTest] public IEnumerator DiskCacheEnable()
6654
Assert.IsTrue(ImageLoader.DiskCacheContains(imageURL));
6755
}
6856
}
69-
[UnityTest] public IEnumerator DiskCacheDisable_NoLogs()
70-
{
71-
ImageLoader.settings.debugLevel = DebugLevel.Error;
72-
yield return DiskCacheDisable();
73-
}
57+
[UnityTest] public IEnumerator DiskCacheDisable_NoLogs() => TestUtils.RunNoLogs(DiskCacheDisable);
7458
[UnityTest] public IEnumerator DiskCacheDisable()
7559
{
7660
ImageLoader.settings.useDiskCache = false;
@@ -81,11 +65,7 @@ [UnityTest] public IEnumerator DiskCacheDisable()
8165
Assert.IsFalse(ImageLoader.DiskCacheContains(imageURL));
8266
}
8367
}
84-
[UnityTest] public IEnumerator MemoryCacheEnabled_NoLogs()
85-
{
86-
ImageLoader.settings.debugLevel = DebugLevel.Error;
87-
yield return MemoryCacheEnabled();
88-
}
68+
[UnityTest] public IEnumerator MemoryCacheEnabled_NoLogs() => TestUtils.RunNoLogs(MemoryCacheEnabled);
8969
[UnityTest] public IEnumerator MemoryCacheEnabled()
9070
{
9171
ImageLoader.settings.useMemoryCache = true;
@@ -96,11 +76,7 @@ [UnityTest] public IEnumerator MemoryCacheEnabled()
9676
Assert.IsTrue(ImageLoader.MemoryCacheContains(imageURL));
9777
}
9878
}
99-
[UnityTest] public IEnumerator MemoryCacheDisabled_NoLogs()
100-
{
101-
ImageLoader.settings.debugLevel = DebugLevel.Error;
102-
yield return MemoryCacheDisabled();
103-
}
79+
[UnityTest] public IEnumerator MemoryCacheDisabled_NoLogs() => TestUtils.RunNoLogs(MemoryCacheDisabled);
10480
[UnityTest] public IEnumerator MemoryCacheDisabled()
10581
{
10682
ImageLoader.settings.useMemoryCache = false;
@@ -111,11 +87,7 @@ [UnityTest] public IEnumerator MemoryCacheDisabled()
11187
Assert.IsFalse(ImageLoader.MemoryCacheContains(imageURL));
11288
}
11389
}
114-
[UnityTest] public IEnumerator ClearDiskCache_NoLogs()
115-
{
116-
ImageLoader.settings.debugLevel = DebugLevel.Error;
117-
yield return ClearDiskCache();
118-
}
90+
[UnityTest] public IEnumerator ClearDiskCache_NoLogs() => TestUtils.RunNoLogs(ClearDiskCache);
11991
[UnityTest] public IEnumerator ClearDiskCache()
12092
{
12193
ImageLoader.settings.useDiskCache = true;
@@ -128,11 +100,7 @@ [UnityTest] public IEnumerator ClearDiskCache()
128100
Assert.IsFalse(ImageLoader.DiskCacheContains(imageURL));
129101
}
130102
}
131-
[UnityTest] public IEnumerator ClearMemoryCache_NoLogs()
132-
{
133-
ImageLoader.settings.debugLevel = DebugLevel.Error;
134-
yield return ClearMemoryCache();
135-
}
103+
[UnityTest] public IEnumerator ClearMemoryCache_NoLogs() => TestUtils.RunNoLogs(ClearMemoryCache);
136104
[UnityTest] public IEnumerator ClearMemoryCache()
137105
{
138106
ImageLoader.settings.useMemoryCache = true;
@@ -145,11 +113,7 @@ [UnityTest] public IEnumerator ClearMemoryCache()
145113
Assert.IsFalse(ImageLoader.MemoryCacheContains(imageURL));
146114
}
147115
}
148-
[UnityTest] public IEnumerator ClearDiskCacheAll_NoLogs()
149-
{
150-
ImageLoader.settings.debugLevel = DebugLevel.Error;
151-
yield return ClearDiskCacheAll();
152-
}
116+
[UnityTest] public IEnumerator ClearDiskCacheAll_NoLogs() => TestUtils.RunNoLogs(ClearDiskCacheAll);
153117
[UnityTest] public IEnumerator ClearDiskCacheAll()
154118
{
155119
ImageLoader.settings.useDiskCache = true;
@@ -163,11 +127,7 @@ [UnityTest] public IEnumerator ClearDiskCacheAll()
163127
foreach (var imageURL in TestUtils.ImageURLs)
164128
Assert.IsFalse(ImageLoader.DiskCacheContains(imageURL));
165129
}
166-
[UnityTest] public IEnumerator ClearMemoryCacheAll_NoLogs()
167-
{
168-
ImageLoader.settings.debugLevel = DebugLevel.Error;
169-
yield return ClearMemoryCacheAll();
170-
}
130+
[UnityTest] public IEnumerator ClearMemoryCacheAll_NoLogs() => TestUtils.RunNoLogs(ClearMemoryCacheAll);
171131
[UnityTest] public IEnumerator ClearMemoryCacheAll()
172132
{
173133
ImageLoader.settings.useMemoryCache = true;

‎Assets/_PackageRoot/Tests/Editor/TestConcurrency.cs‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,22 @@ public class TestConcurrency : Test
1515
[UnitySetUp] public override IEnumerator SetUp() => base.SetUp();
1616
[UnityTearDown] public override IEnumerator TearDown() => base.TearDown();
1717

18-
[UnityTest] public IEnumerator Load____1_ReferencesInParallelLateDispose_NoLogs()
19-
{
20-
ImageLoader.settings.debugLevel = DebugLevel.Error;
21-
yield return Load_X_ReferencesInParallelLateDispose(1);
22-
}
18+
[UnityTest] public IEnumerator Load____1_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(Load____1_ReferencesInParallelLateDispose);
2319
[UnityTest] public IEnumerator Load____1_ReferencesInParallelLateDispose()
2420
{
2521
yield return Load_X_ReferencesInParallelLateDispose(1);
2622
}
27-
[UnityTest] public IEnumerator Load____2_ReferencesInParallelLateDispose_NoLogs()
28-
{
29-
ImageLoader.settings.debugLevel = DebugLevel.Error;
30-
yield return Load_X_ReferencesInParallelLateDispose(2);
31-
}
23+
[UnityTest] public IEnumerator Load____2_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(Load____2_ReferencesInParallelLateDispose);
3224
[UnityTest] public IEnumerator Load____2_ReferencesInParallelLateDispose()
3325
{
3426
yield return Load_X_ReferencesInParallelLateDispose(2);
3527
}
36-
[UnityTest] public IEnumerator Load____5_ReferencesInParallelLateDispose_NoLogs()
37-
{
38-
ImageLoader.settings.debugLevel = DebugLevel.Error;
39-
yield return Load_X_ReferencesInParallelLateDispose(5);
40-
}
28+
[UnityTest] public IEnumerator Load____5_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(Load____5_ReferencesInParallelLateDispose);
4129
[UnityTest] public IEnumerator Load____5_ReferencesInParallelLateDispose()
4230
{
4331
yield return Load_X_ReferencesInParallelLateDispose(5);
4432
}
45-
[UnityTest] public IEnumerator Load_1000_ReferencesInParallelLateDispose_NoLogs()
46-
{
47-
ImageLoader.settings.debugLevel = DebugLevel.Error;
48-
yield return Load_X_ReferencesInParallelLateDispose(1000);
49-
}
33+
[UnityTest] public IEnumerator Load_1000_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(Load_1000_ReferencesInParallelLateDispose);
5034
[UnityTest] public IEnumerator Load_1000_ReferencesInParallelLateDispose()
5135
{
5236
yield return Load_X_ReferencesInParallelLateDispose(1000);
@@ -86,20 +70,12 @@ public IEnumerator Load_X_ReferencesInParallelLateDispose(int count, bool future
8670
Assert.AreEqual(0, Reference<Sprite>.Counter(url1));
8771
}
8872

89-
[UnityTest] public IEnumerator LoadOneMake____5_ReferencesInParallelLateDispose_NoLogs()
90-
{
91-
ImageLoader.settings.debugLevel = DebugLevel.Error;
92-
yield return LoadOneMake_X_ReferencesInParallelLateDispose(5);
93-
}
73+
[UnityTest] public IEnumerator LoadOneMake____5_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(LoadOneMake____5_ReferencesInParallelLateDispose);
9474
[UnityTest] public IEnumerator LoadOneMake____5_ReferencesInParallelLateDispose()
9575
{
9676
yield return LoadOneMake_X_ReferencesInParallelLateDispose(5);
9777
}
98-
[UnityTest] public IEnumerator LoadOneMake_1000_ReferencesInParallelLateDispose_NoLogs()
99-
{
100-
ImageLoader.settings.debugLevel = DebugLevel.Error;
101-
yield return LoadOneMake_X_ReferencesInParallelLateDispose(100);
102-
}
78+
[UnityTest] public IEnumerator LoadOneMake_1000_ReferencesInParallelLateDispose_NoLogs() => TestUtils.RunNoLogs(LoadOneMake_1000_ReferencesInParallelLateDispose);
10379
[UnityTest] public IEnumerator LoadOneMake_1000_ReferencesInParallelLateDispose()
10480
{
10581
yield return LoadOneMake_X_ReferencesInParallelLateDispose(1000);

‎Assets/_PackageRoot/Tests/Editor/TestFuture.cs‎

Lines changed: 12 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ public partial class TestFuture : Test
1313
[UnitySetUp] public override IEnumerator SetUp() => base.SetUp();
1414
[UnityTearDown] public override IEnumerator TearDown() => base.TearDown();
1515

16-
[UnityTest] public IEnumerator GetAllLoadingFutures_NoLogs()
17-
{
18-
ImageLoader.settings.debugLevel = DebugLevel.Error;
19-
yield return GetAllLoadingFutures();
20-
}
16+
[UnityTest] public IEnumerator GetAllLoadingFutures_NoLogs() => TestUtils.RunNoLogs(GetAllLoadingFutures);
2117
[UnityTest] public IEnumerator GetAllLoadingFutures()
2218
{
2319
ImageLoader.settings.useDiskCache = true;
@@ -33,11 +29,7 @@ [UnityTest] public IEnumerator GetAllLoadingFutures()
3329
Assert.Zero(loadingFutures.Count);
3430
yield return UniTask.Yield();
3531
}
36-
[UnityTest] public IEnumerator LoadingRefAndWaiting_NoLogs()
37-
{
38-
ImageLoader.settings.debugLevel = DebugLevel.Error;
39-
yield return LoadingRefAndWaiting();
40-
}
32+
[UnityTest] public IEnumerator LoadingRefAndWaiting_NoLogs() => TestUtils.RunNoLogs(LoadingRefAndWaiting);
4133
[UnityTest] public IEnumerator LoadingRefAndWaiting()
4234
{
4335
ImageLoader.settings.useDiskCache = true;
@@ -59,11 +51,7 @@ [UnityTest] public IEnumerator LoadingRefAndWaiting()
5951
Assert.IsNull(ref0.Value);
6052
Assert.AreEqual(0, Reference<Sprite>.Counter(url1));
6153
}
62-
[UnityTest] public IEnumerator Loading2RefAndCancelFirst_NoLogs()
63-
{
64-
ImageLoader.settings.debugLevel = DebugLevel.Error;
65-
yield return Loading2RefAndCancelFirst();
66-
}
54+
[UnityTest] public IEnumerator Loading2RefAndCancelFirst_NoLogs() => TestUtils.RunNoLogs(Loading2RefAndCancelFirst);
6755
[UnityTest] public IEnumerator Loading2RefAndCancelFirst()
6856
{
6957
ImageLoader.settings.useDiskCache = true;
@@ -92,11 +80,7 @@ [UnityTest] public IEnumerator Loading2RefAndCancelFirst()
9280
future2.Dispose();
9381
ref2.Dispose();
9482
}
95-
[UnityTest] public IEnumerator Loading2RefAndWait_NoLogs()
96-
{
97-
ImageLoader.settings.debugLevel = DebugLevel.Error;
98-
yield return Loading2RefAndWait();
99-
}
83+
[UnityTest] public IEnumerator Loading2RefAndWait_NoLogs() => TestUtils.RunNoLogs(Loading2RefAndWait);
10084
[UnityTest] public IEnumerator Loading2RefAndWait()
10185
{
10286
ImageLoader.settings.useDiskCache = true;
@@ -131,11 +115,7 @@ [UnityTest] public IEnumerator Loading2RefAndWait()
131115
ImageLoader.ClearMemoryCache(url1);
132116
Assert.AreEqual(0, Reference<Sprite>.Counter(url1));
133117
}
134-
[UnityTest] public IEnumerator Loading2RefAndDisposeAll_NoLogs()
135-
{
136-
ImageLoader.settings.debugLevel = DebugLevel.Error;
137-
yield return Loading2RefAndDisposeAll();
138-
}
118+
[UnityTest] public IEnumerator Loading2RefAndDisposeAll_NoLogs() => TestUtils.RunNoLogs(Loading2RefAndDisposeAll);
139119
[UnityTest] public IEnumerator Loading2RefAndDisposeAll()
140120
{
141121
ImageLoader.settings.useDiskCache = true;
@@ -160,11 +140,7 @@ [UnityTest] public IEnumerator Loading2RefAndDisposeAll()
160140
yield return UniTask.Delay(1000).ToCoroutine();
161141
Assert.AreEqual(0, Reference<Sprite>.Counter(url1));
162142
}
163-
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock_NoLogs()
164-
{
165-
ImageLoader.settings.debugLevel = DebugLevel.Error;
166-
yield return DisposeOnOutDisposingBlock();
167-
}
143+
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock_NoLogs() => TestUtils.RunNoLogs(DisposeOnOutDisposingBlock);
168144
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock()
169145
{
170146
ImageLoader.settings.useDiskCache = true;
@@ -189,11 +165,7 @@ [UnityTest] public IEnumerator DisposeOnOutDisposingBlock()
189165
Assert.AreEqual(0, Reference<Sprite>.Counter(url), $"Should be zero references to URL={url}");
190166
}
191167
}
192-
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock2_NoLogs()
193-
{
194-
ImageLoader.settings.debugLevel = DebugLevel.Error;
195-
yield return DisposeOnOutDisposingBlock2();
196-
}
168+
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock2_NoLogs() => TestUtils.RunNoLogs(DisposeOnOutDisposingBlock2);
197169
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock2()
198170
{
199171
ImageLoader.settings.useDiskCache = true;
@@ -217,11 +189,7 @@ [UnityTest] public IEnumerator DisposeOnOutDisposingBlock2()
217189
Assert.AreEqual(0, Reference<Sprite>.Counter(url), $"Should be zero references to URL={url}");
218190
}
219191
}
220-
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock3_NoLogs()
221-
{
222-
ImageLoader.settings.debugLevel = DebugLevel.Error;
223-
yield return DisposeOnOutDisposingBlock3();
224-
}
192+
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock3_NoLogs() => TestUtils.RunNoLogs(DisposeOnOutDisposingBlock3);
225193
[UnityTest] public IEnumerator DisposeOnOutDisposingBlock3()
226194
{
227195
ImageLoader.settings.useDiskCache = true;
@@ -256,11 +224,7 @@ [UnityTest] public IEnumerator DisposeOnOutDisposingBlock3()
256224
}
257225
}
258226

259-
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlAndTimeout_NoLogs()
260-
{
261-
ImageLoader.settings.debugLevel = DebugLevel.Error;
262-
yield return EventFailedWithIncorrectUrlAndTimeout();
263-
}
227+
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlAndTimeout_NoLogs() => TestUtils.RunNoLogs(EventFailedWithIncorrectUrlAndTimeout);
264228
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlAndTimeout()
265229
{
266230
ImageLoader.settings.useDiskCache = true;
@@ -286,11 +250,7 @@ [UnityTest] public IEnumerator EventFailedWithIncorrectUrlAndTimeout()
286250
yield return UniTask.Delay(TimeSpan.FromSeconds(2)).ToCoroutine();
287251
future1.Dispose();
288252
}
289-
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlNotCalledBecauseOfCancel_NoLogs()
290-
{
291-
ImageLoader.settings.debugLevel = DebugLevel.Error;
292-
yield return EventFailedWithIncorrectUrlNotCalledBecauseOfCancel();
293-
}
253+
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlNotCalledBecauseOfCancel_NoLogs() => TestUtils.RunNoLogs(EventFailedWithIncorrectUrlNotCalledBecauseOfCancel);
294254
[UnityTest] public IEnumerator EventFailedWithIncorrectUrlNotCalledBecauseOfCancel()
295255
{
296256
ImageLoader.settings.useDiskCache = true;
@@ -316,11 +276,7 @@ [UnityTest] public IEnumerator EventFailedWithIncorrectUrlNotCalledBecauseOfCanc
316276
Assert.IsNull(exception);
317277
future1.Dispose();
318278
}
319-
[UnityTest] public IEnumerator AsyncOperationCompletion_NoLogs()
320-
{
321-
ImageLoader.settings.debugLevel = DebugLevel.Error;
322-
yield return AsyncOperationCompletion();
323-
}
279+
[UnityTest] public IEnumerator AsyncOperationCompletion_NoLogs() => TestUtils.RunNoLogs(AsyncOperationCompletion);
324280
[UnityTest] public IEnumerator AsyncOperationCompletion()
325281
{
326282
ImageLoader.settings.useDiskCache = true;
@@ -337,11 +293,7 @@ [UnityTest] public IEnumerator AsyncOperationCompletion()
337293
}
338294
yield return UniTask.Delay(TimeSpan.FromSeconds(1)).ToCoroutine();
339295
}
340-
[UnityTest] public IEnumerator AsyncOperationCompletionAfterCancel_NoLogs()
341-
{
342-
ImageLoader.settings.debugLevel = DebugLevel.Error;
343-
yield return AsyncOperationCompletionAfterCancel();
344-
}
296+
[UnityTest] public IEnumerator AsyncOperationCompletionAfterCancel_NoLogs() => TestUtils.RunNoLogs(AsyncOperationCompletionAfterCancel);
345297
[UnityTest] public IEnumerator AsyncOperationCompletionAfterCancel()
346298
{
347299
ImageLoader.settings.useDiskCache = true;

‎Assets/_PackageRoot/Tests/Editor/TestFutureOrder.cs‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ public class TestFutureOrder : Test
1414
[UnitySetUp] public override IEnumerator SetUp() => base.SetUp();
1515
[UnityTearDown] public override IEnumerator TearDown() => base.TearDown();
1616

17-
[UnityTest] public IEnumerator EventsLoadedWhenClear_NoLogs()
18-
{
19-
ImageLoader.settings.debugLevel = DebugLevel.Error;
20-
yield return EventsLoadedWhenClear();
21-
}
17+
[UnityTest] public IEnumerator EventsLoadedWhenClear_NoLogs() => TestUtils.RunNoLogs(EventsLoadedWhenClear);
2218
[UnityTest] public IEnumerator EventsLoadedWhenClear()
2319
{
2420
ImageLoader.settings.useDiskCache = true;
@@ -57,11 +53,7 @@ [UnityTest] public IEnumerator EventsLoadedWhenClear()
5753

5854
future.Dispose();
5955
}
60-
[UnityTest] public IEnumerator EventsFailedWhenClear_NoLogs()
61-
{
62-
ImageLoader.settings.debugLevel = DebugLevel.Error;
63-
yield return EventsFailedWhenClear();
64-
}
56+
[UnityTest] public IEnumerator EventsFailedWhenClear_NoLogs() => TestUtils.RunNoLogs(EventsFailedWhenClear);
6557
[UnityTest] public IEnumerator EventsFailedWhenClear()
6658
{
6759
ImageLoader.settings.useDiskCache = true;

0 commit comments

Comments
 (0)