Skip to content

Commit 2c4e532

Browse files
authored
FIX: reenable editor tests after changes to mock dialogues (ISX-1896) (#1894)
* reenabled tests * added one new test to cover basic version of naming duplication that was missing
1 parent c25f068 commit 2c4e532

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

Assets/Tests/InputSystem.Editor/ControlSchemeEditorTests.cs

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ public void WhenControlSchemeIsSelected_SelectedControlSchemeIndexIsSet()
197197

198198
[Test]
199199
[Category("AssetEditor")]
200-
[Ignore("Instability ISX-1905")]
201200
public void WhenControlSchemeIsSelected_SelectedControlSchemeIsPopulatedWithSelection()
202201
{
203202
var asset = TestData.inputActionAsset
@@ -260,9 +259,29 @@ public void DuplicateControlSchemeCommand_CreatesCopyOfControlSchemeWithUniqueNa
260259
Assert.That(newState.selectedControlScheme.deviceRequirements, Is.EqualTo(state.selectedControlScheme.deviceRequirements));
261260
}
262261

262+
[Test(Description = "Verifies that when duplicating Control Scheme ending on an Int it increments that Int and jumps already existing Int names")]
263+
[Category("AssetEditor")]
264+
public void DuplicateControlSchemeCommand_CreatesCopyOfControlSchemeWithUniqueNameEndingOnIntJumpsExistingNumbers()
265+
{
266+
var asset = TestData.inputActionAsset.Generate();
267+
268+
asset.AddControlScheme(new InputControlScheme(("Test")));
269+
asset.AddControlScheme(new InputControlScheme(("Test1")));
270+
271+
//select "Test" Control Scheme
272+
var state = TestData.EditorStateWithAsset(asset).Generate().With(selectedControlScheme: asset.controlSchemes[0]);
273+
274+
state.serializedObject.Update();
275+
276+
//duplicate "Test"
277+
var newState = ControlSchemeCommands.DuplicateSelectedControlScheme()(in state);
278+
279+
//duplicated Control Scheme should be names "Test2", skipping "Test1"
280+
Assert.That(newState.selectedControlScheme.name, Is.EqualTo("Test2"));
281+
}
282+
263283
[Test]
264284
[Category("AssetEditor")]
265-
[Ignore("Disabled: This should not be called in batch mode.")]
266285
public void DeleteControlSchemeCommand_DeletesSelectedControlScheme()
267286
{
268287
var asset = TestData.inputActionAsset.WithControlScheme(TestData.controlScheme.WithOptionalDevice()).Generate();
@@ -284,7 +303,6 @@ public void DeleteControlSchemeCommand_DeletesSelectedControlScheme()
284303
[TestCase(3, 2, 1, "Test1")]
285304
[TestCase(1, 0, -1, null)]
286305
[Category("AssetEditor")]
287-
[Ignore("Disabled: This should not be called in batch mode.")]
288306
public void DeleteControlSchemeCommand_SelectsAnotherControlSchemeAfterDelete(
289307
int controlSchemeCount,
290308
int selectedControlSchemeIndex,

0 commit comments

Comments
 (0)