fix conflicts

Tinkoff · Nov 27, 2021 · 1e596a0 · 1e596a0
1 parent 3a5f7d4
commit 1e596a0
Showing 1 changed file with 0 additions and 24 deletions.
diff --git a/src/Horarium.Test/RunnerJobTest.cs b/src/Horarium.Test/RunnerJobTest.cs
@@ -161,12 +161,8 @@ public async Task Start_ExecutionWithDelay_IncreaseInterval()
                 settings,
                 new JsonSerializerSettings(),
                 Mock.Of<IHorariumLogger>(),
-<<<<<<< HEAD
                 Mock.Of<IExecutorJob>(),
                 Mock.Of<IUncompletedTaskList>());
-=======
-                Mock.Of<IExecutorJob>());
->>>>>>> f47d280 (Add unit tests)
 
             // Act
             runnerJobs.Start();
@@ -180,19 +176,11 @@ public async Task Start_ExecutionWithDelay_IncreaseInterval()
             await Task.Delay(interval);
             interval += settings.IntervalStartJob.Multiply(settings.JobThrottleSettings.IntervalMultiplier);
             await Task.Delay(interval);
-<<<<<<< HEAD
 
             // Assert
             jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(3));
         }
-
-=======
-
-            // Assert
-            jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(3));
-        }
 
->>>>>>> f47d280 (Add unit tests)
         [Fact]
         public async Task Start_ExecutionWithDelay_MaxInterval()
         {
@@ -218,29 +206,19 @@ public async Task Start_ExecutionWithDelay_MaxInterval()
                 settings,
                 new JsonSerializerSettings(),
                 Mock.Of<IHorariumLogger>(),
-<<<<<<< HEAD
                 Mock.Of<IExecutorJob>(),
                 Mock.Of<IUncompletedTaskList>());
-=======
-                Mock.Of<IExecutorJob>());
->>>>>>> f47d280 (Add unit tests)
 
             // Act
             runnerJobs.Start();
             await Task.Delay(settings.IntervalStartJob - TimeSpan.FromMilliseconds(500));
             jobRepositoryMock.Invocations.Clear();
 
             await Task.Delay(TimeSpan.FromSeconds(5));
-<<<<<<< HEAD
-
-=======
-
->>>>>>> f47d280 (Add unit tests)
             // Assert
             jobRepositoryMock.Verify(r => r.GetReadyJob(It.IsAny<string>(), It.IsAny<TimeSpan>()), Times.Exactly(5));
         }
 
-<<<<<<< HEAD
         [Fact]
         public async Task Start_NextJobStarted_AddsJobTaskToUncompletedTasks()
         {
@@ -305,7 +283,5 @@ public async Task StopAsync_AwaitsWhenAllCompleted()
             // Assert
             uncompletedTaskList.Verify(x => x.WhenAllCompleted(cancellationToken), Times.Once);
         }
-=======
->>>>>>> f47d280 (Add unit tests)
     }
 }