Fixed the issue with conflict between tests

Author: BusHero

tests/Notion.Sharp.Tests/AppendBlocksToPageTests.cs

@@ -10,16 +10,16 @@ public class AppendBlocksToPageTests : NotionTestsBase
 {
     [Theory]
     [MemberData(nameof(Blocks))]
-    public async Task AppendChildren_Succeds(Block block)
+    public async Task AppendChildren_Succeds(Block block) => await Retry(async () =>
     {
         var result = await SUT.AppendBlockChildrenAsync(ValidPageId,
-           new List<Block>
-           {
-                   block
-           });
+                new List<Block>
+                {
+                     block
+                });
         result.Should().NotBeNull();
         await SUT.DeleteBlockAsync(result.Results[0].Id);
-    }
+    }, 3);
 
     public static TheoryData<Block> Blocks { get; } = new TheoryData<Block>
     {

tests/Notion.Sharp.Tests/ModelTests.cs

@@ -1,10 +1,4 @@
-using FluentAssertions;
-
-using Notion.Model;
-
-using Xunit;
-
-namespace Notion.Sharp.Tests;
+namespace Notion.Sharp.Tests;
 
 public class ModelTests : NotionTestsBase
 {

tests/Notion.Sharp.Tests/NotionTestsBase.cs

@@ -1,7 +1,5 @@
 using Microsoft.Extensions.Configuration;
 
-using System;
-
 namespace Notion.Sharp.Tests;
 
 public class NotionTestsBase
@@ -34,4 +32,22 @@ public NotionTestsBase()
         PageFromDatabase = Guid.Parse(configuration["pageFromDatabase"]);
         SimpleDatabase = Guid.Parse(configuration["simpleDatabase"]);
     }
+
+    public async Task Retry(Func<Task> action, int attempts)
+    {
+        for (var attempt = 0; attempt < attempts; attempt++)
+        {
+            try
+            {
+                await action();
+                break;
+            }
+            catch (NotionException ex)
+            {
+                if (ex.Message == "Conflict occurred while saving. Please try again.")
+                    continue;
+                throw;
+            }
+        }
+    }
 }

tests/Notion.Sharp.Tests/RichTextsTests.cs

@@ -1,7 +1,4 @@
-
-using Notion.Model;
-
-namespace Notion.Sharp.Tests;
+namespace Notion.Sharp.Tests;
 
 public class RichTextsTests : NotionTestsBase
 {
@@ -22,7 +19,7 @@ public async Task GetRichText(string guid)
 
     [Theory]
     [MemberData(nameof(RichTexts))]
-    public async Task AppendRichText_Succed(RichText richText)
+    public async Task AppendRichText_Succed(RichText richText) => await Retry(async () =>
     {
         var result = await SUT.AppendBlockChildrenAsync(ValidPageId, new List<Block>
         {
@@ -35,7 +32,7 @@ public async Task AppendRichText_Succed(RichText richText)
             }
         });
         var block = await SUT.DeleteBlockAsync(result.Results[0].Id);
-    }
+    }, 3);
 
     public static TheoryData<RichText> RichTexts { get; } = new TheoryData<RichText>
     {