Skip to content

Commit

Permalink
Rename BlankSceneIdentifier to AnonymousSceneIdentifier
Browse files Browse the repository at this point in the history
  • Loading branch information
@mackysoft
mackysoft committed Nov 4, 2023
1 parent 77f2909 commit cbc474b
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
16 changes: 8 additions & 8 deletions ...e/SceneManagement/BlankSceneIdentifier.cs → ...eneManagement/AnonymousSceneIdentifier.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@

namespace MackySoft.Navigathena.SceneManagement.Tests
{
public sealed class BlankSceneIdentifier : ISceneIdentifier
public sealed class AnonymousSceneIdentifier : ISceneIdentifier
{

readonly string m_SceneName;
readonly Action<AnonymousSceneEntryPoint> m_OnCreate;
readonly List<ISceneEntryPointLifecycleListener> m_Listeners = new();

public BlankSceneIdentifier (string sceneName, Action<AnonymousSceneEntryPoint> onCreate = null)
public AnonymousSceneIdentifier (string sceneName, Action<AnonymousSceneEntryPoint> onCreate = null)
{
if (string.IsNullOrEmpty(sceneName))
{
Expand All @@ -24,36 +24,36 @@ public BlankSceneIdentifier (string sceneName, Action<AnonymousSceneEntryPoint>
m_OnCreate = onCreate;
}

public BlankSceneIdentifier Register (ISceneEntryPointLifecycleListener listener)
public AnonymousSceneIdentifier Register (ISceneEntryPointLifecycleListener listener)
{
m_Listeners.Add(listener);
return this;
}

public BlankSceneIdentifier Register (Func<BlankSceneIdentifier, ISceneEntryPointLifecycleListener> factory)
public AnonymousSceneIdentifier Register (Func<AnonymousSceneIdentifier, ISceneEntryPointLifecycleListener> factory)
{
m_Listeners.Add(factory(this));
return this;
}

public ISceneHandle CreateHandle ()
{
return new BlankSceneHandle(m_SceneName, m_OnCreate, m_Listeners);
return new AnonymousSceneHandle(m_SceneName, m_OnCreate, m_Listeners);
}

public override string ToString ()
{
return $"{m_SceneName} {nameof(BlankSceneIdentifier)}";
return $"{m_SceneName} {nameof(AnonymousSceneIdentifier)}";
}

sealed class BlankSceneHandle : ISceneHandle
sealed class AnonymousSceneHandle : ISceneHandle
{

readonly string m_SceneName;
readonly Action<AnonymousSceneEntryPoint> m_OnCreate;
readonly List<ISceneEntryPointLifecycleListener> m_Listeners;

public BlankSceneHandle (string sceneName, Action<AnonymousSceneEntryPoint> onCreate, List<ISceneEntryPointLifecycleListener> listeners)
public AnonymousSceneHandle (string sceneName, Action<AnonymousSceneEntryPoint> onCreate, List<ISceneEntryPointLifecycleListener> listeners)
{
m_SceneName = sceneName;
m_OnCreate = onCreate;
Expand Down
0 ...neManagement/BlankSceneIdentifier.cs.meta → ...nagement/AnonymousSceneIdentifier.cs.meta
View file
File renamed without changes.
44 changes: 22 additions & 22 deletions ...ckySoft/MackySoft.Navigathena/Tests/Runtime/SceneManagement/StandardSceneNavigatorTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public IEnumerator Throw_if_already_initialized () => UniTask.ToCoroutine(async
public IEnumerator Push_successfully () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand All @@ -70,8 +70,8 @@ public IEnumerator Push_successfully () => UniTask.ToCoroutine(async () =>
public IEnumerator Push_canceled_if_interrupt_transition_OnEnter () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var interruptSceneIdentifier = new BlankSceneIdentifier("InterruptScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene", entryPoint =>
var interruptSceneIdentifier = new AnonymousSceneIdentifier("InterruptScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene", entryPoint =>
{
entryPoint.SetCallbacks(
onEnter: (reader, ct) => m_Navigator.Push(interruptSceneIdentifier)
Expand Down Expand Up @@ -113,15 +113,15 @@ public IEnumerator Push_canceled_if_interrupt_transition_OnEnter () => UniTask.T
public IEnumerator Push_canceled_and_OnExit_is_not_called_if_interrupt_transition_OnInitialize () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var interruptSceneIdentifier2 = new BlankSceneIdentifier("InterruptScene2").Register(x => recorder.With(x));
var interruptSceneIdentifier1 = new BlankSceneIdentifier("InterruptScene1", entryPoint =>
var interruptSceneIdentifier2 = new AnonymousSceneIdentifier("InterruptScene2").Register(x => recorder.With(x));
var interruptSceneIdentifier1 = new AnonymousSceneIdentifier("InterruptScene1", entryPoint =>
{
entryPoint.SetCallbacks(
onInitialize: (reader, progress, ct) => m_Navigator.Push(interruptSceneIdentifier2),
onExit: (writer, ct) => UniTask.FromException(new InvalidOperationException("OnExit is called."))
);
}).Register(x => recorder.With(x));
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene", entryPoint =>
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene", entryPoint =>
{
entryPoint.SetCallbacks(
onInitialize: (reader, progress, ct) => m_Navigator.Push(interruptSceneIdentifier1),
Expand Down Expand Up @@ -165,8 +165,8 @@ public IEnumerator Push_canceled_and_OnExit_is_not_called_if_interrupt_transitio
public IEnumerator Pop_successfully () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new BlankSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new AnonymousSceneIdentifier("SecondScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand Down Expand Up @@ -217,7 +217,7 @@ public IEnumerator Pop_throw_if_history_is_empty () => UniTask.ToCoroutine(async
public IEnumerator Pop_throw_if_history_is_single_entry () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand All @@ -242,9 +242,9 @@ public IEnumerator Pop_throw_if_history_is_single_entry () => UniTask.ToCoroutin
public IEnumerator Pop_successfully_if_interrupt_pop () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new BlankSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new BlankSceneIdentifier("ThirdScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new AnonymousSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new AnonymousSceneIdentifier("ThirdScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand Down Expand Up @@ -294,8 +294,8 @@ await m_Navigator.Pop(interruptOperation: AsyncOperation.Create(async (progress,
public IEnumerator Change_successfully () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new BlankSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new AnonymousSceneIdentifier("SecondScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand Down Expand Up @@ -323,9 +323,9 @@ public IEnumerator Change_successfully () => UniTask.ToCoroutine(async () =>
public IEnumerator Change_successfully_if_interrupt_change () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new BlankSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new BlankSceneIdentifier("ThirdScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new AnonymousSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new AnonymousSceneIdentifier("ThirdScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand Down Expand Up @@ -363,9 +363,9 @@ await m_Navigator.Change(secondSceneIdentifier, interruptOperation: AsyncOperati
public IEnumerator Replace_successfully () => UniTask.ToCoroutine(async () =>
{
SceneEntryPointLifecycleSequenceRecorder recorder = new();
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new BlankSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new BlankSceneIdentifier("ThirdScene").Register(x => recorder.With(x));
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene").Register(x => recorder.With(x));
var secondSceneIdentifier = new AnonymousSceneIdentifier("SecondScene").Register(x => recorder.With(x));
var thirdSceneIdentifier = new AnonymousSceneIdentifier("ThirdScene").Register(x => recorder.With(x));

await m_Navigator.Initialize();

Expand Down Expand Up @@ -400,7 +400,7 @@ public IEnumerator Replace_successfully () => UniTask.ToCoroutine(async () =>
[UnityTest]
public IEnumerator Replace_throw_if_history_is_empty () => UniTask.ToCoroutine(async () =>
{
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene");
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene");

await m_Navigator.Initialize();

Expand All @@ -422,7 +422,7 @@ public IEnumerator Reload_successfully () => UniTask.ToCoroutine(async () =>

int initializeCount = 0;
int finalizeCount = 0;
var firstSceneIdentifier = new BlankSceneIdentifier("FirstScene", x =>
var firstSceneIdentifier = new AnonymousSceneIdentifier("FirstScene", x =>
{
x.SetCallbacks(
onInitialize: (reader, progress, ct) =>
Expand Down

0 comments on commit cbc474b

Please sign in to comment.