Skip to content

Commit 5dba91c

Browse files
authored
provide original nunit exploration when Standalone Nunit is selected (#1823)
1 parent 4493cbf commit 5dba91c

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

resharper/resharper-unity/src/Rider/UnitTesting/UnityNUnitServiceProvider.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public UnityNUnitServiceProvider(ISolution solution,
5151

5252
public override IUnitTestRunStrategy GetRunStrategy(IUnitTestElement element)
5353
{
54-
return IsUnityUnitTestStrategy(myUnitySolutionTracker, myRdUnityModel, myEditorProtocol) ? myUnityEditorStrategy : base.GetRunStrategy(element);
54+
return IsUnityUnitTestStrategy() ? myUnityEditorStrategy : base.GetRunStrategy(element);
5555
}
5656

5757
public static bool IsUnityUnitTestStrategy(UnitySolutionTracker unitySolutionTracker, RdUnityModel rdUnityModel, UnityEditorProtocol editorProtocol)
@@ -63,5 +63,10 @@ public static bool IsUnityUnitTestStrategy(UnitySolutionTracker unitySolutionTra
6363
return !rdUnityModel.UnitTestPreference.HasValue() && editorProtocol.UnityModel.Value != null ||
6464
(rdUnityModel.UnitTestPreference.HasValue() && rdUnityModel.UnitTestPreference.Value != UnitTestLaunchPreference.NUnit);
6565
}
66+
67+
public bool IsUnityUnitTestStrategy()
68+
{
69+
return IsUnityUnitTestStrategy(myUnitySolutionTracker, myRdUnityModel, myEditorProtocol);
70+
}
6671
}
6772
}

resharper/resharper-unity/src/Rider/UnitTesting/UnityUnitTestProjectArtifactResolverCollaborator.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@ namespace JetBrains.ReSharper.Plugins.Unity.Rider.UnitTesting
1010
public class UnityUnitTestProjectArtifactResolverCollaborator : IUnitTestProjectArtifactResolverCollaborator
1111
{
1212
private readonly UnitySolutionTracker myUnitySolutionTracker;
13+
private readonly UnityNUnitServiceProvider myServiceProvider;
1314

14-
public UnityUnitTestProjectArtifactResolverCollaborator(UnitySolutionTracker unitySolutionTracker)
15+
public UnityUnitTestProjectArtifactResolverCollaborator(UnitySolutionTracker unitySolutionTracker, UnityNUnitServiceProvider serviceProvider)
1516
{
1617
myUnitySolutionTracker = unitySolutionTracker;
18+
myServiceProvider = serviceProvider;
1719
}
1820

1921
public bool CanResolveArtifact(IProject project, TargetFrameworkId targetFrameworkId)
2022
{
21-
return myUnitySolutionTracker.IsUnityGeneratedProject.Maybe.Value;
23+
return myUnitySolutionTracker.IsUnityGeneratedProject.Maybe.Value && myServiceProvider.IsUnityUnitTestStrategy();
2224
}
2325

2426
public FileSystemPath ResolveArtifact(IProject project, TargetFrameworkId targetFrameworkId)

0 commit comments

Comments
 (0)