From 4694755cb3a95aa591c47c081cd9b7ade350fe8c Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 13 Jun 2023 07:52:11 -0400 Subject: [PATCH] Make it clearer which Darwin test files are helpers vs tests. (#27181) Moves the helpers into a TestHelpers folder. --- .../{ => TestHelpers}/MTRErrorTestUtils.h | 0 .../{ => TestHelpers}/MTRErrorTestUtils.mm | 0 .../CHIPTests/{ => TestHelpers}/MTRTestKeys.h | 0 .../CHIPTests/{ => TestHelpers}/MTRTestKeys.m | 0 .../{ => TestHelpers}/MTRTestOTAProvider.h | 0 .../{ => TestHelpers}/MTRTestOTAProvider.m | 0 .../MTRTestResetCommissioneeHelper.h | 0 .../MTRTestResetCommissioneeHelper.m | 0 .../{ => TestHelpers}/MTRTestStorage.h | 0 .../{ => TestHelpers}/MTRTestStorage.m | 0 .../Matter.xcodeproj/project.pbxproj | 28 ++++++++++++------- 11 files changed, 18 insertions(+), 10 deletions(-) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRErrorTestUtils.h (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRErrorTestUtils.mm (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestKeys.h (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestKeys.m (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestOTAProvider.h (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestOTAProvider.m (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestResetCommissioneeHelper.h (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestResetCommissioneeHelper.m (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestStorage.h (100%) rename src/darwin/Framework/CHIPTests/{ => TestHelpers}/MTRTestStorage.m (100%) diff --git a/src/darwin/Framework/CHIPTests/MTRErrorTestUtils.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRErrorTestUtils.h similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRErrorTestUtils.h rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRErrorTestUtils.h diff --git a/src/darwin/Framework/CHIPTests/MTRErrorTestUtils.mm b/src/darwin/Framework/CHIPTests/TestHelpers/MTRErrorTestUtils.mm similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRErrorTestUtils.mm rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRErrorTestUtils.mm diff --git a/src/darwin/Framework/CHIPTests/MTRTestKeys.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestKeys.h similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestKeys.h rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestKeys.h diff --git a/src/darwin/Framework/CHIPTests/MTRTestKeys.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestKeys.m similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestKeys.m rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestKeys.m diff --git a/src/darwin/Framework/CHIPTests/MTRTestOTAProvider.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestOTAProvider.h similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestOTAProvider.h rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestOTAProvider.h diff --git a/src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestOTAProvider.m similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestOTAProvider.m rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestOTAProvider.m diff --git a/src/darwin/Framework/CHIPTests/MTRTestResetCommissioneeHelper.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestResetCommissioneeHelper.h similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestResetCommissioneeHelper.h rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestResetCommissioneeHelper.h diff --git a/src/darwin/Framework/CHIPTests/MTRTestResetCommissioneeHelper.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestResetCommissioneeHelper.m similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestResetCommissioneeHelper.m rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestResetCommissioneeHelper.m diff --git a/src/darwin/Framework/CHIPTests/MTRTestStorage.h b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestStorage.h similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestStorage.h rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestStorage.h diff --git a/src/darwin/Framework/CHIPTests/MTRTestStorage.m b/src/darwin/Framework/CHIPTests/TestHelpers/MTRTestStorage.m similarity index 100% rename from src/darwin/Framework/CHIPTests/MTRTestStorage.m rename to src/darwin/Framework/CHIPTests/TestHelpers/MTRTestStorage.m diff --git a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj index 7ea9959fd9fab4..d2d7f3ae8d3cd2 100644 --- a/src/darwin/Framework/Matter.xcodeproj/project.pbxproj +++ b/src/darwin/Framework/Matter.xcodeproj/project.pbxproj @@ -902,6 +902,23 @@ path = partials; sourceTree = ""; }; + 51189FC72A33ACE900184508 /* TestHelpers */ = { + isa = PBXGroup; + children = ( + D437613F285BDC0D0051FEA2 /* MTRTestKeys.h */, + 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */, + D4376140285BDC0D0051FEA2 /* MTRTestStorage.h */, + 51D10D2D2808E2CA00E8CA3D /* MTRTestStorage.m */, + D437613E285BDC0D0051FEA2 /* MTRErrorTestUtils.h */, + 51E24E72274E0DAC007CCF6E /* MTRErrorTestUtils.mm */, + 1E748B3928941A45008A1BE8 /* MTRTestOTAProvider.h */, + 1E748B3828941A44008A1BE8 /* MTRTestOTAProvider.m */, + 51742B4829CB5F45009974FE /* MTRTestResetCommissioneeHelper.h */, + 51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */, + ); + path = TestHelpers; + sourceTree = ""; + }; B20252832459E34F00F97062 = { isa = PBXGroup; children = ( @@ -1052,16 +1069,7 @@ B202529A2459E34F00F97062 /* CHIPTests */ = { isa = PBXGroup; children = ( - 1E748B3928941A45008A1BE8 /* MTRTestOTAProvider.h */, - 1E748B3828941A44008A1BE8 /* MTRTestOTAProvider.m */, - D437613E285BDC0D0051FEA2 /* MTRErrorTestUtils.h */, - D437613F285BDC0D0051FEA2 /* MTRTestKeys.h */, - D4376140285BDC0D0051FEA2 /* MTRTestStorage.h */, - 51E24E72274E0DAC007CCF6E /* MTRErrorTestUtils.mm */, - 51C8E3F72825CDB600D47D00 /* MTRTestKeys.m */, - 51D10D2D2808E2CA00E8CA3D /* MTRTestStorage.m */, - 51742B4829CB5F45009974FE /* MTRTestResetCommissioneeHelper.h */, - 51742B4929CB5FC0009974FE /* MTRTestResetCommissioneeHelper.m */, + 51189FC72A33ACE900184508 /* TestHelpers */, 3DFCB3282966684500332B35 /* MTRCertificateInfoTests.m */, 99C65E0F267282F1003402F6 /* MTRControllerTests.m */, 5AE6D4E327A99041001F2493 /* MTRDeviceTests.m */,