Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -412,13 +412,11 @@ public void SendCommandAndWaitEventCoroutine_Should_Throw_ArgumentOutOfRange_Whe

// 在创建协程时就应该抛出异常
Assert.Throws<ArgumentOutOfRangeException>(() =>
{
CommandCoroutineExtensions.SendCommandAndWaitEventCoroutine<TestCommand, TestEvent>(
contextAware,
command,
null,
-1.0f);
});
-1.0f));
}

/// <summary>
Expand Down
8 changes: 4 additions & 4 deletions GFramework.Core.Tests/events/EventTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void SetUp()
public void EasyEvent_Register_Should_Add_Handler()
{
var called = false;
_easyEvent.Register(() => { called = true; });
_easyEvent.Register(() => called = true);

_easyEvent.Trigger();

Expand Down Expand Up @@ -65,8 +65,8 @@ public void EasyEvent_Multiple_Handlers_Should_All_Be_Called()
var count1 = 0;
var count2 = 0;

_easyEvent.Register(() => { count1++; });
_easyEvent.Register(() => { count2++; });
_easyEvent.Register(() => count1++);
_easyEvent.Register(() => count2++);

_easyEvent.Trigger();

Expand Down Expand Up @@ -151,7 +151,7 @@ public void EventTTK_Register_Should_Add_Handler()
public void EventTTK_UnRegister_Should_Remove_Handler()
{
var count = 0;
Action<int, string> handler = (i, s) => { count++; };
Action<int, string> handler = (i, s) => count++;

_eventIntString.Register(handler);
_eventIntString.Trigger(1, "a");
Expand Down
8 changes: 4 additions & 4 deletions GFramework.Core.Tests/events/OrEventTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void OrEvent_Should_Trigger_When_Any_Event_Fires()
var orEvent = new OrEvent();

var triggered = false;
orEvent.Register(() => { triggered = true; });
orEvent.Register(() => triggered = true);

// 将两个事件添加到OrEvent中
orEvent.Or(event1).Or(event2);
Expand All @@ -43,7 +43,7 @@ public void OrEvent_Should_Trigger_When_Second_Event_Fires()
var orEvent = new OrEvent();

var triggered = false;
orEvent.Register(() => { triggered = true; });
orEvent.Register(() => triggered = true);

// 将两个事件添加到OrEvent中
orEvent.Or(event1).Or(event2);
Expand All @@ -66,8 +66,8 @@ public void OrEvent_Should_Support_Multiple_Handlers()
var count1 = 0;
var count2 = 0;

orEvent.Register(() => { count1++; });
orEvent.Register(() => { count2++; });
orEvent.Register(() => count1++);
orEvent.Register(() => count2++);

// 将事件添加到OrEvent中
orEvent.Or(@event);
Expand Down
4 changes: 2 additions & 2 deletions GFramework.Core.Tests/events/UnRegisterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class UnRegisterTests
public void DefaultUnRegister_Should_InvokeCallback_When_UnRegisterCalled()
{
var invoked = false;
var unRegister = new DefaultUnRegister(() => { invoked = true; });
var unRegister = new DefaultUnRegister(() => invoked = true);

unRegister.UnRegister();

Expand All @@ -31,7 +31,7 @@ public void DefaultUnRegister_Should_InvokeCallback_When_UnRegisterCalled()
public void DefaultUnRegister_Should_ClearCallback_After_UnRegister()
{
var callCount = 0;
var unRegister = new DefaultUnRegister(() => { callCount++; });
var unRegister = new DefaultUnRegister(() => callCount++);

unRegister.UnRegister();
unRegister.UnRegister();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ public void UnRegisterAll_Should_UnRegister_All_Elements()
var invoked2 = false;
var invoked3 = false;

var unRegister1 = new DefaultUnRegister(() => { invoked1 = true; });
var unRegister2 = new DefaultUnRegister(() => { invoked2 = true; });
var unRegister3 = new DefaultUnRegister(() => { invoked3 = true; });
var unRegister1 = new DefaultUnRegister(() => invoked1 = true);
var unRegister2 = new DefaultUnRegister(() => invoked2 = true);
var unRegister3 = new DefaultUnRegister(() => invoked3 = true);

unRegister1.AddToUnregisterList(_unRegisterList);
unRegister2.AddToUnregisterList(_unRegisterList);
Expand Down Expand Up @@ -109,7 +109,7 @@ public void UnRegisterAll_Should_Not_Throw_When_Empty()
public void UnRegisterAll_Should_Invoke_Once_Per_Element()
{
var callCount = 0;
var unRegister = new DefaultUnRegister(() => { callCount++; });
var unRegister = new DefaultUnRegister(() => callCount++);

unRegister.AddToUnregisterList(_unRegisterList);

Expand Down
2 changes: 1 addition & 1 deletion GFramework.Core.Tests/logging/LoggerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void IsEnabledForLevel_WithValidLevel_Should_ReturnCorrectResult()
[Test]
public void IsEnabledForLevel_WithInvalidLevel_Should_ThrowArgumentException()
{
Assert.Throws<ArgumentException>(() => { _logger.IsEnabledForLevel((LogLevel)999); });
Assert.Throws<ArgumentException>(() => _logger.IsEnabledForLevel((LogLevel)999));
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions GFramework.Core.Tests/tests/SyncArchitectureTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void RegisterSystem_AfterReady_Should_Throw_When_NotAllowed()
{
Architecture!.Initialize();

Assert.Throws<InvalidOperationException>(() => { Architecture.RegisterSystem(new TestSystem()); });
Assert.Throws<InvalidOperationException>(() => Architecture.RegisterSystem(new TestSystem()));
}

/// <summary>
Expand All @@ -107,7 +107,7 @@ public void RegisterModel_AfterReady_Should_Throw_When_NotAllowed()
{
Architecture!.Initialize();

Assert.Throws<InvalidOperationException>(() => { Architecture.RegisterModel(new TestModel()); });
Assert.Throws<InvalidOperationException>(() => Architecture.RegisterModel(new TestModel()));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion GFramework.Core/events/EasyEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class EasyEvent
public IUnRegister Register(Action onEvent)
{
_mOnEvent += onEvent;
return new DefaultUnRegister(() => { UnRegister(onEvent); });
return new DefaultUnRegister(() => UnRegister(onEvent));
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions GFramework.Core/events/EasyEventGeneric.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void Action(T _)
public IUnRegister Register(Action<T> onEvent)
{
_mOnEvent += onEvent;
return new DefaultUnRegister(() => { UnRegister(onEvent); });
return new DefaultUnRegister(() => UnRegister(onEvent));
}

/// <summary>
Expand Down Expand Up @@ -99,7 +99,7 @@ void Action(T _, Tk __)
public IUnRegister Register(Action<T, Tk> onEvent)
{
_mOnEvent += onEvent;
return new DefaultUnRegister(() => { UnRegister(onEvent); });
return new DefaultUnRegister(() => UnRegister(onEvent));
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion GFramework.Core/events/OrEvent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public OrEvent Or(IEvent @event)
public IUnRegister Register(Action onEvent)
{
_mOnEvent += onEvent;
return new DefaultUnRegister(() => { UnRegister(onEvent); });
return new DefaultUnRegister(() => UnRegister(onEvent));
}

/// <summary>
Expand Down
5 changes: 1 addition & 4 deletions GFramework.Game/scene/SceneTransitionPipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,8 @@ public async Task ExecuteAroundAsync(
var options = _aroundOptions[handler];
var next = pipeline;

pipeline = async () =>
{
await ExecuteSingleAroundHandlerAsync(
pipeline = async () => await ExecuteSingleAroundHandlerAsync(
handler, options, @event, next, cancellationToken);
};
}

await pipeline();
Expand Down
7 changes: 2 additions & 5 deletions GFramework.Game/ui/UiTransitionPipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,8 @@ public async Task ExecuteAroundAsync(
var options = _aroundOptions[handler];
var next = pipeline;

pipeline = async () =>
{
await ExecuteSingleAroundHandlerAsync(
handler, options, @event, next, cancellationToken);
};
pipeline = async () => await ExecuteSingleAroundHandlerAsync(
handler, options, @event, next, cancellationToken);
}

await pipeline();
Expand Down
2 changes: 1 addition & 1 deletion GFramework.Godot/coroutine/Timing.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static Timing Instance
{
Name = nameof(Timing)
};
tree.Root.WaitUntilReady(() => { tree.Root.AddChild(_instance); });
tree.Root.WaitUntilReady(() => tree.Root.AddChild(_instance));

return _instance;
}
Expand Down
Loading