From 42385a5da0f60808f21df6cdadb8d847d0e69512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6nnqvist?= Date: Tue, 11 Nov 2025 10:20:41 +0100 Subject: [PATCH 1/5] Revert "Revert "Rename two internal targets for clarity (#1330)"" This reverts commit f2a841ee8351ca6e902465c6e161dbe6ae89d122. --- CONTRIBUTING.md | 4 ++-- Package.swift | 20 ++++++++-------- Sources/CMakeLists.txt | 2 +- .../Action/Action.swift | 0 .../Action/ActionResult.swift | 0 .../Action/Actions/Action+MoveOutput.swift | 0 .../Actions/Convert/ConvertAction.swift | 0 .../Convert/ConvertFileWritingConsumer.swift | 0 .../CoverageDataEntry+generateSummary.swift | 0 .../Action/Actions/Convert/Indexer.swift | 0 .../JSONEncodingRenderNodeWriter.swift | 0 .../Action/Actions/CoverageAction.swift | 0 .../Actions/EmitGeneratedCurationAction.swift | 0 .../Action/Actions/IndexAction.swift | 0 .../Action/Actions/Init/CatalogTemplate.swift | 0 .../Actions/Init/CatalogTemplateKind.swift | 0 .../Action/Actions/Init/InitAction.swift | 0 .../MergeAction+SynthesizedLandingPage.swift | 0 .../Action/Actions/Merge/MergeAction.swift | 0 .../Action/Actions/PreviewAction.swift | 0 .../TransformForStaticHostingAction.swift | 0 .../Action+performAndHandleResult.swift | 0 .../ConvertAction+CommandInitialization.swift | 0 ...CurationAction+CommandInitialization.swift | 0 .../IndexAction+CommandInitialization.swift | 0 .../InitAction+CommandInitialization.swift | 0 .../PreviewAction+CommandInitialization.swift | 0 ...cHostingAction+CommandInitialization.swift | 0 .../URLArgumentValidator.swift | 0 .../Options/DirectoryPathOption.swift | 0 .../Options/DocumentationArchiveOption.swift | 0 .../Options/DocumentationBundleOption.swift | 0 ...DocumentationCoverageOptionsArgument.swift | 2 +- .../ArgumentParsing/Options/InitOptions.swift | 0 .../OutOfProcessLinkResolverOption.swift | 0 .../Options/PreviewOptions.swift | 0 .../SourceRepositoryArguments.swift | 0 .../Options/TemplateOption.swift | 0 .../ArgumentParsing/Subcommands/Convert.swift | 0 .../Subcommands/EmitGeneratedCuration.swift | 0 .../ArgumentParsing/Subcommands/Index.swift | 0 .../ArgumentParsing/Subcommands/Init.swift | 0 .../ArgumentParsing/Subcommands/Merge.swift | 0 .../ArgumentParsing/Subcommands/Preview.swift | 0 .../Subcommands/ProcessArchive.swift | 0 .../Subcommands/ProcessCatalog.swift | 0 .../TransformForStaticHosting.swift | 0 .../CommandLine.docc/CommandLine.md} | 8 +++---- .../CommandLine}/Actions/InitAction.md | 2 +- .../CommandLine}/Extensions/Docc.md | 2 +- .../CommandLine.docc}/footer.html | 0 .../CommandLine.docc}/header.html | 0 .../Docc.swift | 0 .../PreviewServer/PreviewHTTPHandler.swift | 0 .../PreviewServer/PreviewServer.swift | 0 .../DefaultRequestHandler.swift | 0 .../RequestHandler/ErrorRequestHandler.swift | 0 .../RequestHandler/FileRequestHandler.swift | 0 .../HTTPResponseHead+FromRequest.swift | 0 .../RequestHandlerFactory.swift | 0 .../StaticHostableTransformer.swift | 0 .../Utility/DirectoryMonitor.swift | 0 .../Sequence+Unique.swift | 0 .../FoundationExtensions/String+Path.swift | 0 .../URL+IsAbsoluteWebURL.swift | 0 .../FoundationExtensions/URL+Relative.swift | 0 .../Utility/PlatformArgumentParser.swift | 0 .../Utility/Signal.swift | 0 .../Utility/Throttle.swift | 0 .../SwiftDocC/AddingFeatureFlags.md | 6 ++--- .../SwiftDocC/CompilerPipeline.md | 4 ++-- Sources/SwiftDocCUtilities/CMakeLists.txt | 4 ++-- .../FilesAndFolders.swift | 0 .../SymbolGraphCreation.swift | 0 .../TestFileSystem.swift | 0 .../XCTestCase+TemporaryDirectory.swift | 0 Sources/docc/CMakeLists.txt | 2 +- Sources/docc/main.swift | 4 ++-- ...nvertSubcommandSourceRepositoryTests.swift | 6 ++--- .../ConvertSubcommandTests.swift | 6 ++--- ...tationCoverageKindFilterOptionsTests.swift | 0 .../ArgumentParsing/ErrorMessageTests.swift | 4 ++-- .../MergeSubcommandTests.swift | 4 ++-- .../PreviewSubcommandTests.swift | 4 ++-- .../C+Extensions.swift | 0 .../ConvertActionIndexerTests.swift | 2 +- .../ConvertActionStaticHostableTests.swift | 6 ++--- .../ConvertActionTests.swift | 4 ++-- .../DirectoryMonitorTests.swift | 2 +- .../EmitGeneratedCurationsActionTests.swift | 6 ++--- .../FolderStructure.swift | 6 ++--- .../FolderStructureTests.swift | 2 +- .../HTMLTemplateDirectory.swift | 2 +- .../IndexActionTests.swift | 6 ++--- .../Init/InitActionTests.swift | 6 ++--- .../JSONEncodingRenderNodeWriterTests.swift | 4 ++-- .../MergeActionTests.swift | 4 ++-- .../PlatformArgumentParserTests.swift | 4 ++-- .../PreviewActionIntegrationTests.swift | 6 ++--- .../PreviewHTTPHandlerTests.swift | 4 ++-- .../DefaultRequestHandlerTests.swift | 4 ++-- .../ErrorRequestHandlerTests.swift | 2 +- .../FileRequestHandlerTests.swift | 4 ++-- .../PreviewServer/ServerTestUtils.swift | 4 ++-- .../ProblemTests.swift | 4 ++-- .../SemanticAnalyzerTests.swift | 4 ++-- .../ShadowFileManagerTemporaryDirectory.swift | 0 .../SignalTests.swift | 0 .../StaticHostableTransformerTests.swift | 6 ++--- .../StaticHostingBaseTest.swift | 0 .../Default Code Listing Syntax.md | 0 .../FillIntroduced.symbols.json | 0 .../Info.plist | 0 .../MyKit@SideKit.symbols.json | 0 .../TestOverview.tutorial | 0 .../TestTutorial.tutorial | 0 .../TestTutorial2.tutorial | 0 .../TestTutorialArticle.tutorial | 0 .../TutorialMediaWithSpaces.tutorial | 0 .../article.md | 0 .../article2.md | 0 .../article3.md | 0 .../documentation/myclass.md | 0 .../documentation/mykit.md | 0 .../documentation/myprotocol.md | 0 .../documentation/sideclass-init.md | 0 .../documentation/sidekit.md | 0 .../figure1.png | Bin .../figure1~dark.png | Bin .../helloworld.swift | 0 .../helloworld1.swift | 0 .../helloworld2.swift | 0 .../helloworld3.swift | 0 .../helloworld4.swift | 0 .../intro.png | Bin .../introposter.png | Bin .../introposter2.png | Bin .../introvideo.mp4 | Bin .../introvideo~dark.mp4 | Bin .../mykit-iOS.symbols.json | 0 .../project.zip | Bin .../sidekit.symbols.json | 0 .../something@2x.png | Bin .../step.png | Bin .../titled2up.png | Bin .../titled2upCapital.PNG | Bin .../with spaces.mp4 | Bin .../with spaces.png | Bin .../with spaces@2x.png | Bin .../MixedLanguageFramework.docc/Info.plist | 0 .../clang/MixedLanguageFramework.symbols.json | 0 .../swift/MixedLanguageFramework.symbols.json | 0 .../OverloadedSymbols.docc/Info.plist | 0 .../ShapeKit.symbols.json | 0 .../SingleArticleTestBundle.docc/Info.plist | 0 .../SingleArticleTestBundle.docc/article.md | 0 .../DeckKit-Objective-C.symbols.json | 0 .../Test Resources/Overview.tutorial | 0 .../Test Resources/Test Template/index.html | 0 .../TopLevelCuration.symbols.json | 0 .../Test Resources/UncuratedArticle.md | 0 .../Test Resources/image.png | Bin .../ThrottleTests.swift | 4 ++-- ...TransformForStaticHostingActionTests.swift | 6 ++--- .../Utility/DirectedGraphTests.swift | 0 .../Utility/FileTests.swift | 2 +- .../Utility/LogHandleTests.swift | 4 ++-- .../Utility/Sequence+UniqueTests.swift | 4 ++-- .../Utility/TestFileSystemTests.swift | 4 ++-- .../Utility/URL+IsAbsoluteWebURLTests.swift | 4 ++-- .../Utility/URL+RelativeTests.swift | 4 ++-- .../XCTestCase+enableFeatureFlag.swift | 0 .../XCTestCase+LoadingData.swift | 2 +- .../NonInclusiveLanguageCheckerTests.swift | 2 +- ...recatedDiagnosticsDigestWarningTests.swift | 2 +- ...icConsoleWriterDefaultFormattingTest.swift | 4 ++-- .../Diagnostics/DiagnosticTests.swift | 2 +- .../ConvertService/ConvertServiceTests.swift | 2 +- .../Indexing/ExternalRenderNodeTests.swift | 2 +- .../Indexing/NavigatorIndexTests.swift | 2 +- .../Indexing/RenderIndexTests.swift | 2 +- .../AutoCapitalizationTests.swift | 2 +- .../AutomaticCurationTests.swift | 2 +- .../Infrastructure/BundleDiscoveryTests.swift | 2 +- .../DocumentationContext+RootPageTests.swift | 2 +- .../DocumentationContextTests.swift | 2 +- .../DocumentationCuratorTests.swift | 2 +- .../ExternalPathHierarchyResolverTests.swift | 2 +- .../ExternalReferenceResolverTests.swift | 2 +- .../DocumentationInputsProviderTests.swift | 2 +- .../Infrastructure/NodeTagsTests.swift | 2 +- .../Infrastructure/PathHierarchyTests.swift | 2 +- .../Infrastructure/SnippetResolverTests.swift | 2 +- .../SymbolGraph/SymbolGraphLoaderTests.swift | 2 +- .../Infrastructure/SymbolReferenceTests.swift | 2 +- .../LinkDestinationSummaryTests.swift | 2 +- .../Model/LineHighlighterTests.swift | 2 +- .../ParametersAndReturnValidatorTests.swift | 2 +- ...opertyListPossibleValuesSectionTests.swift | 2 +- .../SemaToRenderNodeMultiLanguageTests.swift | 2 +- .../Model/SemaToRenderNodeTests.swift | 2 +- ...OutOfProcessReferenceResolverV1Tests.swift | 2 +- ...OutOfProcessReferenceResolverV2Tests.swift | 2 +- .../Rendering/AutomaticSeeAlsoTests.swift | 2 +- .../ConstraintsRenderSectionTests.swift | 2 +- .../DeclarationsRenderSectionTests.swift | 2 +- .../Rendering/DefaultAvailabilityTests.swift | 2 +- .../DefaultCodeListingSyntaxTests.swift | 2 +- .../Rendering/HeadingAnchorTests.swift | 2 +- .../Rendering/PlistSymbolTests.swift | 4 ++-- ...ropertyListDetailsRenderSectionTests.swift | 2 +- .../Rendering/RESTSymbolsTests.swift | 2 +- .../RenderContentCompilerTests.swift | 2 +- ...derNodeTranslatorSymbolVariantsTests.swift | 2 +- .../Rendering/RenderNodeTranslatorTests.swift | 2 +- .../Rendering/SymbolAvailabilityTests.swift | 2 +- .../Rendering/TermListTests.swift | 2 +- .../ArticleSymbolMentionsTests.swift | 2 +- .../Semantics/ChoiceTests.swift | 2 +- .../Semantics/DoxygenTests.swift | 2 +- .../MarkupReferenceResolverTests.swift | 2 +- .../Semantics/MultipleChoiceTests.swift | 2 +- .../SwiftDocCTests/Semantics/StackTests.swift | 2 +- .../SwiftDocCTests/Semantics/StepTests.swift | 2 +- .../Semantics/SymbolTests.swift | 2 +- .../Semantics/TutorialArticleTests.swift | 2 +- .../Semantics/TutorialTests.swift | 2 +- .../Semantics/VideoMediaTests.swift | 2 +- .../Semantics/VolumeTests.swift | 2 +- Tests/SwiftDocCTests/Utility/LMDBTests.swift | 2 +- .../Utility/ListItemExtractorTests.swift | 2 +- .../Utility/XCTestCase+MentionedIn.swift | 2 +- .../XCTestCase+LoadingTestData.swift | 2 +- Tests/signal-test-app/main.swift | 6 ++--- bin/check-source | 2 +- bin/preview-docs | 22 +++++++++--------- bin/update-gh-pages-documentation-site | 18 +++++++------- 237 files changed, 191 insertions(+), 191 deletions(-) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Action.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/ActionResult.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Action+MoveOutput.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Convert/ConvertAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Convert/ConvertFileWritingConsumer.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Convert/Indexer.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/CoverageAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/EmitGeneratedCurationAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/IndexAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Init/CatalogTemplate.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Init/CatalogTemplateKind.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Init/InitAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/Merge/MergeAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/PreviewAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Action/Actions/TransformForStaticHostingAction.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/DirectoryPathOption.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/DocumentationArchiveOption.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/DocumentationBundleOption.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift (97%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/InitOptions.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/PreviewOptions.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Options/TemplateOption.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/Convert.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/Index.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/Init.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/Merge.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/Preview.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/ProcessArchive.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/ProcessCatalog.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/ArgumentParsing/Subcommands/TransformForStaticHosting.swift (100%) rename Sources/{SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md => CommandLine/CommandLine.docc/CommandLine.md} (54%) rename Sources/{SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities => CommandLine/CommandLine.docc/CommandLine}/Actions/InitAction.md (98%) rename Sources/{SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities => CommandLine/CommandLine.docc/CommandLine}/Extensions/Docc.md (90%) rename Sources/{SwiftDocCUtilities/SwiftDocCUtilities.docc => CommandLine/CommandLine.docc}/footer.html (100%) rename Sources/{SwiftDocCUtilities/SwiftDocCUtilities.docc => CommandLine/CommandLine.docc}/header.html (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Docc.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/PreviewHTTPHandler.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/PreviewServer.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/RequestHandler/DefaultRequestHandler.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/RequestHandler/ErrorRequestHandler.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/RequestHandler/FileRequestHandler.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/PreviewServer/RequestHandler/RequestHandlerFactory.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Transformers/StaticHostableTransformer.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/DirectoryMonitor.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/FoundationExtensions/Sequence+Unique.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/FoundationExtensions/String+Path.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/FoundationExtensions/URL+Relative.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/PlatformArgumentParser.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/Signal.swift (100%) rename Sources/{SwiftDocCUtilities => CommandLine}/Utility/Throttle.swift (100%) rename Sources/{SwiftDocCTestUtilities => TestUtilities}/FilesAndFolders.swift (100%) rename Sources/{SwiftDocCTestUtilities => TestUtilities}/SymbolGraphCreation.swift (100%) rename Sources/{SwiftDocCTestUtilities => TestUtilities}/TestFileSystem.swift (100%) rename Sources/{SwiftDocCTestUtilities => TestUtilities}/XCTestCase+TemporaryDirectory.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/ConvertSubcommandTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/ErrorMessageTests.swift (93%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/MergeSubcommandTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ArgumentParsing/PreviewSubcommandTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/C+Extensions.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ConvertActionIndexerTests.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ConvertActionStaticHostableTests.swift (96%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ConvertActionTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/DirectoryMonitorTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/EmitGeneratedCurationsActionTests.swift (96%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/FolderStructure.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/FolderStructureTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/HTMLTemplateDirectory.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/IndexActionTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Init/InitActionTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/JSONEncodingRenderNodeWriterTests.swift (95%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/MergeActionTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PlatformArgumentParserTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewActionIntegrationTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewServer/PreviewHTTPHandlerTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift (96%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewServer/RequestHandler/FileRequestHandlerTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/PreviewServer/ServerTestUtils.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ProblemTests.swift (89%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/SemanticAnalyzerTests.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ShadowFileManagerTemporaryDirectory.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/SignalTests.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/StaticHostableTransformerTests.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/StaticHostingBaseTest.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/MixedLanguageFramework.docc/Info.plist (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/OverloadedSymbols.docc/Info.plist (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/SingleArticleTestBundle.docc/Info.plist (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Bundles/SingleArticleTestBundle.docc/article.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/DeckKit-Objective-C.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/Overview.tutorial (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/Test Template/index.html (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/TopLevelCuration.symbols.json (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/UncuratedArticle.md (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Test Resources/image.png (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/ThrottleTests.swift (92%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/TransformForStaticHostingActionTests.swift (98%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/DirectedGraphTests.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/FileTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/LogHandleTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/Sequence+UniqueTests.swift (94%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/TestFileSystemTests.swift (99%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/URL+IsAbsoluteWebURLTests.swift (90%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/URL+RelativeTests.swift (97%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/Utility/XCTestCase+enableFeatureFlag.swift (100%) rename Tests/{SwiftDocCUtilitiesTests => CommandLineTests}/XCTestCase+LoadingData.swift (98%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index da6d76fb8f..71eff08cab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -520,7 +520,7 @@ For more in-depth technical information about Swift-DocC, please refer to the project's technical documentation: - [`SwiftDocC` framework documentation](https://swiftlang.github.io/swift-docc/documentation/swiftdocc/) -- [`SwiftDocCUtilities` framework documentation](https://swiftlang.github.io/swift-docc/documentation/swiftdoccutilities/) +- [`CommandLine` framework documentation](https://swiftlang.github.io/swift-docc/documentation/commandline/) ### Related Projects @@ -545,4 +545,4 @@ project's technical documentation: with support for building and viewing documentation for your framework and its dependencies. - + diff --git a/Package.swift b/Package.swift index 9ad6fa6d7a..544c13b596 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -55,7 +55,7 @@ let package = Package( name: "SwiftDocCTests", dependencies: [ .target(name: "SwiftDocC"), - .target(name: "SwiftDocCTestUtilities"), + .target(name: "TestUtilities"), ], resources: [ .copy("Test Resources"), @@ -67,7 +67,7 @@ let package = Package( ), // Command-line tool library .target( - name: "SwiftDocCUtilities", + name: "CommandLine", dependencies: [ .target(name: "SwiftDocC"), .product(name: "NIOHTTP1", package: "swift-nio", condition: .when(platforms: [.macOS, .iOS, .linux, .android])), @@ -77,11 +77,11 @@ let package = Package( swiftSettings: swiftSettings ), .testTarget( - name: "SwiftDocCUtilitiesTests", + name: "CommandLineTests", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), .target(name: "SwiftDocC"), - .target(name: "SwiftDocCTestUtilities"), + .target(name: "TestUtilities"), ], resources: [ .copy("Test Resources"), @@ -92,7 +92,7 @@ let package = Package( // Test utility library .target( - name: "SwiftDocCTestUtilities", + name: "TestUtilities", dependencies: [ .target(name: "SwiftDocC"), .product(name: "SymbolKit", package: "swift-docc-symbolkit"), @@ -104,17 +104,17 @@ let package = Package( .executableTarget( name: "docc", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), ], exclude: ["CMakeLists.txt"], swiftSettings: swiftSettings ), - // Test app for SwiftDocCUtilities + // Test app for CommandLine .executableTarget( name: "signal-test-app", dependencies: [ - .target(name: "SwiftDocCUtilities"), + .target(name: "CommandLine"), ], path: "Tests/signal-test-app", swiftSettings: swiftSettings diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 8f8e806655..4362f918d0 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -8,5 +8,5 @@ See https://swift.org/LICENSE.txt for license information #]] add_subdirectory(SwiftDocC) -add_subdirectory(SwiftDocCUtilities) +add_subdirectory(CommandLine) add_subdirectory(docc) diff --git a/Sources/SwiftDocCUtilities/Action/Action.swift b/Sources/CommandLine/Action/Action.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Action.swift rename to Sources/CommandLine/Action/Action.swift diff --git a/Sources/SwiftDocCUtilities/Action/ActionResult.swift b/Sources/CommandLine/Action/ActionResult.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/ActionResult.swift rename to Sources/CommandLine/Action/ActionResult.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Action+MoveOutput.swift b/Sources/CommandLine/Action/Actions/Action+MoveOutput.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Action+MoveOutput.swift rename to Sources/CommandLine/Action/Actions/Action+MoveOutput.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertAction.swift b/Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertAction.swift rename to Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertFileWritingConsumer.swift b/Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/ConvertFileWritingConsumer.swift rename to Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift b/Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift rename to Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/Indexer.swift b/Sources/CommandLine/Action/Actions/Convert/Indexer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/Indexer.swift rename to Sources/CommandLine/Action/Actions/Convert/Indexer.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift b/Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift rename to Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/CoverageAction.swift b/Sources/CommandLine/Action/Actions/CoverageAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/CoverageAction.swift rename to Sources/CommandLine/Action/Actions/CoverageAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/EmitGeneratedCurationAction.swift b/Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/EmitGeneratedCurationAction.swift rename to Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/IndexAction.swift b/Sources/CommandLine/Action/Actions/IndexAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/IndexAction.swift rename to Sources/CommandLine/Action/Actions/IndexAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplate.swift b/Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplate.swift rename to Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplateKind.swift b/Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/CatalogTemplateKind.swift rename to Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Init/InitAction.swift b/Sources/CommandLine/Action/Actions/Init/InitAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Init/InitAction.swift rename to Sources/CommandLine/Action/Actions/Init/InitAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift b/Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift rename to Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction.swift b/Sources/CommandLine/Action/Actions/Merge/MergeAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/Merge/MergeAction.swift rename to Sources/CommandLine/Action/Actions/Merge/MergeAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/PreviewAction.swift b/Sources/CommandLine/Action/Actions/PreviewAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/PreviewAction.swift rename to Sources/CommandLine/Action/Actions/PreviewAction.swift diff --git a/Sources/SwiftDocCUtilities/Action/Actions/TransformForStaticHostingAction.swift b/Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Action/Actions/TransformForStaticHostingAction.swift rename to Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift b/Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift rename to Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift b/Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift rename to Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DirectoryPathOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DirectoryPathOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationArchiveOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationArchiveOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift b/Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift similarity index 97% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift rename to Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift index f1812bbfc5..25b5aabbd3 100644 --- a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift +++ b/Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift @@ -76,7 +76,7 @@ public struct DocumentationCoverageOptionsArgument: ParsableArguments { // // It is safe to add a retroactively conformance here because the other module (SwiftDocC) is in the same package. // -// These conforming types are defined in SwiftDocC and extended in SwiftDocCUtilities, because SwiftDocC doesn't link against ArgumentParse (since it isn't about CLI). +// These conforming types are defined in SwiftDocC and extended in CommandLine, because SwiftDocC doesn't link against ArgumentParser (since it isn't about CLI). // We conform here because this is the first place that we can add the conformance. The implementation is in SwiftDocC. extension SwiftDocC.DocumentationCoverageLevel: ArgumentParser.ExpressibleByArgument {} extension SwiftDocC.DocumentationCoverageOptions.KindFilterOptions.BitFlagRepresentation: ArgumentParser.ExpressibleByArgument {} diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/InitOptions.swift b/Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/InitOptions.swift rename to Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift b/Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/PreviewOptions.swift b/Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/PreviewOptions.swift rename to Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift b/Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift rename to Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/TemplateOption.swift b/Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Options/TemplateOption.swift rename to Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Index.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Index.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Init.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Init.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Merge.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Merge.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Preview.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Preview.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessArchive.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessArchive.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessCatalog.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/ProcessCatalog.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/TransformForStaticHosting.swift b/Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift similarity index 100% rename from Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/TransformForStaticHosting.swift rename to Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md b/Sources/CommandLine/CommandLine.docc/CommandLine.md similarity index 54% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md rename to Sources/CommandLine/CommandLine.docc/CommandLine.md index 0e3a8b4f47..defdb873b6 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine.md @@ -1,12 +1,12 @@ -# ``SwiftDocCUtilities`` +# ``CommandLine`` Build custom documentation workflows by leveraging the DocC compiler pipeline. ## Overview -SwiftDocCUtilities provides a default, command-line workflow for DocC, powered by Swift [Argument Parser](https://apple.github.io/swift-argument-parser/documentation/argumentparser/). `docc` commands, such as `convert` and `preview`, are conformant ``Action`` types that use DocC to perform documentation tasks. +CommandLine provides a default, command-line workflow for DocC, powered by Swift [Argument Parser](https://apple.github.io/swift-argument-parser/documentation/argumentparser/). `docc` commands, such as `convert` and `preview`, are conformant ``Action`` types that use DocC to perform documentation tasks. -Use SwiftDocCUtilities to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``. +Use CommandLine to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``. ```swift public import ArgumentParser @@ -44,4 +44,4 @@ Adding a new sub-command automatically adds routing and execution of its code, a - ``Throttle`` - ``Signal`` - + diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md b/Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md similarity index 98% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md rename to Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md index be46e30b13..70faf36635 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Actions/InitAction.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md @@ -1,4 +1,4 @@ -# ``SwiftDocCUtilities/InitAction`` +# ``InitAction`` @Metadata { @DocumentationExtension(mergeBehavior: override) diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md b/Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md similarity index 90% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md rename to Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md index f7e904530e..70d767f9d3 100644 --- a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/SwiftDocCUtilities/Extensions/Docc.md +++ b/Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md @@ -1,4 +1,4 @@ -# ``SwiftDocCUtilities/Docc`` +# ``Docc`` ## Topics diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/footer.html b/Sources/CommandLine/CommandLine.docc/footer.html similarity index 100% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/footer.html rename to Sources/CommandLine/CommandLine.docc/footer.html diff --git a/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/header.html b/Sources/CommandLine/CommandLine.docc/header.html similarity index 100% rename from Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc/header.html rename to Sources/CommandLine/CommandLine.docc/header.html diff --git a/Sources/SwiftDocCUtilities/Docc.swift b/Sources/CommandLine/Docc.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Docc.swift rename to Sources/CommandLine/Docc.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/PreviewHTTPHandler.swift b/Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/PreviewHTTPHandler.swift rename to Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/PreviewServer.swift b/Sources/CommandLine/PreviewServer/PreviewServer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/PreviewServer.swift rename to Sources/CommandLine/PreviewServer/PreviewServer.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/DefaultRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/DefaultRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/ErrorRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/ErrorRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/FileRequestHandler.swift b/Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/FileRequestHandler.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift b/Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift diff --git a/Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/RequestHandlerFactory.swift b/Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift similarity index 100% rename from Sources/SwiftDocCUtilities/PreviewServer/RequestHandler/RequestHandlerFactory.swift rename to Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift diff --git a/Sources/SwiftDocCUtilities/Transformers/StaticHostableTransformer.swift b/Sources/CommandLine/Transformers/StaticHostableTransformer.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Transformers/StaticHostableTransformer.swift rename to Sources/CommandLine/Transformers/StaticHostableTransformer.swift diff --git a/Sources/SwiftDocCUtilities/Utility/DirectoryMonitor.swift b/Sources/CommandLine/Utility/DirectoryMonitor.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/DirectoryMonitor.swift rename to Sources/CommandLine/Utility/DirectoryMonitor.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/Sequence+Unique.swift b/Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/Sequence+Unique.swift rename to Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/String+Path.swift b/Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/String+Path.swift rename to Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift b/Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift rename to Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift diff --git a/Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+Relative.swift b/Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/FoundationExtensions/URL+Relative.swift rename to Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift diff --git a/Sources/SwiftDocCUtilities/Utility/PlatformArgumentParser.swift b/Sources/CommandLine/Utility/PlatformArgumentParser.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/PlatformArgumentParser.swift rename to Sources/CommandLine/Utility/PlatformArgumentParser.swift diff --git a/Sources/SwiftDocCUtilities/Utility/Signal.swift b/Sources/CommandLine/Utility/Signal.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/Signal.swift rename to Sources/CommandLine/Utility/Signal.swift diff --git a/Sources/SwiftDocCUtilities/Utility/Throttle.swift b/Sources/CommandLine/Utility/Throttle.swift similarity index 100% rename from Sources/SwiftDocCUtilities/Utility/Throttle.swift rename to Sources/CommandLine/Utility/Throttle.swift diff --git a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md index 3712ca2aa0..52d7220981 100644 --- a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md +++ b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md @@ -17,12 +17,12 @@ value so that the default initializer can be used. ### Feature flags on the command line -Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `SwiftDocCUtilities`. +Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `CommandLine`. This type implements the `ParsableArguments` protocol from Swift Argument Parser to create an option group for the `convert` and `preview` commands. These options are then handled in `ConvertAction.init(fromConvertCommand:)`, still in -`SwiftDocCUtilities`, where they are written into the global feature flags ``FeatureFlags/current`` +`CommandLine`, where they are written into the global feature flags ``FeatureFlags/current`` instance, which can then be used during the compilation process. ### Feature flags in Info.plist @@ -37,4 +37,4 @@ Feature flags that are loaded from an Info.plist file are saved into the global the bundle is being registered. To ensure that your new feature flag is properly loaded, update the ``FeatureFlags/loadFlagsFromBundle(_:)`` method to load your new field into the global flags. - + diff --git a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md index eb63941f1b..afd5e55ed7 100644 --- a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md +++ b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/CompilerPipeline.md @@ -33,7 +33,7 @@ SwiftDocC.docc ├ Essentials │ ├ ActionManager.md │ ├ Action.md -│ ╰ Getting Started with SwiftDocCUtilities.md +│ ╰ Getting Started with SwiftDocC.md ├ Migration to DocC │ ├ DocumentationContext.md │ ╰ ... @@ -104,4 +104,4 @@ The file hierarchy under the output path represents the complete, compiled docum ╰ videos ``` - + diff --git a/Sources/SwiftDocCUtilities/CMakeLists.txt b/Sources/SwiftDocCUtilities/CMakeLists.txt index c419ba4807..a0552f96dc 100644 --- a/Sources/SwiftDocCUtilities/CMakeLists.txt +++ b/Sources/SwiftDocCUtilities/CMakeLists.txt @@ -7,7 +7,7 @@ Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information #]] -add_library(SwiftDocCUtilities STATIC +add_library(CommandLine STATIC Action/Action.swift Action/ActionResult.swift Action/Actions/Action+MoveOutput.swift @@ -69,6 +69,6 @@ add_library(SwiftDocCUtilities STATIC Utility/PlatformArgumentParser.swift Utility/Signal.swift Utility/Throttle.swift) -target_link_libraries(SwiftDocCUtilities PUBLIC +target_link_libraries(CommandLine PUBLIC ArgumentParser SwiftDocC) diff --git a/Sources/SwiftDocCTestUtilities/FilesAndFolders.swift b/Sources/TestUtilities/FilesAndFolders.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/FilesAndFolders.swift rename to Sources/TestUtilities/FilesAndFolders.swift diff --git a/Sources/SwiftDocCTestUtilities/SymbolGraphCreation.swift b/Sources/TestUtilities/SymbolGraphCreation.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/SymbolGraphCreation.swift rename to Sources/TestUtilities/SymbolGraphCreation.swift diff --git a/Sources/SwiftDocCTestUtilities/TestFileSystem.swift b/Sources/TestUtilities/TestFileSystem.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/TestFileSystem.swift rename to Sources/TestUtilities/TestFileSystem.swift diff --git a/Sources/SwiftDocCTestUtilities/XCTestCase+TemporaryDirectory.swift b/Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift similarity index 100% rename from Sources/SwiftDocCTestUtilities/XCTestCase+TemporaryDirectory.swift rename to Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift diff --git a/Sources/docc/CMakeLists.txt b/Sources/docc/CMakeLists.txt index 4289856b76..722df3a849 100644 --- a/Sources/docc/CMakeLists.txt +++ b/Sources/docc/CMakeLists.txt @@ -10,7 +10,7 @@ See https://swift.org/LICENSE.txt for license information add_executable(docc main.swift) target_link_libraries(docc PRIVATE - SwiftDocCUtilities) + CommandLine) install(TARGETS docc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/Sources/docc/main.swift b/Sources/docc/main.swift index 1715eed8e1..51180b0335 100644 --- a/Sources/docc/main.swift +++ b/Sources/docc/main.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,7 +9,7 @@ */ #if os(macOS) || os(Linux) || os(Android) || os(Windows) || os(FreeBSD) -import SwiftDocCUtilities +import CommandLine await Task { await Docc.main() diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift index 654006839c..e77b39a535 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2022 Apple Inc. and the Swift project authors + Copyright (c) 2022-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,9 +9,9 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import ArgumentParser class ConvertSubcommandSourceRepositoryTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift index 41027fbba1..69f4c7373b 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,9 +9,9 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ConvertSubcommandTests: XCTestCase { private let testBundleURL = Bundle.module.url( diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift b/Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift rename to Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift b/Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift similarity index 93% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift rename to Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift index 335ac9f3d5..2a331cb9e7 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ErrorMessageTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,7 @@ import XCTest import Foundation -@testable import SwiftDocCUtilities +@testable import CommandLine class ErrorMessageTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift index 85731b8e9c..d073d6b34e 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/MergeSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift @@ -10,8 +10,8 @@ import XCTest import ArgumentParser -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class MergeSubcommandTests: XCTestCase { func testCommandLineArgumentValidation() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift rename to Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift index 1f586324d3..d475294290 100644 --- a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/PreviewSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,7 @@ #if canImport(NIOHTTP1) import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class PreviewSubcommandTests: XCTestCase { func testOptionsValidation() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/C+Extensions.swift b/Tests/CommandLineTests/C+Extensions.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/C+Extensions.swift rename to Tests/CommandLineTests/C+Extensions.swift diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift b/Tests/CommandLineTests/ConvertActionIndexerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift rename to Tests/CommandLineTests/ConvertActionIndexerTests.swift index 4d3db2bdbf..e28af46ab5 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionIndexerTests.swift +++ b/Tests/CommandLineTests/ConvertActionIndexerTests.swift @@ -11,7 +11,7 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine class ConvertActionIndexerTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift b/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift rename to Tests/CommandLineTests/ConvertActionStaticHostableTests.swift index 0c2c0498b1..be300dc869 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionStaticHostableTests.swift +++ b/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class ConvertActionStaticHostableTests: StaticHostingBaseTests { /// Creates a DocC archive and then archives it with options to produce static content which is then validated. diff --git a/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift b/Tests/CommandLineTests/ConvertActionTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift rename to Tests/CommandLineTests/ConvertActionTests.swift index a4f76bcd53..ea32665a99 100644 --- a/Tests/SwiftDocCUtilitiesTests/ConvertActionTests.swift +++ b/Tests/CommandLineTests/ConvertActionTests.swift @@ -11,10 +11,10 @@ import XCTest import Foundation @testable @_spi(ExternalLinks) import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import SymbolKit import Markdown -@testable import SwiftDocCTestUtilities +@testable import TestUtilities class ConvertActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift b/Tests/CommandLineTests/DirectoryMonitorTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift rename to Tests/CommandLineTests/DirectoryMonitorTests.swift index 555d258222..e7b5813765 100644 --- a/Tests/SwiftDocCUtilitiesTests/DirectoryMonitorTests.swift +++ b/Tests/CommandLineTests/DirectoryMonitorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine #if !os(Linux) && !os(Android) && !os(Windows) && !os(FreeBSD) fileprivate extension NSNotification.Name { diff --git a/Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift b/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift rename to Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift index 4a07a85ae4..60fc7d3339 100644 --- a/Tests/SwiftDocCUtilitiesTests/EmitGeneratedCurationsActionTests.swift +++ b/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2024 Apple Inc. and the Swift project authors + Copyright (c) 2024-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,8 +10,8 @@ import XCTest import Foundation -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class EmitGeneratedCurationsActionTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/FolderStructure.swift b/Tests/CommandLineTests/FolderStructure.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/FolderStructure.swift rename to Tests/CommandLineTests/FolderStructure.swift index 95a36997ae..4d8f649b5b 100644 --- a/Tests/SwiftDocCUtilitiesTests/FolderStructure.swift +++ b/Tests/CommandLineTests/FolderStructure.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,9 +9,9 @@ */ @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import XCTest -public import SwiftDocCTestUtilities +public import TestUtilities /* This file contains a test helper API for working with folder hierarchies, with the ability to: diff --git a/Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift b/Tests/CommandLineTests/FolderStructureTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift rename to Tests/CommandLineTests/FolderStructureTests.swift index 148da86252..e809a9cd71 100644 --- a/Tests/SwiftDocCUtilitiesTests/FolderStructureTests.swift +++ b/Tests/CommandLineTests/FolderStructureTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities class FolderStructureTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift b/Tests/CommandLineTests/HTMLTemplateDirectory.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift rename to Tests/CommandLineTests/HTMLTemplateDirectory.swift index e3f25527c0..f378ac0fa2 100644 --- a/Tests/SwiftDocCUtilitiesTests/HTMLTemplateDirectory.swift +++ b/Tests/CommandLineTests/HTMLTemplateDirectory.swift @@ -9,7 +9,7 @@ */ import Foundation -import SwiftDocCTestUtilities +import TestUtilities /// A folder that represents a fake html-build directory for testing. extension Folder { diff --git a/Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift b/Tests/CommandLineTests/IndexActionTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift rename to Tests/CommandLineTests/IndexActionTests.swift index d118aa6593..76414e35d4 100644 --- a/Tests/SwiftDocCUtilitiesTests/IndexActionTests.swift +++ b/Tests/CommandLineTests/IndexActionTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,9 +11,9 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine import Markdown -import SwiftDocCTestUtilities +import TestUtilities class IndexActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift b/Tests/CommandLineTests/Init/InitActionTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift rename to Tests/CommandLineTests/Init/InitActionTests.swift index b0cb85e9cc..acb5a22333 100644 --- a/Tests/SwiftDocCUtilitiesTests/Init/InitActionTests.swift +++ b/Tests/CommandLineTests/Init/InitActionTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2024 Apple Inc. and the Swift project authors + Copyright (c) 2024-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,8 +10,8 @@ import XCTest import Foundation -import SwiftDocCTestUtilities -@testable import SwiftDocCUtilities +import TestUtilities +@testable import CommandLine final class InitActionTests: XCTestCase { private let documentationTitle = "MyTestDocumentation" diff --git a/Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift b/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift similarity index 95% rename from Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift rename to Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift index 4f31b23adf..156c1ae626 100644 --- a/Tests/SwiftDocCUtilitiesTests/JSONEncodingRenderNodeWriterTests.swift +++ b/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import SwiftDocCUtilities +@testable import CommandLine class JSONEncodingRenderNodeWriterTests: XCTestCase { /// Verifies that if we fail during writing a JSON file the execution diff --git a/Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift b/Tests/CommandLineTests/MergeActionTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift rename to Tests/CommandLineTests/MergeActionTests.swift index 88acc2a5c2..6dd906bd3f 100644 --- a/Tests/SwiftDocCUtilitiesTests/MergeActionTests.swift +++ b/Tests/CommandLineTests/MergeActionTests.swift @@ -10,8 +10,8 @@ import XCTest @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class MergeActionTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift b/Tests/CommandLineTests/PlatformArgumentParserTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift rename to Tests/CommandLineTests/PlatformArgumentParserTests.swift index 5a2386ef89..f3b54898a9 100644 --- a/Tests/SwiftDocCUtilitiesTests/PlatformArgumentParserTests.swift +++ b/Tests/CommandLineTests/PlatformArgumentParserTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -12,7 +12,7 @@ import Foundation import SwiftDocC import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class PlatformArgumentParserTests: XCTestCase { let correctInputs: [[String]] = [ diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift b/Tests/CommandLineTests/PreviewActionIntegrationTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift rename to Tests/CommandLineTests/PreviewActionIntegrationTests.swift index bc23ac7575..1493a3cb29 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewActionIntegrationTests.swift +++ b/Tests/CommandLineTests/PreviewActionIntegrationTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import XCTest @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class PreviewActionIntegrationTests: XCTestCase { private func createMinimalDocsBundle() -> Folder { diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift index 95878b0e7f..ac2267f053 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/PreviewHTTPHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift similarity index 96% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift index 634ba02b9e..3bbbbd973f 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift index 552b51e715..7a601f26d1 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift @@ -11,7 +11,7 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift rename to Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift index 9d4fefa8e2..c08e0d2887 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities import NIO import NIOHTTP1 diff --git a/Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift b/Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift rename to Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift index 14f60ed6a4..9f48813df5 100644 --- a/Tests/SwiftDocCUtilitiesTests/PreviewServer/ServerTestUtils.swift +++ b/Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -13,7 +13,7 @@ import Foundation import NIO import NIOHTTP1 import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine /// Makes a request head part with the given URI and headers. func makeRequestHead(uri: String, headers: [(String, String)]? = nil) -> HTTPRequestHead { diff --git a/Tests/SwiftDocCUtilitiesTests/ProblemTests.swift b/Tests/CommandLineTests/ProblemTests.swift similarity index 89% rename from Tests/SwiftDocCUtilitiesTests/ProblemTests.swift rename to Tests/CommandLineTests/ProblemTests.swift index f5f18a41be..196fe92d20 100644 --- a/Tests/SwiftDocCUtilitiesTests/ProblemTests.swift +++ b/Tests/CommandLineTests/ProblemTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCUtilities +import CommandLine @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift b/Tests/CommandLineTests/SemanticAnalyzerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift rename to Tests/CommandLineTests/SemanticAnalyzerTests.swift index 034b935152..bdff305818 100644 --- a/Tests/SwiftDocCUtilitiesTests/SemanticAnalyzerTests.swift +++ b/Tests/CommandLineTests/SemanticAnalyzerTests.swift @@ -11,8 +11,8 @@ import XCTest import Markdown @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class SemanticAnalyzerTests: XCTestCase { private let catalogHierarchy = Folder(name: "SemanticAnalyzerTests.docc", content: [ diff --git a/Tests/SwiftDocCUtilitiesTests/ShadowFileManagerTemporaryDirectory.swift b/Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/ShadowFileManagerTemporaryDirectory.swift rename to Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift diff --git a/Tests/SwiftDocCUtilitiesTests/SignalTests.swift b/Tests/CommandLineTests/SignalTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/SignalTests.swift rename to Tests/CommandLineTests/SignalTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift b/Tests/CommandLineTests/StaticHostableTransformerTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift rename to Tests/CommandLineTests/StaticHostableTransformerTests.swift index 0fa8c102e6..a1d17aec07 100644 --- a/Tests/SwiftDocCUtilitiesTests/StaticHostableTransformerTests.swift +++ b/Tests/CommandLineTests/StaticHostableTransformerTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class StaticHostableTransformerTests: StaticHostingBaseTests { diff --git a/Tests/SwiftDocCUtilitiesTests/StaticHostingBaseTest.swift b/Tests/CommandLineTests/StaticHostingBaseTest.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/StaticHostingBaseTest.swift rename to Tests/CommandLineTests/StaticHostingBaseTest.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png b/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png rename to Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json b/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json rename to Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json b/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json rename to Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist b/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist rename to Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist diff --git a/Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/article.md b/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Bundles/SingleArticleTestBundle.docc/article.md rename to Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/DeckKit-Objective-C.symbols.json b/Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/DeckKit-Objective-C.symbols.json rename to Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/Overview.tutorial b/Tests/CommandLineTests/Test Resources/Overview.tutorial similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/Overview.tutorial rename to Tests/CommandLineTests/Test Resources/Overview.tutorial diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/Test Template/index.html b/Tests/CommandLineTests/Test Resources/Test Template/index.html similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/Test Template/index.html rename to Tests/CommandLineTests/Test Resources/Test Template/index.html diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/TopLevelCuration.symbols.json b/Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/TopLevelCuration.symbols.json rename to Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/UncuratedArticle.md b/Tests/CommandLineTests/Test Resources/UncuratedArticle.md similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/UncuratedArticle.md rename to Tests/CommandLineTests/Test Resources/UncuratedArticle.md diff --git a/Tests/SwiftDocCUtilitiesTests/Test Resources/image.png b/Tests/CommandLineTests/Test Resources/image.png similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Test Resources/image.png rename to Tests/CommandLineTests/Test Resources/image.png diff --git a/Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift b/Tests/CommandLineTests/ThrottleTests.swift similarity index 92% rename from Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift rename to Tests/CommandLineTests/ThrottleTests.swift index 699822810d..5a1fb7cdfa 100644 --- a/Tests/SwiftDocCUtilitiesTests/ThrottleTests.swift +++ b/Tests/CommandLineTests/ThrottleTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class ThrottleTests: XCTestCase { func testThrottlingSingleCall() throws { diff --git a/Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift b/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift rename to Tests/CommandLineTests/TransformForStaticHostingActionTests.swift index 912e5824a7..7b1e3b59eb 100644 --- a/Tests/SwiftDocCUtilitiesTests/TransformForStaticHostingActionTests.swift +++ b/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import SwiftDocCUtilities -import SwiftDocCTestUtilities +@testable import CommandLine +import TestUtilities class TransformForStaticHostingActionTests: StaticHostingBaseTests { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/DirectedGraphTests.swift b/Tests/CommandLineTests/Utility/DirectedGraphTests.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Utility/DirectedGraphTests.swift rename to Tests/CommandLineTests/Utility/DirectedGraphTests.swift diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift b/Tests/CommandLineTests/Utility/FileTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift rename to Tests/CommandLineTests/Utility/FileTests.swift index cfabe527a4..0165dcf716 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/FileTests.swift +++ b/Tests/CommandLineTests/Utility/FileTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities class FileTests: XCTestCase { func testAbsoluteURL() { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift b/Tests/CommandLineTests/Utility/LogHandleTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift rename to Tests/CommandLineTests/Utility/LogHandleTests.swift index c7bdb5afb9..489f0f91b5 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/LogHandleTests.swift +++ b/Tests/CommandLineTests/Utility/LogHandleTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine @testable import SwiftDocC class LogHandleTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift b/Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift similarity index 94% rename from Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift rename to Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift index 865ffca714..4de534089d 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/Sequence+UniqueTests.swift +++ b/Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,7 @@ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class Sequence_UniqueTests: XCTestCase { func testEmpty() { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift b/Tests/CommandLineTests/Utility/TestFileSystemTests.swift similarity index 99% rename from Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift rename to Tests/CommandLineTests/Utility/TestFileSystemTests.swift index fd3eb71489..85eec4dc38 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/TestFileSystemTests.swift +++ b/Tests/CommandLineTests/Utility/TestFileSystemTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import SwiftDocCTestUtilities +@testable import TestUtilities class TestFileSystemTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift b/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift similarity index 90% rename from Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift rename to Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift index d693826f6b..75c20a70ae 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/URL+IsAbsoluteWebURLTests.swift +++ b/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift @@ -1,14 +1,14 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2022 Apple Inc. and the Swift project authors + Copyright (c) 2022-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information See https://swift.org/CONTRIBUTORS.txt for Swift project authors */ -@testable import SwiftDocCUtilities +@testable import CommandLine import XCTest class URL_IsAbsoluteWebURLTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift b/Tests/CommandLineTests/Utility/URL+RelativeTests.swift similarity index 97% rename from Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift rename to Tests/CommandLineTests/Utility/URL+RelativeTests.swift index 9aea0848a8..d832546cbd 100644 --- a/Tests/SwiftDocCUtilitiesTests/Utility/URL+RelativeTests.swift +++ b/Tests/CommandLineTests/Utility/URL+RelativeTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -9,7 +9,7 @@ */ import XCTest -@testable import SwiftDocCUtilities +@testable import CommandLine class URL_RelativeTests: XCTestCase { diff --git a/Tests/SwiftDocCUtilitiesTests/Utility/XCTestCase+enableFeatureFlag.swift b/Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift similarity index 100% rename from Tests/SwiftDocCUtilitiesTests/Utility/XCTestCase+enableFeatureFlag.swift rename to Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift diff --git a/Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift b/Tests/CommandLineTests/XCTestCase+LoadingData.swift similarity index 98% rename from Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift rename to Tests/CommandLineTests/XCTestCase+LoadingData.swift index cc50e4ca1f..2a6c26b7a1 100644 --- a/Tests/SwiftDocCUtilitiesTests/XCTestCase+LoadingData.swift +++ b/Tests/CommandLineTests/XCTestCase+LoadingData.swift @@ -11,7 +11,7 @@ import Foundation import XCTest import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities extension XCTestCase { /// Loads a documentation catalog from an in-memory test file system. diff --git a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift index 1073bc693e..20f219b6f2 100644 --- a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift +++ b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class NonInclusiveLanguageCheckerTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift index 8cfbad65db..b92fdff6c4 100644 --- a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift +++ b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift @@ -10,7 +10,7 @@ import Foundation import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import XCTest // THIS SHOULD BE REMOVED, RIGHT?! diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift index 6943f58bc6..e5042b0536 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2024 Apple Inc. and the Swift project authors + Copyright (c) 2024-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DiagnosticConsoleWriterDefaultFormattingTest: XCTestCase { diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift index f22e888977..fd94e38c82 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SwiftDocC import Markdown @testable import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class DiagnosticTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift index a46afb677e..9df8b1e100 100644 --- a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift +++ b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class ConvertServiceTests: XCTestCase { private let testBundleInfo = DocumentationBundle.Info( diff --git a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift index 1d5ed2b1cc..9335fe2bd4 100644 --- a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ExternalRenderNodeTests: XCTestCase { private func generateExternalResolver() -> TestMultiResultExternalReferenceResolver { diff --git a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift index 16c63bede5..6f62a77450 100644 --- a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities typealias Node = NavigatorTree.Node typealias PageType = NavigatorIndex.PageType diff --git a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift index d2682c360d..8f748d2cdf 100644 --- a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC diff --git a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift index f45a2d7119..e60f677da9 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutoCapitalizationTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift index d214b77338..2f8df44a62 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutomaticCurationTests: XCTestCase { private let (availableExtensionSymbolKinds, availableNonExtensionSymbolKinds) = Set(AutomaticCuration.groupKindOrder).union(SymbolGraph.Symbol.KindIdentifier.allCases) diff --git a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift index 323fe5a2c5..b0493e744c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class BundleDiscoveryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift index 9523dc0966..b068787d18 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DocumentationContext_RootPageTests: XCTestCase { func testArticleOnlyCatalogWithExplicitTechnologyRoot() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift index e788f1b192..c037afb9a4 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities func diffDescription(lhs: String, rhs: String) -> String { let leftLines = lhs.components(separatedBy: .newlines) diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift index cab832ec10..ce1ab9ce2b 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift @@ -13,7 +13,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown class DocumentationCuratorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift index 0d0bab01b5..adc94f2251 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift @@ -12,7 +12,7 @@ import XCTest import Markdown import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ExternalPathHierarchyResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift index 803868d2ad..3101ec444c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift @@ -12,7 +12,7 @@ import XCTest @_spi(ExternalLinks) @testable import SwiftDocC import Markdown import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class ExternalReferenceResolverTests: XCTestCase { class TestExternalReferenceResolver: ExternalDocumentationSource { diff --git a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift index 2d6edd7e57..2bd1f21ceb 100644 --- a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC class DocumentationInputsProviderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift index 4a34e693ca..28bc0caa6f 100644 --- a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class NodeTagsTests: XCTestCase { func testSPIMetadata() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift index c7c54f5495..305bc6dc9a 100644 --- a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown class PathHierarchyTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift index 84e39551d5..5ee3c9ff1d 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class SnippetResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift index 39ad7e8482..6d235652bf 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolGraphLoaderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift index 49d4985b93..6384fda46e 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolReferenceTests: XCTestCase { func testUsesIdentifierForUnresolvedSymbols() { diff --git a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift index 5ac4655d92..029fe68c33 100644 --- a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift +++ b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class LinkDestinationSummaryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift index c63d951a60..93f560e259 100644 --- a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift +++ b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class LineHighlighterTests: XCTestCase { static let bundleID: DocumentationBundle.Identifier = "org.swift.docc.LineHighlighterTests" diff --git a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift index 912ac6fdb3..eb9b2d5fd4 100644 --- a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift +++ b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift @@ -13,7 +13,7 @@ import XCTest import Markdown @testable import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class ParametersAndReturnValidatorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift index 2a5ddab8bf..2e9869da7a 100644 --- a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift +++ b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit import Foundation @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class PropertyListPossibleValuesSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift index d3a3fc2446..225e5cccc0 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift @@ -11,7 +11,7 @@ import Foundation @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities import XCTest class SemaToRenderNodeMixedLanguageTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift index 73b4a508ed..f6a309beed 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift @@ -12,7 +12,7 @@ import Markdown import XCTest import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class SemaToRenderNodeTests: XCTestCase { func testCompileTutorial() async throws { diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift index a4640f8b2f..4140da55ed 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities // This tests the deprecated V1 implementation of `OutOfProcessReferenceResolver`. // Deprecating the test silences the deprecation warning when running the tests. It doesn't skip the test. diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift index e4e42b500a..d6ce70ddb7 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities #if os(macOS) class OutOfProcessReferenceResolverV2Tests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift index 4c264ec3e7..dd44559f63 100644 --- a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift +++ b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class AutomaticSeeAlsoTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift index 19bd1673ac..0350f4cad2 100644 --- a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit fileprivate let jsonDecoder = JSONDecoder() diff --git a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift index 24e21475fa..847872ed85 100644 --- a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit class DeclarationsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift index 200fd3073b..37a9ab94f9 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DefaultAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift index 002f93d25a..176f776c4e 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class DefaultCodeBlockSyntaxTests: XCTestCase { func testCodeBlockWithoutAnyLanguageOrDefault() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift index 778e190577..35f3515ac4 100644 --- a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class HeadingAnchorTests: XCTestCase { func testEncodeHeadingAnchor() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift index 15b8c44978..1c13a18678 100644 --- a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021-2024 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -11,7 +11,7 @@ import Foundation import XCTest @testable public import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class PlistSymbolTests: XCTestCase { private let plistSymbolURL = Bundle.module.url( diff --git a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift index a4790d4d28..90137262f7 100644 --- a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import SymbolKit -import SwiftDocCTestUtilities +import TestUtilities class PropertyListDetailsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift index 9de46ea5c3..ca982b3f6b 100644 --- a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit fileprivate extension [RenderBlockContent] { diff --git a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift index 29b3728990..0349b25ec7 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift @@ -11,7 +11,7 @@ import Foundation import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import XCTest typealias Position = RenderBlockContent.CodeBlockOptions.Position diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift index 1cb095f54a..0aa591d6fa 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift @@ -13,7 +13,7 @@ import XCTest import SymbolKit import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class RenderNodeTranslatorSymbolVariantsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift index be2a95ea56..e9b1bdaff1 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities import Markdown import SymbolKit diff --git a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift index c3ea5e5ab5..d70241cba9 100644 --- a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class SymbolAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/TermListTests.swift b/Tests/SwiftDocCTests/Rendering/TermListTests.swift index d5e496456c..c2c1696b82 100644 --- a/Tests/SwiftDocCTests/Rendering/TermListTests.swift +++ b/Tests/SwiftDocCTests/Rendering/TermListTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import Markdown @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities class TermListTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift index 856a3908be..4a489dc12a 100644 --- a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift @@ -11,7 +11,7 @@ import XCTest @testable @preconcurrency import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit class ArticleSymbolMentionsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift index 7be45b6176..1587ad1c54 100644 --- a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class ChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift index 9832537c9e..9aa4cca0ad 100644 --- a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift +++ b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities @testable import SymbolKit class DoxygenTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift index 97f3b48ab2..16cfa20232 100644 --- a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class MarkupReferenceResolverTests: XCTestCase { func testArbitraryReferenceInComment() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift index 042cad6bd8..4664829965 100644 --- a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class MultipleChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StackTests.swift b/Tests/SwiftDocCTests/Semantics/StackTests.swift index 721db9aa3f..6f7275889a 100644 --- a/Tests/SwiftDocCTests/Semantics/StackTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StackTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class StackTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StepTests.swift b/Tests/SwiftDocCTests/Semantics/StepTests.swift index d8a1b576df..3f66fbbfcb 100644 --- a/Tests/SwiftDocCTests/Semantics/StepTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StepTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class StepTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift index 063c8c997d..4798c6e78d 100644 --- a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift +++ b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class SymbolTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift index 086f0a7488..de064d8895 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class TutorialArticleTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift index 33683991a4..767ed5f706 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class TutorialTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift index 3fb78b1444..99708fd1c1 100644 --- a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class VideoMediaTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift index 827ab38f7d..2b5c258899 100644 --- a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities class VolumeTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Utility/LMDBTests.swift b/Tests/SwiftDocCTests/Utility/LMDBTests.swift index dd50b29604..06a6c514b5 100644 --- a/Tests/SwiftDocCTests/Utility/LMDBTests.swift +++ b/Tests/SwiftDocCTests/Utility/LMDBTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC -import SwiftDocCTestUtilities +import TestUtilities final class SwiftLMDBTests: XCTestCase { var environment: LMDB.Environment! diff --git a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift index 8639fd62a8..ceb47c7213 100644 --- a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift +++ b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import SwiftDocCTestUtilities +import TestUtilities @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift index a7306396b9..939e79c82a 100644 --- a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift +++ b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift @@ -10,7 +10,7 @@ @testable import SwiftDocC import XCTest -import SwiftDocCTestUtilities +import TestUtilities import SymbolKit extension XCTestCase { diff --git a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift index 4103f4f92b..203311214a 100644 --- a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift +++ b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import Markdown -import SwiftDocCTestUtilities +import TestUtilities extension XCTestCase { diff --git a/Tests/signal-test-app/main.swift b/Tests/signal-test-app/main.swift index 2973ef3d69..4a96e6eb9f 100644 --- a/Tests/signal-test-app/main.swift +++ b/Tests/signal-test-app/main.swift @@ -1,7 +1,7 @@ /* This source file is part of the Swift.org open source project - Copyright (c) 2021 Apple Inc. and the Swift project authors + Copyright (c) 2021-2025 Apple Inc. and the Swift project authors Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information @@ -10,13 +10,13 @@ // // Trap signals and exit with a predefined error code. -// Check Tests/SwiftDocCUtilitiesTests/SignalTests.swift for more details. +// Check Tests/CommandLineTests/SignalTests.swift for more details. // #if os(macOS) || os(Linux) || os(Android) import Foundation -import SwiftDocCUtilities +import CommandLine Signal.on(Signal.all) { _ in print("Signal test app exiting.") diff --git a/bin/check-source b/bin/check-source index 7ab7fa1de5..b72b7a4c41 100755 --- a/bin/check-source +++ b/bin/check-source @@ -48,7 +48,7 @@ for language in swift-or-c bash md-or-tutorial html docker; do reader=head case "$language" in swift-or-c) - exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/SwiftDocCUtilitiesTests/Test Bundles/*") + exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/CommandLineTests/Test Bundles/*") matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' ) cat > "$tmp" <<"EOF" /* diff --git a/bin/preview-docs b/bin/preview-docs index f988b5548f..1faa752bdf 100755 --- a/bin/preview-docs +++ b/bin/preview-docs @@ -2,7 +2,7 @@ # # This source file is part of the Swift.org open source project # -# Copyright (c) 2021 Apple Inc. and the Swift project authors +# Copyright (c) 2021-2025 Apple Inc. and the Swift project authors # Licensed under Apache License v2.0 with Runtime Library Exception # # See https://swift.org/LICENSE.txt for license information @@ -28,7 +28,7 @@ while test $# -gt 0; do case "$1" in --help) echo - echo "Usage: $(basename $0) [SwiftDocC|SwiftDocCUtilities|DocC] [-h] [--convert-only]" + echo "Usage: $(basename $0) [SwiftDocC|CommandLine|DocC] [-h] [--convert-only]" echo "Builds the given framework and converts or previews the documentation" echo "Note: To preview you must set the \`DOCC_HTML_DIR\` with a path to a documentation template. @@ -80,27 +80,27 @@ case $FRAMEWORK in --output-path "$DOCS_BUILD_DIR" ;; - "SwiftDocCUtilities") + "CommandLine") - # Generate symbol graph files for SwiftDocCUtilities + # Generate symbol graph files for CommandLine swift build --package-path "$DOCC_ROOT" \ - --target SwiftDocCUtilities \ + --target CommandLine \ -Xswiftc -emit-symbol-graph \ -Xswiftc -emit-symbol-graph-dir -Xswiftc "$SGFS_DIR" echo # Delete the symbol graph files from dependences by looking for - # those without a 'SwiftDocCUtilities' prefix. - find "$SGFS_DIR" -type f ! -name 'SwiftDocCUtilities*' -delete + # those without a 'CommandLine' prefix. + find "$SGFS_DIR" -type f ! -name 'CommandLine*' -delete echo # Compile the documentation and the symbol graph data. - swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/SwiftDocCUtilities/SwiftDocCUtilities.docc" \ + swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/CommandLine/CommandLine.docc" \ --experimental-enable-custom-templates \ - --fallback-display-name SwiftDocCUtilities \ - --fallback-bundle-identifier org.swift.SwiftDocCUtilities \ + --fallback-display-name CommandLine \ + --fallback-bundle-identifier org.swift.CommandLine \ --fallback-bundle-version 1.0.0 \ --additional-symbol-graph-dir "$SGFS_DIR" \ --output-path $DOCS_BUILD_DIR @@ -116,7 +116,7 @@ case $FRAMEWORK in *) echo - echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, SwiftDocCUtilities, or DocC." + echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, CommandLine, or DocC." exit 0 ;; esac diff --git a/bin/update-gh-pages-documentation-site b/bin/update-gh-pages-documentation-site index c1469ed8ae..41b8e41341 100755 --- a/bin/update-gh-pages-documentation-site +++ b/bin/update-gh-pages-documentation-site @@ -2,7 +2,7 @@ # # This source file is part of the Swift.org open source project # -# Copyright (c) 2022-2024 Apple Inc. and the Swift project authors +# Copyright (c) 2022-2025 Apple Inc. and the Swift project authors # Licensed under Apache License v2.0 with Runtime Library Exception # # See https://swift.org/LICENSE.txt for license information @@ -27,9 +27,9 @@ SWIFT_DOCC_ROOT="$(dirname $(dirname $(filepath $0)))" DOCC_BUILD_DIR="$SWIFT_DOCC_ROOT"/.build/docc-gh-pages-build DOCC_OUTPUT_DIR="$DOCC_BUILD_DIR"/SwiftDocC.doccarchive -DOCC_UTILITIES_OUTPUT_DIR="$DOCC_BUILD_DIR"/SwiftDocCUtilities.doccarchive +COMMAND_LINE_OUTPUT_DIR="$DOCC_BUILD_DIR"/CommandLine.doccarchive -mkdir -p "$DOCC_UTILITIES_OUTPUT_DIR" +mkdir -p "$COMMAND_LINE_OUTPUT_DIR" # Set current directory to the repository root cd "$SWIFT_DOCC_ROOT" @@ -58,31 +58,31 @@ swift package \ --hosting-base-path swift-docc \ --output-path "$DOCC_OUTPUT_DIR" -echo -e "\033[34;1m Building SwiftDocC Utilities docs at $DOCC_UTILITIES_OUTPUT_DIR \033[0m" +echo -e "\033[34;1m Building SwiftDocC Utilities docs at $COMMAND_LINE_OUTPUT_DIR \033[0m" -# Generate documentation for the 'SwiftDocCUtilities' target and output it +# Generate documentation for the 'CommandLine' target and output it # to a temporary output directory in the .build directory. swift package \ --allow-writing-to-directory "$DOCC_BUILD_DIR" \ generate-documentation \ - --target SwiftDocCUtilities \ + --target CommandLine \ --disable-indexing \ --source-service github \ --source-service-base-url https://github.com/swiftlang/swift-docc/blob/main \ --checkout-path "$SWIFT_DOCC_ROOT" \ --transform-for-static-hosting \ --hosting-base-path swift-docc \ - --output-path "$DOCC_UTILITIES_OUTPUT_DIR" + --output-path "$COMMAND_LINE_OUTPUT_DIR" echo -e "\033[34;1m Merging docs \033q[0m" # Remove the output directory so that the merge command can output there rm -rf "$SWIFT_DOCC_ROOT/gh-pages/docs" -# Merge the SwiftDocCUtilities docs into the primary SwiftDocC docs +# Merge the CommandLine docs into the primary SwiftDocC docs swift run docc merge \ "$DOCC_OUTPUT_DIR" \ - "$DOCC_UTILITIES_OUTPUT_DIR" \ + "$COMMAND_LINE_OUTPUT_DIR" \ --output-path "$SWIFT_DOCC_ROOT/gh-pages/docs" # Save the current commit we've just built documentation from in a variable From 7fb1ccba71969335965bbbdfd1670da748f266f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6nnqvist?= Date: Tue, 11 Nov 2025 10:22:43 +0100 Subject: [PATCH 2/5] Move CMake file into target source directory --- Sources/{SwiftDocCUtilities => CommandLine}/CMakeLists.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Sources/{SwiftDocCUtilities => CommandLine}/CMakeLists.txt (100%) diff --git a/Sources/SwiftDocCUtilities/CMakeLists.txt b/Sources/CommandLine/CMakeLists.txt similarity index 100% rename from Sources/SwiftDocCUtilities/CMakeLists.txt rename to Sources/CommandLine/CMakeLists.txt From 1047d1d625c60f0b25875ff4bbcbc356fbf2e19f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6nnqvist?= Date: Tue, 11 Nov 2025 10:27:19 +0100 Subject: [PATCH 3/5] Rename TestUtilities target to TestHelpers --- Package.swift | 6 +++--- .../{TestUtilities => TestHelpers}/FilesAndFolders.swift | 0 .../SymbolGraphCreation.swift | 0 Sources/{TestUtilities => TestHelpers}/TestFileSystem.swift | 0 .../XCTestCase+TemporaryDirectory.swift | 0 .../ConvertSubcommandSourceRepositoryTests.swift | 2 +- .../ArgumentParsing/ConvertSubcommandTests.swift | 2 +- .../ArgumentParsing/MergeSubcommandTests.swift | 2 +- .../CommandLineTests/ConvertActionStaticHostableTests.swift | 2 +- Tests/CommandLineTests/ConvertActionTests.swift | 2 +- .../EmitGeneratedCurationsActionTests.swift | 2 +- Tests/CommandLineTests/FolderStructure.swift | 2 +- Tests/CommandLineTests/FolderStructureTests.swift | 2 +- Tests/CommandLineTests/HTMLTemplateDirectory.swift | 2 +- Tests/CommandLineTests/IndexActionTests.swift | 2 +- Tests/CommandLineTests/Init/InitActionTests.swift | 2 +- Tests/CommandLineTests/MergeActionTests.swift | 2 +- Tests/CommandLineTests/PreviewActionIntegrationTests.swift | 2 +- .../PreviewServer/PreviewHTTPHandlerTests.swift | 2 +- .../RequestHandler/DefaultRequestHandlerTests.swift | 2 +- .../RequestHandler/FileRequestHandlerTests.swift | 2 +- Tests/CommandLineTests/SemanticAnalyzerTests.swift | 2 +- Tests/CommandLineTests/StaticHostableTransformerTests.swift | 2 +- .../TransformForStaticHostingActionTests.swift | 2 +- Tests/CommandLineTests/Utility/FileTests.swift | 2 +- Tests/CommandLineTests/Utility/TestFileSystemTests.swift | 2 +- Tests/CommandLineTests/XCTestCase+LoadingData.swift | 2 +- .../Checker/Checkers/NonInclusiveLanguageCheckerTests.swift | 2 +- .../DeprecatedDiagnosticsDigestWarningTests.swift | 2 +- .../DiagnosticConsoleWriterDefaultFormattingTest.swift | 2 +- Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift | 2 +- .../ConvertService/ConvertServiceTests.swift | 2 +- Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift | 2 +- Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift | 2 +- Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift | 2 +- .../Infrastructure/AutoCapitalizationTests.swift | 2 +- .../Infrastructure/AutomaticCurationTests.swift | 2 +- .../Infrastructure/BundleDiscoveryTests.swift | 2 +- .../DocumentationContext+RootPageTests.swift | 2 +- .../DocumentationContext/DocumentationContextTests.swift | 2 +- .../Infrastructure/DocumentationCuratorTests.swift | 2 +- .../Infrastructure/ExternalPathHierarchyResolverTests.swift | 2 +- .../Infrastructure/ExternalReferenceResolverTests.swift | 2 +- .../Input Discovery/DocumentationInputsProviderTests.swift | 2 +- Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift | 2 +- .../SwiftDocCTests/Infrastructure/PathHierarchyTests.swift | 2 +- .../Infrastructure/SnippetResolverTests.swift | 2 +- .../Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift | 2 +- .../Infrastructure/SymbolReferenceTests.swift | 2 +- .../LinkTargets/LinkDestinationSummaryTests.swift | 2 +- Tests/SwiftDocCTests/Model/LineHighlighterTests.swift | 2 +- .../Model/ParametersAndReturnValidatorTests.swift | 2 +- .../Model/PropertyListPossibleValuesSectionTests.swift | 2 +- .../Model/SemaToRenderNodeMultiLanguageTests.swift | 2 +- Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift | 2 +- .../OutOfProcessReferenceResolverV1Tests.swift | 2 +- .../OutOfProcessReferenceResolverV2Tests.swift | 2 +- Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift | 2 +- .../Rendering/ConstraintsRenderSectionTests.swift | 2 +- .../Rendering/DeclarationsRenderSectionTests.swift | 2 +- .../SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift | 2 +- .../Rendering/DefaultCodeListingSyntaxTests.swift | 2 +- Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift | 2 +- Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift | 2 +- .../Rendering/PropertyListDetailsRenderSectionTests.swift | 2 +- Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift | 2 +- .../Rendering/RenderContentCompilerTests.swift | 2 +- .../Rendering/RenderNodeTranslatorSymbolVariantsTests.swift | 2 +- .../Rendering/RenderNodeTranslatorTests.swift | 2 +- .../SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift | 2 +- Tests/SwiftDocCTests/Rendering/TermListTests.swift | 2 +- .../Semantics/ArticleSymbolMentionsTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/ChoiceTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/DoxygenTests.swift | 2 +- .../Semantics/MarkupReferenceResolverTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/StackTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/StepTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/SymbolTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/TutorialTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/VolumeTests.swift | 2 +- Tests/SwiftDocCTests/Utility/LMDBTests.swift | 2 +- Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift | 2 +- Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift | 2 +- Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift | 2 +- 87 files changed, 85 insertions(+), 85 deletions(-) rename Sources/{TestUtilities => TestHelpers}/FilesAndFolders.swift (100%) rename Sources/{TestUtilities => TestHelpers}/SymbolGraphCreation.swift (100%) rename Sources/{TestUtilities => TestHelpers}/TestFileSystem.swift (100%) rename Sources/{TestUtilities => TestHelpers}/XCTestCase+TemporaryDirectory.swift (100%) diff --git a/Package.swift b/Package.swift index 544c13b596..7cfa3dd08e 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( name: "SwiftDocCTests", dependencies: [ .target(name: "SwiftDocC"), - .target(name: "TestUtilities"), + .target(name: "TestHelpers"), ], resources: [ .copy("Test Resources"), @@ -81,7 +81,7 @@ let package = Package( dependencies: [ .target(name: "CommandLine"), .target(name: "SwiftDocC"), - .target(name: "TestUtilities"), + .target(name: "TestHelpers"), ], resources: [ .copy("Test Resources"), @@ -92,7 +92,7 @@ let package = Package( // Test utility library .target( - name: "TestUtilities", + name: "TestHelpers", dependencies: [ .target(name: "SwiftDocC"), .product(name: "SymbolKit", package: "swift-docc-symbolkit"), diff --git a/Sources/TestUtilities/FilesAndFolders.swift b/Sources/TestHelpers/FilesAndFolders.swift similarity index 100% rename from Sources/TestUtilities/FilesAndFolders.swift rename to Sources/TestHelpers/FilesAndFolders.swift diff --git a/Sources/TestUtilities/SymbolGraphCreation.swift b/Sources/TestHelpers/SymbolGraphCreation.swift similarity index 100% rename from Sources/TestUtilities/SymbolGraphCreation.swift rename to Sources/TestHelpers/SymbolGraphCreation.swift diff --git a/Sources/TestUtilities/TestFileSystem.swift b/Sources/TestHelpers/TestFileSystem.swift similarity index 100% rename from Sources/TestUtilities/TestFileSystem.swift rename to Sources/TestHelpers/TestFileSystem.swift diff --git a/Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift b/Sources/TestHelpers/XCTestCase+TemporaryDirectory.swift similarity index 100% rename from Sources/TestUtilities/XCTestCase+TemporaryDirectory.swift rename to Sources/TestHelpers/XCTestCase+TemporaryDirectory.swift diff --git a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift index e77b39a535..c6ea465e7c 100644 --- a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import CommandLine @testable import SwiftDocC -import TestUtilities +import TestHelpers import ArgumentParser class ConvertSubcommandSourceRepositoryTests: XCTestCase { diff --git a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift index 69f4c7373b..916fc24d3f 100644 --- a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import CommandLine @testable import SwiftDocC -import TestUtilities +import TestHelpers class ConvertSubcommandTests: XCTestCase { private let testBundleURL = Bundle.module.url( diff --git a/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift index d073d6b34e..1b910bcb00 100644 --- a/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift +++ b/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift @@ -11,7 +11,7 @@ import XCTest import ArgumentParser @testable import CommandLine -import TestUtilities +import TestHelpers class MergeSubcommandTests: XCTestCase { func testCommandLineArgumentValidation() throws { diff --git a/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift b/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift index be300dc869..fc8ebca11f 100644 --- a/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift +++ b/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class ConvertActionStaticHostableTests: StaticHostingBaseTests { /// Creates a DocC archive and then archives it with options to produce static content which is then validated. diff --git a/Tests/CommandLineTests/ConvertActionTests.swift b/Tests/CommandLineTests/ConvertActionTests.swift index ea32665a99..2120d36b0e 100644 --- a/Tests/CommandLineTests/ConvertActionTests.swift +++ b/Tests/CommandLineTests/ConvertActionTests.swift @@ -14,7 +14,7 @@ import Foundation @testable import CommandLine import SymbolKit import Markdown -@testable import TestUtilities +@testable import TestHelpers class ConvertActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift b/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift index 60fc7d3339..85554b650a 100644 --- a/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift +++ b/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift @@ -11,7 +11,7 @@ import XCTest import Foundation @testable import CommandLine -import TestUtilities +import TestHelpers class EmitGeneratedCurationsActionTests: XCTestCase { diff --git a/Tests/CommandLineTests/FolderStructure.swift b/Tests/CommandLineTests/FolderStructure.swift index 4d8f649b5b..fa7e8bf40b 100644 --- a/Tests/CommandLineTests/FolderStructure.swift +++ b/Tests/CommandLineTests/FolderStructure.swift @@ -11,7 +11,7 @@ @testable import SwiftDocC @testable import CommandLine import XCTest -public import TestUtilities +public import TestHelpers /* This file contains a test helper API for working with folder hierarchies, with the ability to: diff --git a/Tests/CommandLineTests/FolderStructureTests.swift b/Tests/CommandLineTests/FolderStructureTests.swift index e809a9cd71..14dc10309d 100644 --- a/Tests/CommandLineTests/FolderStructureTests.swift +++ b/Tests/CommandLineTests/FolderStructureTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestUtilities +import TestHelpers class FolderStructureTests: XCTestCase { diff --git a/Tests/CommandLineTests/HTMLTemplateDirectory.swift b/Tests/CommandLineTests/HTMLTemplateDirectory.swift index f378ac0fa2..1f01427b3b 100644 --- a/Tests/CommandLineTests/HTMLTemplateDirectory.swift +++ b/Tests/CommandLineTests/HTMLTemplateDirectory.swift @@ -9,7 +9,7 @@ */ import Foundation -import TestUtilities +import TestHelpers /// A folder that represents a fake html-build directory for testing. extension Folder { diff --git a/Tests/CommandLineTests/IndexActionTests.swift b/Tests/CommandLineTests/IndexActionTests.swift index 76414e35d4..0cf9f95d85 100644 --- a/Tests/CommandLineTests/IndexActionTests.swift +++ b/Tests/CommandLineTests/IndexActionTests.swift @@ -13,7 +13,7 @@ import Foundation @testable import SwiftDocC @testable import CommandLine import Markdown -import TestUtilities +import TestHelpers class IndexActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/CommandLineTests/Init/InitActionTests.swift b/Tests/CommandLineTests/Init/InitActionTests.swift index acb5a22333..046b576ebb 100644 --- a/Tests/CommandLineTests/Init/InitActionTests.swift +++ b/Tests/CommandLineTests/Init/InitActionTests.swift @@ -10,7 +10,7 @@ import XCTest import Foundation -import TestUtilities +import TestHelpers @testable import CommandLine final class InitActionTests: XCTestCase { diff --git a/Tests/CommandLineTests/MergeActionTests.swift b/Tests/CommandLineTests/MergeActionTests.swift index 6dd906bd3f..b4b48caaa2 100644 --- a/Tests/CommandLineTests/MergeActionTests.swift +++ b/Tests/CommandLineTests/MergeActionTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class MergeActionTests: XCTestCase { diff --git a/Tests/CommandLineTests/PreviewActionIntegrationTests.swift b/Tests/CommandLineTests/PreviewActionIntegrationTests.swift index 1493a3cb29..8afa195ea1 100644 --- a/Tests/CommandLineTests/PreviewActionIntegrationTests.swift +++ b/Tests/CommandLineTests/PreviewActionIntegrationTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class PreviewActionIntegrationTests: XCTestCase { private func createMinimalDocsBundle() -> Folder { diff --git a/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift index ac2267f053..fee3882928 100644 --- a/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import CommandLine -import TestUtilities +import TestHelpers import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift index 3bbbbd973f..66f7d8bcbc 100644 --- a/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import CommandLine -import TestUtilities +import TestHelpers import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift index c08e0d2887..6ce5bfd2b7 100644 --- a/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift +++ b/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import CommandLine -import TestUtilities +import TestHelpers import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/SemanticAnalyzerTests.swift b/Tests/CommandLineTests/SemanticAnalyzerTests.swift index bdff305818..4e50199a3c 100644 --- a/Tests/CommandLineTests/SemanticAnalyzerTests.swift +++ b/Tests/CommandLineTests/SemanticAnalyzerTests.swift @@ -12,7 +12,7 @@ import XCTest import Markdown @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class SemanticAnalyzerTests: XCTestCase { private let catalogHierarchy = Folder(name: "SemanticAnalyzerTests.docc", content: [ diff --git a/Tests/CommandLineTests/StaticHostableTransformerTests.swift b/Tests/CommandLineTests/StaticHostableTransformerTests.swift index a1d17aec07..e0cce1aee5 100644 --- a/Tests/CommandLineTests/StaticHostableTransformerTests.swift +++ b/Tests/CommandLineTests/StaticHostableTransformerTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class StaticHostableTransformerTests: StaticHostingBaseTests { diff --git a/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift b/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift index 7b1e3b59eb..76abaa51fc 100644 --- a/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift +++ b/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC @testable import CommandLine -import TestUtilities +import TestHelpers class TransformForStaticHostingActionTests: StaticHostingBaseTests { diff --git a/Tests/CommandLineTests/Utility/FileTests.swift b/Tests/CommandLineTests/Utility/FileTests.swift index 0165dcf716..fe5c94d330 100644 --- a/Tests/CommandLineTests/Utility/FileTests.swift +++ b/Tests/CommandLineTests/Utility/FileTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestUtilities +import TestHelpers class FileTests: XCTestCase { func testAbsoluteURL() { diff --git a/Tests/CommandLineTests/Utility/TestFileSystemTests.swift b/Tests/CommandLineTests/Utility/TestFileSystemTests.swift index 85eec4dc38..4504f6b141 100644 --- a/Tests/CommandLineTests/Utility/TestFileSystemTests.swift +++ b/Tests/CommandLineTests/Utility/TestFileSystemTests.swift @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import TestUtilities +@testable import TestHelpers class TestFileSystemTests: XCTestCase { diff --git a/Tests/CommandLineTests/XCTestCase+LoadingData.swift b/Tests/CommandLineTests/XCTestCase+LoadingData.swift index 2a6c26b7a1..36320b1ae1 100644 --- a/Tests/CommandLineTests/XCTestCase+LoadingData.swift +++ b/Tests/CommandLineTests/XCTestCase+LoadingData.swift @@ -11,7 +11,7 @@ import Foundation import XCTest import SwiftDocC -import TestUtilities +import TestHelpers extension XCTestCase { /// Loads a documentation catalog from an in-memory test file system. diff --git a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift index 20f219b6f2..6f2045de21 100644 --- a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift +++ b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import TestUtilities +import TestHelpers class NonInclusiveLanguageCheckerTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift index b92fdff6c4..a241b99318 100644 --- a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift +++ b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift @@ -10,7 +10,7 @@ import Foundation import SwiftDocC -import TestUtilities +import TestHelpers import XCTest // THIS SHOULD BE REMOVED, RIGHT?! diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift index e5042b0536..bd9cdccba2 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import TestUtilities +import TestHelpers class DiagnosticConsoleWriterDefaultFormattingTest: XCTestCase { diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift index fd94e38c82..f6b660fff2 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SwiftDocC import Markdown @testable import SymbolKit -import TestUtilities +import TestHelpers class DiagnosticTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift index 9df8b1e100..ebef810121 100644 --- a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift +++ b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC import SymbolKit -import TestUtilities +import TestHelpers class ConvertServiceTests: XCTestCase { private let testBundleInfo = DocumentationBundle.Info( diff --git a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift index 9335fe2bd4..b5ffeafc89 100644 --- a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @_spi(ExternalLinks) @testable import SwiftDocC -import TestUtilities +import TestHelpers class ExternalRenderNodeTests: XCTestCase { private func generateExternalResolver() -> TestMultiResultExternalReferenceResolver { diff --git a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift index 6f62a77450..317bfd2513 100644 --- a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers typealias Node = NavigatorTree.Node typealias PageType = NavigatorIndex.PageType diff --git a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift index 8f748d2cdf..b73c5425d9 100644 --- a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestUtilities +import TestHelpers @testable import SwiftDocC diff --git a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift index e60f677da9..5829a7f63c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class AutoCapitalizationTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift index 2f8df44a62..879b30faf8 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class AutomaticCurationTests: XCTestCase { private let (availableExtensionSymbolKinds, availableNonExtensionSymbolKinds) = Set(AutomaticCuration.groupKindOrder).union(SymbolGraph.Symbol.KindIdentifier.allCases) diff --git a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift index b0493e744c..0fd14c2c9a 100644 --- a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers class BundleDiscoveryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift index b068787d18..6d8c6ee07d 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class DocumentationContext_RootPageTests: XCTestCase { func testArticleOnlyCatalogWithExplicitTechnologyRoot() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift index c037afb9a4..b4111b9ea0 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC import Markdown -import TestUtilities +import TestHelpers func diffDescription(lhs: String, rhs: String) -> String { let leftLines = lhs.components(separatedBy: .newlines) diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift index ce1ab9ce2b..e76e1c5a85 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift @@ -13,7 +13,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers import Markdown class DocumentationCuratorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift index adc94f2251..ea8b6ed8ce 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift @@ -12,7 +12,7 @@ import XCTest import Markdown import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC -import TestUtilities +import TestHelpers class ExternalPathHierarchyResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift index 3101ec444c..0a4177e645 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift @@ -12,7 +12,7 @@ import XCTest @_spi(ExternalLinks) @testable import SwiftDocC import Markdown import SymbolKit -import TestUtilities +import TestHelpers class ExternalReferenceResolverTests: XCTestCase { class TestExternalReferenceResolver: ExternalDocumentationSource { diff --git a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift index 2bd1f21ceb..07a9b37ae2 100644 --- a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestUtilities +import TestHelpers @testable import SwiftDocC class DocumentationInputsProviderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift index 28bc0caa6f..58798a1d6c 100644 --- a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers class NodeTagsTests: XCTestCase { func testSPIMetadata() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift index 305bc6dc9a..429d30582f 100644 --- a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers import Markdown class PathHierarchyTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift index 5ee3c9ff1d..aa86149d4a 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import SymbolKit -import TestUtilities +import TestHelpers class SnippetResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift index 6d235652bf..8390b3c459 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class SymbolGraphLoaderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift index 6384fda46e..8157bd1df6 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class SymbolReferenceTests: XCTestCase { func testUsesIdentifierForUnresolvedSymbols() { diff --git a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift index 029fe68c33..b49916b042 100644 --- a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift +++ b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class LinkDestinationSummaryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift index 93f560e259..f4d38c5ab6 100644 --- a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift +++ b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class LineHighlighterTests: XCTestCase { static let bundleID: DocumentationBundle.Identifier = "org.swift.docc.LineHighlighterTests" diff --git a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift index eb9b2d5fd4..65c59f72e8 100644 --- a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift +++ b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift @@ -13,7 +13,7 @@ import XCTest import Markdown @testable import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class ParametersAndReturnValidatorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift index 2e9869da7a..2071a15d3c 100644 --- a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift +++ b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit import Foundation @testable import SwiftDocC -import TestUtilities +import TestHelpers class PropertyListPossibleValuesSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift index 225e5cccc0..a09bfc3353 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift @@ -11,7 +11,7 @@ import Foundation @testable import SwiftDocC import SymbolKit -import TestUtilities +import TestHelpers import XCTest class SemaToRenderNodeMixedLanguageTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift index f6a309beed..47a31bea78 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift @@ -12,7 +12,7 @@ import Markdown import XCTest import SymbolKit -import TestUtilities +import TestHelpers class SemaToRenderNodeTests: XCTestCase { func testCompileTutorial() async throws { diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift index 4140da55ed..b38be41e29 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import TestUtilities +import TestHelpers // This tests the deprecated V1 implementation of `OutOfProcessReferenceResolver`. // Deprecating the test silences the deprecation warning when running the tests. It doesn't skip the test. diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift index d6ce70ddb7..de7f7b7ece 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import TestUtilities +import TestHelpers #if os(macOS) class OutOfProcessReferenceResolverV2Tests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift index dd44559f63..466901e5ff 100644 --- a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift +++ b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers class AutomaticSeeAlsoTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift index 0350f4cad2..acf4bddbe4 100644 --- a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers import SymbolKit fileprivate let jsonDecoder = JSONDecoder() diff --git a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift index 847872ed85..5c3c3df72f 100644 --- a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers import SymbolKit class DeclarationsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift index 37a9ab94f9..8e0b8faeeb 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class DefaultAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift index 176f776c4e..be3ff696ad 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers class DefaultCodeBlockSyntaxTests: XCTestCase { func testCodeBlockWithoutAnyLanguageOrDefault() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift index 35f3515ac4..1e055b5540 100644 --- a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers class HeadingAnchorTests: XCTestCase { func testEncodeHeadingAnchor() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift index 1c13a18678..8f124da99d 100644 --- a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable public import SwiftDocC -import TestUtilities +import TestHelpers class PlistSymbolTests: XCTestCase { private let plistSymbolURL = Bundle.module.url( diff --git a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift index 90137262f7..a7db56d326 100644 --- a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import SymbolKit -import TestUtilities +import TestHelpers class PropertyListDetailsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift index ca982b3f6b..c1bf0721a9 100644 --- a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers import SymbolKit fileprivate extension [RenderBlockContent] { diff --git a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift index 0349b25ec7..150c57d225 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift @@ -11,7 +11,7 @@ import Foundation import Markdown @testable import SwiftDocC -import TestUtilities +import TestHelpers import XCTest typealias Position = RenderBlockContent.CodeBlockOptions.Position diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift index 0aa591d6fa..53e9a1ff48 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift @@ -13,7 +13,7 @@ import XCTest import SymbolKit import Markdown @testable import SwiftDocC -import TestUtilities +import TestHelpers class RenderNodeTranslatorSymbolVariantsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift index e9b1bdaff1..7e08409b13 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers import Markdown import SymbolKit diff --git a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift index d70241cba9..e15fd24a7c 100644 --- a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestUtilities +import TestHelpers class SymbolAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/TermListTests.swift b/Tests/SwiftDocCTests/Rendering/TermListTests.swift index c2c1696b82..47f2ba4691 100644 --- a/Tests/SwiftDocCTests/Rendering/TermListTests.swift +++ b/Tests/SwiftDocCTests/Rendering/TermListTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import Markdown @testable import SwiftDocC -import TestUtilities +import TestHelpers class TermListTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift index 4a489dc12a..7b9e9f9bc5 100644 --- a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift @@ -11,7 +11,7 @@ import XCTest @testable @preconcurrency import SwiftDocC import Markdown -import TestUtilities +import TestHelpers import SymbolKit class ArticleSymbolMentionsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift index 1587ad1c54..dd29abe048 100644 --- a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class ChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift index 9aa4cca0ad..72c9840aa3 100644 --- a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift +++ b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers @testable import SymbolKit class DoxygenTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift index 16cfa20232..f88d3190a0 100644 --- a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class MarkupReferenceResolverTests: XCTestCase { func testArbitraryReferenceInComment() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift index 4664829965..fd5c2dc6ca 100644 --- a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class MultipleChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StackTests.swift b/Tests/SwiftDocCTests/Semantics/StackTests.swift index 6f7275889a..30790b35aa 100644 --- a/Tests/SwiftDocCTests/Semantics/StackTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StackTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class StackTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StepTests.swift b/Tests/SwiftDocCTests/Semantics/StepTests.swift index 3f66fbbfcb..78531eaf33 100644 --- a/Tests/SwiftDocCTests/Semantics/StepTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StepTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class StepTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift index 4798c6e78d..c7dcac396c 100644 --- a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift +++ b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class SymbolTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift index de064d8895..dd625e618c 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class TutorialArticleTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift index 767ed5f706..e91e3b6731 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class TutorialTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift index 99708fd1c1..3e0508e695 100644 --- a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class VideoMediaTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift index 2b5c258899..22d23ec814 100644 --- a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers class VolumeTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Utility/LMDBTests.swift b/Tests/SwiftDocCTests/Utility/LMDBTests.swift index 06a6c514b5..6809340a93 100644 --- a/Tests/SwiftDocCTests/Utility/LMDBTests.swift +++ b/Tests/SwiftDocCTests/Utility/LMDBTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC -import TestUtilities +import TestHelpers final class SwiftLMDBTests: XCTestCase { var environment: LMDB.Environment! diff --git a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift index ceb47c7213..9da247a4e5 100644 --- a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift +++ b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestUtilities +import TestHelpers @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift index 939e79c82a..9cb1ac6660 100644 --- a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift +++ b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift @@ -10,7 +10,7 @@ @testable import SwiftDocC import XCTest -import TestUtilities +import TestHelpers import SymbolKit extension XCTestCase { diff --git a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift index 203311214a..ab8aa8060d 100644 --- a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift +++ b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import Markdown -import TestUtilities +import TestHelpers extension XCTestCase { From 15bd2f657544e459157794f37ca70c149e3a25f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6nnqvist?= Date: Fri, 14 Nov 2025 10:15:49 +0100 Subject: [PATCH 4/5] Add a "DocC" prefix to targets that don't include it in their name --- Package.swift | 16 ++++++++-------- .../Action/Action.swift | 0 .../Action/ActionResult.swift | 0 .../Action/Actions/Action+MoveOutput.swift | 0 .../Action/Actions/Convert/ConvertAction.swift | 0 .../Convert/ConvertFileWritingConsumer.swift | 0 .../CoverageDataEntry+generateSummary.swift | 0 .../Action/Actions/Convert/Indexer.swift | 0 .../Convert/JSONEncodingRenderNodeWriter.swift | 0 .../Action/Actions/CoverageAction.swift | 0 .../Actions/EmitGeneratedCurationAction.swift | 0 .../Action/Actions/IndexAction.swift | 0 .../Action/Actions/Init/CatalogTemplate.swift | 0 .../Actions/Init/CatalogTemplateKind.swift | 0 .../Action/Actions/Init/InitAction.swift | 0 .../MergeAction+SynthesizedLandingPage.swift | 0 .../Action/Actions/Merge/MergeAction.swift | 0 .../Action/Actions/PreviewAction.swift | 0 .../TransformForStaticHostingAction.swift | 0 .../Action+performAndHandleResult.swift | 0 .../ConvertAction+CommandInitialization.swift | 0 ...edCurationAction+CommandInitialization.swift | 0 .../IndexAction+CommandInitialization.swift | 0 .../InitAction+CommandInitialization.swift | 0 .../PreviewAction+CommandInitialization.swift | 0 ...ticHostingAction+CommandInitialization.swift | 0 .../URLArgumentValidator.swift | 0 .../Options/DirectoryPathOption.swift | 0 .../Options/DocumentationArchiveOption.swift | 0 .../Options/DocumentationBundleOption.swift | 0 .../DocumentationCoverageOptionsArgument.swift | 0 .../ArgumentParsing/Options/InitOptions.swift | 0 .../OutOfProcessLinkResolverOption.swift | 0 .../Options/PreviewOptions.swift | 0 .../SourceRepositoryArguments.swift | 0 .../Options/TemplateOption.swift | 0 .../ArgumentParsing/Subcommands/Convert.swift | 0 .../Subcommands/EmitGeneratedCuration.swift | 0 .../ArgumentParsing/Subcommands/Index.swift | 0 .../ArgumentParsing/Subcommands/Init.swift | 0 .../ArgumentParsing/Subcommands/Merge.swift | 0 .../ArgumentParsing/Subcommands/Preview.swift | 0 .../Subcommands/ProcessArchive.swift | 0 .../Subcommands/ProcessCatalog.swift | 0 .../Subcommands/TransformForStaticHosting.swift | 0 .../CMakeLists.txt | 0 .../CommandLine.docc/CommandLine.md | 0 .../CommandLine/Actions/InitAction.md | 0 .../CommandLine/Extensions/Docc.md | 0 .../CommandLine.docc/footer.html | 0 .../CommandLine.docc/header.html | 0 .../{CommandLine => DocCCommandLine}/Docc.swift | 0 .../PreviewServer/PreviewHTTPHandler.swift | 0 .../PreviewServer/PreviewServer.swift | 0 .../RequestHandler/DefaultRequestHandler.swift | 0 .../RequestHandler/ErrorRequestHandler.swift | 0 .../RequestHandler/FileRequestHandler.swift | 0 .../HTTPResponseHead+FromRequest.swift | 0 .../RequestHandler/RequestHandlerFactory.swift | 0 .../StaticHostableTransformer.swift | 0 .../Utility/DirectoryMonitor.swift | 0 .../FoundationExtensions/Sequence+Unique.swift | 0 .../FoundationExtensions/String+Path.swift | 0 .../URL+IsAbsoluteWebURL.swift | 0 .../FoundationExtensions/URL+Relative.swift | 0 .../Utility/PlatformArgumentParser.swift | 0 .../Utility/Signal.swift | 0 .../Utility/Throttle.swift | 0 .../FilesAndFolders.swift | 0 .../SymbolGraphCreation.swift | 0 .../TestFileSystem.swift | 0 .../XCTestCase+TemporaryDirectory.swift | 0 Sources/docc/main.swift | 2 +- ...ConvertSubcommandSourceRepositoryTests.swift | 4 ++-- .../ConvertSubcommandTests.swift | 4 ++-- ...entationCoverageKindFilterOptionsTests.swift | 0 .../ArgumentParsing/ErrorMessageTests.swift | 2 +- .../ArgumentParsing/MergeSubcommandTests.swift | 4 ++-- .../PreviewSubcommandTests.swift | 2 +- .../C+Extensions.swift | 0 .../ConvertActionIndexerTests.swift | 2 +- .../ConvertActionStaticHostableTests.swift | 4 ++-- .../ConvertActionTests.swift | 4 ++-- .../DirectoryMonitorTests.swift | 2 +- .../EmitGeneratedCurationsActionTests.swift | 4 ++-- .../FolderStructure.swift | 4 ++-- .../FolderStructureTests.swift | 2 +- .../HTMLTemplateDirectory.swift | 2 +- .../IndexActionTests.swift | 4 ++-- .../Init/InitActionTests.swift | 4 ++-- .../JSONEncodingRenderNodeWriterTests.swift | 2 +- .../MergeActionTests.swift | 4 ++-- .../PlatformArgumentParserTests.swift | 2 +- .../PreviewActionIntegrationTests.swift | 4 ++-- .../PreviewServer/PreviewHTTPHandlerTests.swift | 4 ++-- .../DefaultRequestHandlerTests.swift | 4 ++-- .../ErrorRequestHandlerTests.swift | 2 +- .../FileRequestHandlerTests.swift | 4 ++-- .../PreviewServer/ServerTestUtils.swift | 2 +- .../ProblemTests.swift | 2 +- .../SemanticAnalyzerTests.swift | 4 ++-- .../ShadowFileManagerTemporaryDirectory.swift | 0 .../SignalTests.swift | 0 .../StaticHostableTransformerTests.swift | 4 ++-- .../StaticHostingBaseTest.swift | 0 .../Default Code Listing Syntax.md | 0 .../FillIntroduced.symbols.json | 0 .../Info.plist | 0 .../MyKit@SideKit.symbols.json | 0 .../TestOverview.tutorial | 0 .../TestTutorial.tutorial | 0 .../TestTutorial2.tutorial | 0 .../TestTutorialArticle.tutorial | 0 .../TutorialMediaWithSpaces.tutorial | 0 .../article.md | 0 .../article2.md | 0 .../article3.md | 0 .../documentation/myclass.md | 0 .../documentation/mykit.md | 0 .../documentation/myprotocol.md | 0 .../documentation/sideclass-init.md | 0 .../documentation/sidekit.md | 0 .../figure1.png | Bin .../figure1~dark.png | Bin .../helloworld.swift | 0 .../helloworld1.swift | 0 .../helloworld2.swift | 0 .../helloworld3.swift | 0 .../helloworld4.swift | 0 .../intro.png | Bin .../introposter.png | Bin .../introposter2.png | Bin .../introvideo.mp4 | Bin .../introvideo~dark.mp4 | Bin .../mykit-iOS.symbols.json | 0 .../project.zip | Bin .../sidekit.symbols.json | 0 .../something@2x.png | Bin .../step.png | Bin .../titled2up.png | Bin .../titled2upCapital.PNG | Bin .../with spaces.mp4 | Bin .../with spaces.png | Bin .../with spaces@2x.png | Bin .../MixedLanguageFramework.docc/Info.plist | 0 .../clang/MixedLanguageFramework.symbols.json | 0 .../swift/MixedLanguageFramework.symbols.json | 0 .../OverloadedSymbols.docc/Info.plist | 0 .../ShapeKit.symbols.json | 0 .../SingleArticleTestBundle.docc/Info.plist | 0 .../SingleArticleTestBundle.docc/article.md | 0 .../DeckKit-Objective-C.symbols.json | 0 .../Test Resources/Overview.tutorial | 0 .../Test Resources/Test Template/index.html | 0 .../TopLevelCuration.symbols.json | 0 .../Test Resources/UncuratedArticle.md | 0 .../Test Resources/image.png | Bin .../ThrottleTests.swift | 2 +- .../TransformForStaticHostingActionTests.swift | 4 ++-- .../Utility/DirectedGraphTests.swift | 0 .../Utility/FileTests.swift | 2 +- .../Utility/LogHandleTests.swift | 2 +- .../Utility/Sequence+UniqueTests.swift | 2 +- .../Utility/TestFileSystemTests.swift | 2 +- .../Utility/URL+IsAbsoluteWebURLTests.swift | 2 +- .../Utility/URL+RelativeTests.swift | 2 +- .../Utility/XCTestCase+enableFeatureFlag.swift | 0 .../XCTestCase+LoadingData.swift | 2 +- .../NonInclusiveLanguageCheckerTests.swift | 2 +- ...eprecatedDiagnosticsDigestWarningTests.swift | 2 +- ...sticConsoleWriterDefaultFormattingTest.swift | 2 +- .../Diagnostics/DiagnosticTests.swift | 2 +- .../ConvertService/ConvertServiceTests.swift | 2 +- .../Indexing/ExternalRenderNodeTests.swift | 2 +- .../Indexing/NavigatorIndexTests.swift | 2 +- .../Indexing/RenderIndexTests.swift | 2 +- .../AutoCapitalizationTests.swift | 2 +- .../Infrastructure/AutomaticCurationTests.swift | 2 +- .../Infrastructure/BundleDiscoveryTests.swift | 2 +- .../DocumentationContext+RootPageTests.swift | 2 +- .../DocumentationContextTests.swift | 2 +- .../DocumentationCuratorTests.swift | 2 +- .../ExternalPathHierarchyResolverTests.swift | 2 +- .../ExternalReferenceResolverTests.swift | 2 +- .../DocumentationInputsProviderTests.swift | 2 +- .../Infrastructure/NodeTagsTests.swift | 2 +- .../Infrastructure/PathHierarchyTests.swift | 2 +- .../Infrastructure/SnippetResolverTests.swift | 2 +- .../SymbolGraph/SymbolGraphLoaderTests.swift | 2 +- .../Infrastructure/SymbolReferenceTests.swift | 2 +- .../LinkDestinationSummaryTests.swift | 2 +- .../Model/LineHighlighterTests.swift | 2 +- .../ParametersAndReturnValidatorTests.swift | 2 +- ...PropertyListPossibleValuesSectionTests.swift | 2 +- .../SemaToRenderNodeMultiLanguageTests.swift | 2 +- .../Model/SemaToRenderNodeTests.swift | 2 +- .../OutOfProcessReferenceResolverV1Tests.swift | 2 +- .../OutOfProcessReferenceResolverV2Tests.swift | 2 +- .../Rendering/AutomaticSeeAlsoTests.swift | 2 +- .../ConstraintsRenderSectionTests.swift | 2 +- .../DeclarationsRenderSectionTests.swift | 2 +- .../Rendering/DefaultAvailabilityTests.swift | 2 +- .../DefaultCodeListingSyntaxTests.swift | 2 +- .../Rendering/HeadingAnchorTests.swift | 2 +- .../Rendering/PlistSymbolTests.swift | 2 +- .../PropertyListDetailsRenderSectionTests.swift | 2 +- .../Rendering/RESTSymbolsTests.swift | 2 +- .../Rendering/RenderContentCompilerTests.swift | 2 +- ...enderNodeTranslatorSymbolVariantsTests.swift | 2 +- .../Rendering/RenderNodeTranslatorTests.swift | 2 +- .../Rendering/SymbolAvailabilityTests.swift | 2 +- .../Rendering/TermListTests.swift | 2 +- .../Semantics/ArticleSymbolMentionsTests.swift | 2 +- .../SwiftDocCTests/Semantics/ChoiceTests.swift | 2 +- .../SwiftDocCTests/Semantics/DoxygenTests.swift | 2 +- .../MarkupReferenceResolverTests.swift | 2 +- .../Semantics/MultipleChoiceTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/StackTests.swift | 2 +- Tests/SwiftDocCTests/Semantics/StepTests.swift | 2 +- .../SwiftDocCTests/Semantics/SymbolTests.swift | 2 +- .../Semantics/TutorialArticleTests.swift | 2 +- .../Semantics/TutorialTests.swift | 2 +- .../Semantics/VideoMediaTests.swift | 2 +- .../SwiftDocCTests/Semantics/VolumeTests.swift | 2 +- Tests/SwiftDocCTests/Utility/LMDBTests.swift | 2 +- .../Utility/ListItemExtractorTests.swift | 2 +- .../Utility/XCTestCase+MentionedIn.swift | 2 +- .../XCTestCase+LoadingTestData.swift | 2 +- Tests/signal-test-app/main.swift | 2 +- 229 files changed, 123 insertions(+), 123 deletions(-) rename Sources/{CommandLine => DocCCommandLine}/Action/Action.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/ActionResult.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Action+MoveOutput.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Convert/ConvertAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Convert/ConvertFileWritingConsumer.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Convert/Indexer.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/CoverageAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/EmitGeneratedCurationAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/IndexAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Init/CatalogTemplate.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Init/CatalogTemplateKind.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Init/InitAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/Merge/MergeAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/PreviewAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Action/Actions/TransformForStaticHostingAction.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/DirectoryPathOption.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/DocumentationArchiveOption.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/DocumentationBundleOption.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/InitOptions.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/PreviewOptions.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Options/TemplateOption.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/Convert.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/Index.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/Init.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/Merge.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/Preview.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/ProcessArchive.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/ProcessCatalog.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/ArgumentParsing/Subcommands/TransformForStaticHosting.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/CMakeLists.txt (100%) rename Sources/{CommandLine => DocCCommandLine}/CommandLine.docc/CommandLine.md (100%) rename Sources/{CommandLine => DocCCommandLine}/CommandLine.docc/CommandLine/Actions/InitAction.md (100%) rename Sources/{CommandLine => DocCCommandLine}/CommandLine.docc/CommandLine/Extensions/Docc.md (100%) rename Sources/{CommandLine => DocCCommandLine}/CommandLine.docc/footer.html (100%) rename Sources/{CommandLine => DocCCommandLine}/CommandLine.docc/header.html (100%) rename Sources/{CommandLine => DocCCommandLine}/Docc.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/PreviewHTTPHandler.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/PreviewServer.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/RequestHandler/DefaultRequestHandler.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/RequestHandler/ErrorRequestHandler.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/RequestHandler/FileRequestHandler.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/PreviewServer/RequestHandler/RequestHandlerFactory.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Transformers/StaticHostableTransformer.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/DirectoryMonitor.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/FoundationExtensions/Sequence+Unique.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/FoundationExtensions/String+Path.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/FoundationExtensions/URL+Relative.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/PlatformArgumentParser.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/Signal.swift (100%) rename Sources/{CommandLine => DocCCommandLine}/Utility/Throttle.swift (100%) rename Sources/{TestHelpers => DocCTestUtilities}/FilesAndFolders.swift (100%) rename Sources/{TestHelpers => DocCTestUtilities}/SymbolGraphCreation.swift (100%) rename Sources/{TestHelpers => DocCTestUtilities}/TestFileSystem.swift (100%) rename Sources/{TestHelpers => DocCTestUtilities}/XCTestCase+TemporaryDirectory.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/ConvertSubcommandTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/ErrorMessageTests.swift (97%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/MergeSubcommandTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ArgumentParsing/PreviewSubcommandTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/C+Extensions.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ConvertActionIndexerTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ConvertActionStaticHostableTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ConvertActionTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/DirectoryMonitorTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/EmitGeneratedCurationsActionTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/FolderStructure.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/FolderStructureTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/HTMLTemplateDirectory.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/IndexActionTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Init/InitActionTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/JSONEncodingRenderNodeWriterTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/MergeActionTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PlatformArgumentParserTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewActionIntegrationTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewServer/PreviewHTTPHandlerTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift (97%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewServer/RequestHandler/FileRequestHandlerTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/PreviewServer/ServerTestUtils.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ProblemTests.swift (97%) rename Tests/{CommandLineTests => DocCCommandLineTests}/SemanticAnalyzerTests.swift (98%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ShadowFileManagerTemporaryDirectory.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/SignalTests.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/StaticHostableTransformerTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/StaticHostingBaseTest.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/MixedLanguageFramework.docc/Info.plist (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/OverloadedSymbols.docc/Info.plist (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/SingleArticleTestBundle.docc/Info.plist (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Bundles/SingleArticleTestBundle.docc/article.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/DeckKit-Objective-C.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/Overview.tutorial (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/Test Template/index.html (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/TopLevelCuration.symbols.json (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/UncuratedArticle.md (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Test Resources/image.png (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/ThrottleTests.swift (97%) rename Tests/{CommandLineTests => DocCCommandLineTests}/TransformForStaticHostingActionTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/DirectedGraphTests.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/FileTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/LogHandleTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/Sequence+UniqueTests.swift (97%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/TestFileSystemTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/URL+IsAbsoluteWebURLTests.swift (96%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/URL+RelativeTests.swift (99%) rename Tests/{CommandLineTests => DocCCommandLineTests}/Utility/XCTestCase+enableFeatureFlag.swift (100%) rename Tests/{CommandLineTests => DocCCommandLineTests}/XCTestCase+LoadingData.swift (98%) diff --git a/Package.swift b/Package.swift index 7cfa3dd08e..07cf9c5c43 100644 --- a/Package.swift +++ b/Package.swift @@ -55,7 +55,7 @@ let package = Package( name: "SwiftDocCTests", dependencies: [ .target(name: "SwiftDocC"), - .target(name: "TestHelpers"), + .target(name: "DocCTestUtilities"), ], resources: [ .copy("Test Resources"), @@ -67,7 +67,7 @@ let package = Package( ), // Command-line tool library .target( - name: "CommandLine", + name: "DocCCommandLine", dependencies: [ .target(name: "SwiftDocC"), .product(name: "NIOHTTP1", package: "swift-nio", condition: .when(platforms: [.macOS, .iOS, .linux, .android])), @@ -77,11 +77,11 @@ let package = Package( swiftSettings: swiftSettings ), .testTarget( - name: "CommandLineTests", + name: "DocCCommandLineTests", dependencies: [ - .target(name: "CommandLine"), + .target(name: "DocCCommandLine"), .target(name: "SwiftDocC"), - .target(name: "TestHelpers"), + .target(name: "DocCTestUtilities"), ], resources: [ .copy("Test Resources"), @@ -92,7 +92,7 @@ let package = Package( // Test utility library .target( - name: "TestHelpers", + name: "DocCTestUtilities", dependencies: [ .target(name: "SwiftDocC"), .product(name: "SymbolKit", package: "swift-docc-symbolkit"), @@ -104,7 +104,7 @@ let package = Package( .executableTarget( name: "docc", dependencies: [ - .target(name: "CommandLine"), + .target(name: "DocCCommandLine"), ], exclude: ["CMakeLists.txt"], swiftSettings: swiftSettings @@ -114,7 +114,7 @@ let package = Package( .executableTarget( name: "signal-test-app", dependencies: [ - .target(name: "CommandLine"), + .target(name: "DocCCommandLine"), ], path: "Tests/signal-test-app", swiftSettings: swiftSettings diff --git a/Sources/CommandLine/Action/Action.swift b/Sources/DocCCommandLine/Action/Action.swift similarity index 100% rename from Sources/CommandLine/Action/Action.swift rename to Sources/DocCCommandLine/Action/Action.swift diff --git a/Sources/CommandLine/Action/ActionResult.swift b/Sources/DocCCommandLine/Action/ActionResult.swift similarity index 100% rename from Sources/CommandLine/Action/ActionResult.swift rename to Sources/DocCCommandLine/Action/ActionResult.swift diff --git a/Sources/CommandLine/Action/Actions/Action+MoveOutput.swift b/Sources/DocCCommandLine/Action/Actions/Action+MoveOutput.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Action+MoveOutput.swift rename to Sources/DocCCommandLine/Action/Actions/Action+MoveOutput.swift diff --git a/Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift b/Sources/DocCCommandLine/Action/Actions/Convert/ConvertAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Convert/ConvertAction.swift rename to Sources/DocCCommandLine/Action/Actions/Convert/ConvertAction.swift diff --git a/Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift b/Sources/DocCCommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift rename to Sources/DocCCommandLine/Action/Actions/Convert/ConvertFileWritingConsumer.swift diff --git a/Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift b/Sources/DocCCommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift rename to Sources/DocCCommandLine/Action/Actions/Convert/CoverageDataEntry+generateSummary.swift diff --git a/Sources/CommandLine/Action/Actions/Convert/Indexer.swift b/Sources/DocCCommandLine/Action/Actions/Convert/Indexer.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Convert/Indexer.swift rename to Sources/DocCCommandLine/Action/Actions/Convert/Indexer.swift diff --git a/Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift b/Sources/DocCCommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift rename to Sources/DocCCommandLine/Action/Actions/Convert/JSONEncodingRenderNodeWriter.swift diff --git a/Sources/CommandLine/Action/Actions/CoverageAction.swift b/Sources/DocCCommandLine/Action/Actions/CoverageAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/CoverageAction.swift rename to Sources/DocCCommandLine/Action/Actions/CoverageAction.swift diff --git a/Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift b/Sources/DocCCommandLine/Action/Actions/EmitGeneratedCurationAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/EmitGeneratedCurationAction.swift rename to Sources/DocCCommandLine/Action/Actions/EmitGeneratedCurationAction.swift diff --git a/Sources/CommandLine/Action/Actions/IndexAction.swift b/Sources/DocCCommandLine/Action/Actions/IndexAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/IndexAction.swift rename to Sources/DocCCommandLine/Action/Actions/IndexAction.swift diff --git a/Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift b/Sources/DocCCommandLine/Action/Actions/Init/CatalogTemplate.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Init/CatalogTemplate.swift rename to Sources/DocCCommandLine/Action/Actions/Init/CatalogTemplate.swift diff --git a/Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift b/Sources/DocCCommandLine/Action/Actions/Init/CatalogTemplateKind.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Init/CatalogTemplateKind.swift rename to Sources/DocCCommandLine/Action/Actions/Init/CatalogTemplateKind.swift diff --git a/Sources/CommandLine/Action/Actions/Init/InitAction.swift b/Sources/DocCCommandLine/Action/Actions/Init/InitAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Init/InitAction.swift rename to Sources/DocCCommandLine/Action/Actions/Init/InitAction.swift diff --git a/Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift b/Sources/DocCCommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift rename to Sources/DocCCommandLine/Action/Actions/Merge/MergeAction+SynthesizedLandingPage.swift diff --git a/Sources/CommandLine/Action/Actions/Merge/MergeAction.swift b/Sources/DocCCommandLine/Action/Actions/Merge/MergeAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/Merge/MergeAction.swift rename to Sources/DocCCommandLine/Action/Actions/Merge/MergeAction.swift diff --git a/Sources/CommandLine/Action/Actions/PreviewAction.swift b/Sources/DocCCommandLine/Action/Actions/PreviewAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/PreviewAction.swift rename to Sources/DocCCommandLine/Action/Actions/PreviewAction.swift diff --git a/Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift b/Sources/DocCCommandLine/Action/Actions/TransformForStaticHostingAction.swift similarity index 100% rename from Sources/CommandLine/Action/Actions/TransformForStaticHostingAction.swift rename to Sources/DocCCommandLine/Action/Actions/TransformForStaticHostingAction.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/Action+performAndHandleResult.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/EmitGeneratedCurationAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/IndexAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/InitAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/PreviewAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift b/Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift rename to Sources/DocCCommandLine/ArgumentParsing/ActionExtensions/TransformForStaticHostingAction+CommandInitialization.swift diff --git a/Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift b/Sources/DocCCommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift rename to Sources/DocCCommandLine/ArgumentParsing/ArgumentValidation/URLArgumentValidator.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/DirectoryPathOption.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/DirectoryPathOption.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/DirectoryPathOption.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationArchiveOption.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationBundleOption.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/InitOptions.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/InitOptions.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/InitOptions.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/OutOfProcessLinkResolverOption.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/PreviewOptions.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/PreviewOptions.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/PreviewOptions.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/Source Repository/SourceRepositoryArguments.swift diff --git a/Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/TemplateOption.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Options/TemplateOption.swift rename to Sources/DocCCommandLine/ArgumentParsing/Options/TemplateOption.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/Convert.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/Convert.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/Convert.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/EmitGeneratedCuration.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/Index.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/Index.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/Index.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/Init.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/Init.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/Init.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/Merge.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/Merge.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/Merge.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/Preview.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/Preview.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/Preview.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/ProcessArchive.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/ProcessCatalog.swift diff --git a/Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift b/Sources/DocCCommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift similarity index 100% rename from Sources/CommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift rename to Sources/DocCCommandLine/ArgumentParsing/Subcommands/TransformForStaticHosting.swift diff --git a/Sources/CommandLine/CMakeLists.txt b/Sources/DocCCommandLine/CMakeLists.txt similarity index 100% rename from Sources/CommandLine/CMakeLists.txt rename to Sources/DocCCommandLine/CMakeLists.txt diff --git a/Sources/CommandLine/CommandLine.docc/CommandLine.md b/Sources/DocCCommandLine/CommandLine.docc/CommandLine.md similarity index 100% rename from Sources/CommandLine/CommandLine.docc/CommandLine.md rename to Sources/DocCCommandLine/CommandLine.docc/CommandLine.md diff --git a/Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md b/Sources/DocCCommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md similarity index 100% rename from Sources/CommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md rename to Sources/DocCCommandLine/CommandLine.docc/CommandLine/Actions/InitAction.md diff --git a/Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md b/Sources/DocCCommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md similarity index 100% rename from Sources/CommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md rename to Sources/DocCCommandLine/CommandLine.docc/CommandLine/Extensions/Docc.md diff --git a/Sources/CommandLine/CommandLine.docc/footer.html b/Sources/DocCCommandLine/CommandLine.docc/footer.html similarity index 100% rename from Sources/CommandLine/CommandLine.docc/footer.html rename to Sources/DocCCommandLine/CommandLine.docc/footer.html diff --git a/Sources/CommandLine/CommandLine.docc/header.html b/Sources/DocCCommandLine/CommandLine.docc/header.html similarity index 100% rename from Sources/CommandLine/CommandLine.docc/header.html rename to Sources/DocCCommandLine/CommandLine.docc/header.html diff --git a/Sources/CommandLine/Docc.swift b/Sources/DocCCommandLine/Docc.swift similarity index 100% rename from Sources/CommandLine/Docc.swift rename to Sources/DocCCommandLine/Docc.swift diff --git a/Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift b/Sources/DocCCommandLine/PreviewServer/PreviewHTTPHandler.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/PreviewHTTPHandler.swift rename to Sources/DocCCommandLine/PreviewServer/PreviewHTTPHandler.swift diff --git a/Sources/CommandLine/PreviewServer/PreviewServer.swift b/Sources/DocCCommandLine/PreviewServer/PreviewServer.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/PreviewServer.swift rename to Sources/DocCCommandLine/PreviewServer/PreviewServer.swift diff --git a/Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift b/Sources/DocCCommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift rename to Sources/DocCCommandLine/PreviewServer/RequestHandler/DefaultRequestHandler.swift diff --git a/Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift b/Sources/DocCCommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift rename to Sources/DocCCommandLine/PreviewServer/RequestHandler/ErrorRequestHandler.swift diff --git a/Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift b/Sources/DocCCommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift rename to Sources/DocCCommandLine/PreviewServer/RequestHandler/FileRequestHandler.swift diff --git a/Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift b/Sources/DocCCommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift rename to Sources/DocCCommandLine/PreviewServer/RequestHandler/HTTPResponseHead+FromRequest.swift diff --git a/Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift b/Sources/DocCCommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift similarity index 100% rename from Sources/CommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift rename to Sources/DocCCommandLine/PreviewServer/RequestHandler/RequestHandlerFactory.swift diff --git a/Sources/CommandLine/Transformers/StaticHostableTransformer.swift b/Sources/DocCCommandLine/Transformers/StaticHostableTransformer.swift similarity index 100% rename from Sources/CommandLine/Transformers/StaticHostableTransformer.swift rename to Sources/DocCCommandLine/Transformers/StaticHostableTransformer.swift diff --git a/Sources/CommandLine/Utility/DirectoryMonitor.swift b/Sources/DocCCommandLine/Utility/DirectoryMonitor.swift similarity index 100% rename from Sources/CommandLine/Utility/DirectoryMonitor.swift rename to Sources/DocCCommandLine/Utility/DirectoryMonitor.swift diff --git a/Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift b/Sources/DocCCommandLine/Utility/FoundationExtensions/Sequence+Unique.swift similarity index 100% rename from Sources/CommandLine/Utility/FoundationExtensions/Sequence+Unique.swift rename to Sources/DocCCommandLine/Utility/FoundationExtensions/Sequence+Unique.swift diff --git a/Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift b/Sources/DocCCommandLine/Utility/FoundationExtensions/String+Path.swift similarity index 100% rename from Sources/CommandLine/Utility/FoundationExtensions/String+Path.swift rename to Sources/DocCCommandLine/Utility/FoundationExtensions/String+Path.swift diff --git a/Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift b/Sources/DocCCommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift similarity index 100% rename from Sources/CommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift rename to Sources/DocCCommandLine/Utility/FoundationExtensions/URL+IsAbsoluteWebURL.swift diff --git a/Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift b/Sources/DocCCommandLine/Utility/FoundationExtensions/URL+Relative.swift similarity index 100% rename from Sources/CommandLine/Utility/FoundationExtensions/URL+Relative.swift rename to Sources/DocCCommandLine/Utility/FoundationExtensions/URL+Relative.swift diff --git a/Sources/CommandLine/Utility/PlatformArgumentParser.swift b/Sources/DocCCommandLine/Utility/PlatformArgumentParser.swift similarity index 100% rename from Sources/CommandLine/Utility/PlatformArgumentParser.swift rename to Sources/DocCCommandLine/Utility/PlatformArgumentParser.swift diff --git a/Sources/CommandLine/Utility/Signal.swift b/Sources/DocCCommandLine/Utility/Signal.swift similarity index 100% rename from Sources/CommandLine/Utility/Signal.swift rename to Sources/DocCCommandLine/Utility/Signal.swift diff --git a/Sources/CommandLine/Utility/Throttle.swift b/Sources/DocCCommandLine/Utility/Throttle.swift similarity index 100% rename from Sources/CommandLine/Utility/Throttle.swift rename to Sources/DocCCommandLine/Utility/Throttle.swift diff --git a/Sources/TestHelpers/FilesAndFolders.swift b/Sources/DocCTestUtilities/FilesAndFolders.swift similarity index 100% rename from Sources/TestHelpers/FilesAndFolders.swift rename to Sources/DocCTestUtilities/FilesAndFolders.swift diff --git a/Sources/TestHelpers/SymbolGraphCreation.swift b/Sources/DocCTestUtilities/SymbolGraphCreation.swift similarity index 100% rename from Sources/TestHelpers/SymbolGraphCreation.swift rename to Sources/DocCTestUtilities/SymbolGraphCreation.swift diff --git a/Sources/TestHelpers/TestFileSystem.swift b/Sources/DocCTestUtilities/TestFileSystem.swift similarity index 100% rename from Sources/TestHelpers/TestFileSystem.swift rename to Sources/DocCTestUtilities/TestFileSystem.swift diff --git a/Sources/TestHelpers/XCTestCase+TemporaryDirectory.swift b/Sources/DocCTestUtilities/XCTestCase+TemporaryDirectory.swift similarity index 100% rename from Sources/TestHelpers/XCTestCase+TemporaryDirectory.swift rename to Sources/DocCTestUtilities/XCTestCase+TemporaryDirectory.swift diff --git a/Sources/docc/main.swift b/Sources/docc/main.swift index 51180b0335..c81fb4b0c0 100644 --- a/Sources/docc/main.swift +++ b/Sources/docc/main.swift @@ -9,7 +9,7 @@ */ #if os(macOS) || os(Linux) || os(Android) || os(Windows) || os(FreeBSD) -import CommandLine +import DocCCommandLine await Task { await Docc.main() diff --git a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift similarity index 99% rename from Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift index c6ea465e7c..2b48f71140 100644 --- a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift +++ b/Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandSourceRepositoryTests.swift @@ -9,9 +9,9 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import ArgumentParser class ConvertSubcommandSourceRepositoryTests: XCTestCase { diff --git a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift similarity index 99% rename from Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift index 916fc24d3f..60c5630f79 100644 --- a/Tests/CommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift +++ b/Tests/DocCCommandLineTests/ArgumentParsing/ConvertSubcommandTests.swift @@ -9,9 +9,9 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class ConvertSubcommandTests: XCTestCase { private let testBundleURL = Bundle.module.url( diff --git a/Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift similarity index 100% rename from Tests/CommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/DocumentationCoverageKindFilterOptionsTests.swift diff --git a/Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/ErrorMessageTests.swift similarity index 97% rename from Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/ErrorMessageTests.swift index 2a331cb9e7..e378af9218 100644 --- a/Tests/CommandLineTests/ArgumentParsing/ErrorMessageTests.swift +++ b/Tests/DocCCommandLineTests/ArgumentParsing/ErrorMessageTests.swift @@ -10,7 +10,7 @@ import XCTest import Foundation -@testable import CommandLine +@testable import DocCCommandLine class ErrorMessageTests: XCTestCase { diff --git a/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/MergeSubcommandTests.swift similarity index 99% rename from Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/MergeSubcommandTests.swift index 1b910bcb00..84ae1de2c6 100644 --- a/Tests/CommandLineTests/ArgumentParsing/MergeSubcommandTests.swift +++ b/Tests/DocCCommandLineTests/ArgumentParsing/MergeSubcommandTests.swift @@ -10,8 +10,8 @@ import XCTest import ArgumentParser -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class MergeSubcommandTests: XCTestCase { func testCommandLineArgumentValidation() throws { diff --git a/Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift b/Tests/DocCCommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift similarity index 99% rename from Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift rename to Tests/DocCCommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift index d475294290..6034959d30 100644 --- a/Tests/CommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift +++ b/Tests/DocCCommandLineTests/ArgumentParsing/PreviewSubcommandTests.swift @@ -10,7 +10,7 @@ #if canImport(NIOHTTP1) import XCTest -@testable import CommandLine +@testable import DocCCommandLine class PreviewSubcommandTests: XCTestCase { func testOptionsValidation() throws { diff --git a/Tests/CommandLineTests/C+Extensions.swift b/Tests/DocCCommandLineTests/C+Extensions.swift similarity index 100% rename from Tests/CommandLineTests/C+Extensions.swift rename to Tests/DocCCommandLineTests/C+Extensions.swift diff --git a/Tests/CommandLineTests/ConvertActionIndexerTests.swift b/Tests/DocCCommandLineTests/ConvertActionIndexerTests.swift similarity index 99% rename from Tests/CommandLineTests/ConvertActionIndexerTests.swift rename to Tests/DocCCommandLineTests/ConvertActionIndexerTests.swift index e28af46ab5..a196e961d2 100644 --- a/Tests/CommandLineTests/ConvertActionIndexerTests.swift +++ b/Tests/DocCCommandLineTests/ConvertActionIndexerTests.swift @@ -11,7 +11,7 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import CommandLine +@testable import DocCCommandLine class ConvertActionIndexerTests: XCTestCase { diff --git a/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift b/Tests/DocCCommandLineTests/ConvertActionStaticHostableTests.swift similarity index 98% rename from Tests/CommandLineTests/ConvertActionStaticHostableTests.swift rename to Tests/DocCCommandLineTests/ConvertActionStaticHostableTests.swift index fc8ebca11f..9c92ad9cc6 100644 --- a/Tests/CommandLineTests/ConvertActionStaticHostableTests.swift +++ b/Tests/DocCCommandLineTests/ConvertActionStaticHostableTests.swift @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class ConvertActionStaticHostableTests: StaticHostingBaseTests { /// Creates a DocC archive and then archives it with options to produce static content which is then validated. diff --git a/Tests/CommandLineTests/ConvertActionTests.swift b/Tests/DocCCommandLineTests/ConvertActionTests.swift similarity index 99% rename from Tests/CommandLineTests/ConvertActionTests.swift rename to Tests/DocCCommandLineTests/ConvertActionTests.swift index 2120d36b0e..f5ef018d78 100644 --- a/Tests/CommandLineTests/ConvertActionTests.swift +++ b/Tests/DocCCommandLineTests/ConvertActionTests.swift @@ -11,10 +11,10 @@ import XCTest import Foundation @testable @_spi(ExternalLinks) import SwiftDocC -@testable import CommandLine +@testable import DocCCommandLine import SymbolKit import Markdown -@testable import TestHelpers +@testable import DocCTestUtilities class ConvertActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/CommandLineTests/DirectoryMonitorTests.swift b/Tests/DocCCommandLineTests/DirectoryMonitorTests.swift similarity index 99% rename from Tests/CommandLineTests/DirectoryMonitorTests.swift rename to Tests/DocCCommandLineTests/DirectoryMonitorTests.swift index e7b5813765..f9dfecff6d 100644 --- a/Tests/CommandLineTests/DirectoryMonitorTests.swift +++ b/Tests/DocCCommandLineTests/DirectoryMonitorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine #if !os(Linux) && !os(Android) && !os(Windows) && !os(FreeBSD) fileprivate extension NSNotification.Name { diff --git a/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift b/Tests/DocCCommandLineTests/EmitGeneratedCurationsActionTests.swift similarity index 98% rename from Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift rename to Tests/DocCCommandLineTests/EmitGeneratedCurationsActionTests.swift index 85554b650a..e4b7d957d4 100644 --- a/Tests/CommandLineTests/EmitGeneratedCurationsActionTests.swift +++ b/Tests/DocCCommandLineTests/EmitGeneratedCurationsActionTests.swift @@ -10,8 +10,8 @@ import XCTest import Foundation -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class EmitGeneratedCurationsActionTests: XCTestCase { diff --git a/Tests/CommandLineTests/FolderStructure.swift b/Tests/DocCCommandLineTests/FolderStructure.swift similarity index 99% rename from Tests/CommandLineTests/FolderStructure.swift rename to Tests/DocCCommandLineTests/FolderStructure.swift index fa7e8bf40b..a1a8560eec 100644 --- a/Tests/CommandLineTests/FolderStructure.swift +++ b/Tests/DocCCommandLineTests/FolderStructure.swift @@ -9,9 +9,9 @@ */ @testable import SwiftDocC -@testable import CommandLine +@testable import DocCCommandLine import XCTest -public import TestHelpers +public import DocCTestUtilities /* This file contains a test helper API for working with folder hierarchies, with the ability to: diff --git a/Tests/CommandLineTests/FolderStructureTests.swift b/Tests/DocCCommandLineTests/FolderStructureTests.swift similarity index 99% rename from Tests/CommandLineTests/FolderStructureTests.swift rename to Tests/DocCCommandLineTests/FolderStructureTests.swift index 14dc10309d..e546e2ac31 100644 --- a/Tests/CommandLineTests/FolderStructureTests.swift +++ b/Tests/DocCCommandLineTests/FolderStructureTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestHelpers +import DocCTestUtilities class FolderStructureTests: XCTestCase { diff --git a/Tests/CommandLineTests/HTMLTemplateDirectory.swift b/Tests/DocCCommandLineTests/HTMLTemplateDirectory.swift similarity index 98% rename from Tests/CommandLineTests/HTMLTemplateDirectory.swift rename to Tests/DocCCommandLineTests/HTMLTemplateDirectory.swift index 1f01427b3b..d4e19fa4ce 100644 --- a/Tests/CommandLineTests/HTMLTemplateDirectory.swift +++ b/Tests/DocCCommandLineTests/HTMLTemplateDirectory.swift @@ -9,7 +9,7 @@ */ import Foundation -import TestHelpers +import DocCTestUtilities /// A folder that represents a fake html-build directory for testing. extension Folder { diff --git a/Tests/CommandLineTests/IndexActionTests.swift b/Tests/DocCCommandLineTests/IndexActionTests.swift similarity index 98% rename from Tests/CommandLineTests/IndexActionTests.swift rename to Tests/DocCCommandLineTests/IndexActionTests.swift index 0cf9f95d85..f9cdf73522 100644 --- a/Tests/CommandLineTests/IndexActionTests.swift +++ b/Tests/DocCCommandLineTests/IndexActionTests.swift @@ -11,9 +11,9 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import CommandLine +@testable import DocCCommandLine import Markdown -import TestHelpers +import DocCTestUtilities class IndexActionTests: XCTestCase { #if !os(iOS) diff --git a/Tests/CommandLineTests/Init/InitActionTests.swift b/Tests/DocCCommandLineTests/Init/InitActionTests.swift similarity index 99% rename from Tests/CommandLineTests/Init/InitActionTests.swift rename to Tests/DocCCommandLineTests/Init/InitActionTests.swift index 046b576ebb..bea3a286df 100644 --- a/Tests/CommandLineTests/Init/InitActionTests.swift +++ b/Tests/DocCCommandLineTests/Init/InitActionTests.swift @@ -10,8 +10,8 @@ import XCTest import Foundation -import TestHelpers -@testable import CommandLine +import DocCTestUtilities +@testable import DocCCommandLine final class InitActionTests: XCTestCase { private let documentationTitle = "MyTestDocumentation" diff --git a/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift b/Tests/DocCCommandLineTests/JSONEncodingRenderNodeWriterTests.swift similarity index 98% rename from Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift rename to Tests/DocCCommandLineTests/JSONEncodingRenderNodeWriterTests.swift index 156c1ae626..2cc21fa8c8 100644 --- a/Tests/CommandLineTests/JSONEncodingRenderNodeWriterTests.swift +++ b/Tests/DocCCommandLineTests/JSONEncodingRenderNodeWriterTests.swift @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import CommandLine +@testable import DocCCommandLine class JSONEncodingRenderNodeWriterTests: XCTestCase { /// Verifies that if we fail during writing a JSON file the execution diff --git a/Tests/CommandLineTests/MergeActionTests.swift b/Tests/DocCCommandLineTests/MergeActionTests.swift similarity index 99% rename from Tests/CommandLineTests/MergeActionTests.swift rename to Tests/DocCCommandLineTests/MergeActionTests.swift index b4b48caaa2..713e1c1a6e 100644 --- a/Tests/CommandLineTests/MergeActionTests.swift +++ b/Tests/DocCCommandLineTests/MergeActionTests.swift @@ -10,8 +10,8 @@ import XCTest @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class MergeActionTests: XCTestCase { diff --git a/Tests/CommandLineTests/PlatformArgumentParserTests.swift b/Tests/DocCCommandLineTests/PlatformArgumentParserTests.swift similarity index 99% rename from Tests/CommandLineTests/PlatformArgumentParserTests.swift rename to Tests/DocCCommandLineTests/PlatformArgumentParserTests.swift index f3b54898a9..bc0449fee5 100644 --- a/Tests/CommandLineTests/PlatformArgumentParserTests.swift +++ b/Tests/DocCCommandLineTests/PlatformArgumentParserTests.swift @@ -12,7 +12,7 @@ import Foundation import SwiftDocC import XCTest -@testable import CommandLine +@testable import DocCCommandLine class PlatformArgumentParserTests: XCTestCase { let correctInputs: [[String]] = [ diff --git a/Tests/CommandLineTests/PreviewActionIntegrationTests.swift b/Tests/DocCCommandLineTests/PreviewActionIntegrationTests.swift similarity index 99% rename from Tests/CommandLineTests/PreviewActionIntegrationTests.swift rename to Tests/DocCCommandLineTests/PreviewActionIntegrationTests.swift index 8afa195ea1..b475fb2a7c 100644 --- a/Tests/CommandLineTests/PreviewActionIntegrationTests.swift +++ b/Tests/DocCCommandLineTests/PreviewActionIntegrationTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import XCTest @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class PreviewActionIntegrationTests: XCTestCase { private func createMinimalDocsBundle() -> Folder { diff --git a/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift b/Tests/DocCCommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift similarity index 98% rename from Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift rename to Tests/DocCCommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift index fee3882928..60ac6068bc 100644 --- a/Tests/CommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift +++ b/Tests/DocCCommandLineTests/PreviewServer/PreviewHTTPHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift similarity index 97% rename from Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift rename to Tests/DocCCommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift index 66f7d8bcbc..c79c96ac55 100644 --- a/Tests/CommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift +++ b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/DefaultRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift similarity index 98% rename from Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift rename to Tests/DocCCommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift index 7a601f26d1..db52d03afb 100644 --- a/Tests/CommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift +++ b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/ErrorRequestHandlerTests.swift @@ -11,7 +11,7 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import CommandLine +@testable import DocCCommandLine import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift similarity index 99% rename from Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift rename to Tests/DocCCommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift index 6ce5bfd2b7..422f603d74 100644 --- a/Tests/CommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift +++ b/Tests/DocCCommandLineTests/PreviewServer/RequestHandler/FileRequestHandlerTests.swift @@ -11,8 +11,8 @@ #if canImport(NIOHTTP1) import Foundation import XCTest -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities import NIO import NIOHTTP1 diff --git a/Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift b/Tests/DocCCommandLineTests/PreviewServer/ServerTestUtils.swift similarity index 99% rename from Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift rename to Tests/DocCCommandLineTests/PreviewServer/ServerTestUtils.swift index 9f48813df5..1b325bed7b 100644 --- a/Tests/CommandLineTests/PreviewServer/ServerTestUtils.swift +++ b/Tests/DocCCommandLineTests/PreviewServer/ServerTestUtils.swift @@ -13,7 +13,7 @@ import Foundation import NIO import NIOHTTP1 import XCTest -@testable import CommandLine +@testable import DocCCommandLine /// Makes a request head part with the given URI and headers. func makeRequestHead(uri: String, headers: [(String, String)]? = nil) -> HTTPRequestHead { diff --git a/Tests/CommandLineTests/ProblemTests.swift b/Tests/DocCCommandLineTests/ProblemTests.swift similarity index 97% rename from Tests/CommandLineTests/ProblemTests.swift rename to Tests/DocCCommandLineTests/ProblemTests.swift index 196fe92d20..360cf5ae80 100644 --- a/Tests/CommandLineTests/ProblemTests.swift +++ b/Tests/DocCCommandLineTests/ProblemTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import CommandLine +import DocCCommandLine @testable import SwiftDocC import Markdown diff --git a/Tests/CommandLineTests/SemanticAnalyzerTests.swift b/Tests/DocCCommandLineTests/SemanticAnalyzerTests.swift similarity index 98% rename from Tests/CommandLineTests/SemanticAnalyzerTests.swift rename to Tests/DocCCommandLineTests/SemanticAnalyzerTests.swift index 4e50199a3c..2f4ac83822 100644 --- a/Tests/CommandLineTests/SemanticAnalyzerTests.swift +++ b/Tests/DocCCommandLineTests/SemanticAnalyzerTests.swift @@ -11,8 +11,8 @@ import XCTest import Markdown @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class SemanticAnalyzerTests: XCTestCase { private let catalogHierarchy = Folder(name: "SemanticAnalyzerTests.docc", content: [ diff --git a/Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift b/Tests/DocCCommandLineTests/ShadowFileManagerTemporaryDirectory.swift similarity index 100% rename from Tests/CommandLineTests/ShadowFileManagerTemporaryDirectory.swift rename to Tests/DocCCommandLineTests/ShadowFileManagerTemporaryDirectory.swift diff --git a/Tests/CommandLineTests/SignalTests.swift b/Tests/DocCCommandLineTests/SignalTests.swift similarity index 100% rename from Tests/CommandLineTests/SignalTests.swift rename to Tests/DocCCommandLineTests/SignalTests.swift diff --git a/Tests/CommandLineTests/StaticHostableTransformerTests.swift b/Tests/DocCCommandLineTests/StaticHostableTransformerTests.swift similarity index 99% rename from Tests/CommandLineTests/StaticHostableTransformerTests.swift rename to Tests/DocCCommandLineTests/StaticHostableTransformerTests.swift index e0cce1aee5..436c1eb4f5 100644 --- a/Tests/CommandLineTests/StaticHostableTransformerTests.swift +++ b/Tests/DocCCommandLineTests/StaticHostableTransformerTests.swift @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class StaticHostableTransformerTests: StaticHostingBaseTests { diff --git a/Tests/CommandLineTests/StaticHostingBaseTest.swift b/Tests/DocCCommandLineTests/StaticHostingBaseTest.swift similarity index 100% rename from Tests/CommandLineTests/StaticHostingBaseTest.swift rename to Tests/DocCCommandLineTests/StaticHostingBaseTest.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Default Code Listing Syntax.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/FillIntroduced.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/Info.plist diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/MyKit@SideKit.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestOverview.tutorial diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial.tutorial diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorial2.tutorial diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TestTutorialArticle.tutorial diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/TutorialMediaWithSpaces.tutorial diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article2.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/article3.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myclass.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/mykit.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/myprotocol.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sideclass-init.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/documentation/sidekit.md diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/figure1~dark.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld1.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld2.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld3.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/helloworld4.swift diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/intro.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introposter2.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo.mp4 diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/introvideo~dark.mp4 diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/mykit-iOS.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/project.zip diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/sidekit.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/something@2x.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/step.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2up.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/titled2upCapital.PNG diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.mp4 diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces.png diff --git a/Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png b/Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png similarity index 100% rename from Tests/CommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png rename to Tests/DocCCommandLineTests/Test Bundles/LegacyBundle_DoNotUseInNewTests.docc/with spaces@2x.png diff --git a/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist b/Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist similarity index 100% rename from Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist rename to Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/Info.plist diff --git a/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/clang/MixedLanguageFramework.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/MixedLanguageFramework.docc/symbol-graphs/swift/MixedLanguageFramework.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist b/Tests/DocCCommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist similarity index 100% rename from Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist rename to Tests/DocCCommandLineTests/Test Bundles/OverloadedSymbols.docc/Info.plist diff --git a/Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json b/Tests/DocCCommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json rename to Tests/DocCCommandLineTests/Test Bundles/OverloadedSymbols.docc/ShapeKit.symbols.json diff --git a/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist b/Tests/DocCCommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist similarity index 100% rename from Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist rename to Tests/DocCCommandLineTests/Test Bundles/SingleArticleTestBundle.docc/Info.plist diff --git a/Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md b/Tests/DocCCommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md similarity index 100% rename from Tests/CommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md rename to Tests/DocCCommandLineTests/Test Bundles/SingleArticleTestBundle.docc/article.md diff --git a/Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json b/Tests/DocCCommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json rename to Tests/DocCCommandLineTests/Test Resources/DeckKit-Objective-C.symbols.json diff --git a/Tests/CommandLineTests/Test Resources/Overview.tutorial b/Tests/DocCCommandLineTests/Test Resources/Overview.tutorial similarity index 100% rename from Tests/CommandLineTests/Test Resources/Overview.tutorial rename to Tests/DocCCommandLineTests/Test Resources/Overview.tutorial diff --git a/Tests/CommandLineTests/Test Resources/Test Template/index.html b/Tests/DocCCommandLineTests/Test Resources/Test Template/index.html similarity index 100% rename from Tests/CommandLineTests/Test Resources/Test Template/index.html rename to Tests/DocCCommandLineTests/Test Resources/Test Template/index.html diff --git a/Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json b/Tests/DocCCommandLineTests/Test Resources/TopLevelCuration.symbols.json similarity index 100% rename from Tests/CommandLineTests/Test Resources/TopLevelCuration.symbols.json rename to Tests/DocCCommandLineTests/Test Resources/TopLevelCuration.symbols.json diff --git a/Tests/CommandLineTests/Test Resources/UncuratedArticle.md b/Tests/DocCCommandLineTests/Test Resources/UncuratedArticle.md similarity index 100% rename from Tests/CommandLineTests/Test Resources/UncuratedArticle.md rename to Tests/DocCCommandLineTests/Test Resources/UncuratedArticle.md diff --git a/Tests/CommandLineTests/Test Resources/image.png b/Tests/DocCCommandLineTests/Test Resources/image.png similarity index 100% rename from Tests/CommandLineTests/Test Resources/image.png rename to Tests/DocCCommandLineTests/Test Resources/image.png diff --git a/Tests/CommandLineTests/ThrottleTests.swift b/Tests/DocCCommandLineTests/ThrottleTests.swift similarity index 97% rename from Tests/CommandLineTests/ThrottleTests.swift rename to Tests/DocCCommandLineTests/ThrottleTests.swift index 5a1fb7cdfa..2e72258b6e 100644 --- a/Tests/CommandLineTests/ThrottleTests.swift +++ b/Tests/DocCCommandLineTests/ThrottleTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine class ThrottleTests: XCTestCase { func testThrottlingSingleCall() throws { diff --git a/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift b/Tests/DocCCommandLineTests/TransformForStaticHostingActionTests.swift similarity index 99% rename from Tests/CommandLineTests/TransformForStaticHostingActionTests.swift rename to Tests/DocCCommandLineTests/TransformForStaticHostingActionTests.swift index 76abaa51fc..9a26f29efa 100644 --- a/Tests/CommandLineTests/TransformForStaticHostingActionTests.swift +++ b/Tests/DocCCommandLineTests/TransformForStaticHostingActionTests.swift @@ -11,8 +11,8 @@ import XCTest import Foundation @testable import SwiftDocC -@testable import CommandLine -import TestHelpers +@testable import DocCCommandLine +import DocCTestUtilities class TransformForStaticHostingActionTests: StaticHostingBaseTests { diff --git a/Tests/CommandLineTests/Utility/DirectedGraphTests.swift b/Tests/DocCCommandLineTests/Utility/DirectedGraphTests.swift similarity index 100% rename from Tests/CommandLineTests/Utility/DirectedGraphTests.swift rename to Tests/DocCCommandLineTests/Utility/DirectedGraphTests.swift diff --git a/Tests/CommandLineTests/Utility/FileTests.swift b/Tests/DocCCommandLineTests/Utility/FileTests.swift similarity index 99% rename from Tests/CommandLineTests/Utility/FileTests.swift rename to Tests/DocCCommandLineTests/Utility/FileTests.swift index fe5c94d330..1b456f4163 100644 --- a/Tests/CommandLineTests/Utility/FileTests.swift +++ b/Tests/DocCCommandLineTests/Utility/FileTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestHelpers +import DocCTestUtilities class FileTests: XCTestCase { func testAbsoluteURL() { diff --git a/Tests/CommandLineTests/Utility/LogHandleTests.swift b/Tests/DocCCommandLineTests/Utility/LogHandleTests.swift similarity index 99% rename from Tests/CommandLineTests/Utility/LogHandleTests.swift rename to Tests/DocCCommandLineTests/Utility/LogHandleTests.swift index 489f0f91b5..75bd839a1f 100644 --- a/Tests/CommandLineTests/Utility/LogHandleTests.swift +++ b/Tests/DocCCommandLineTests/Utility/LogHandleTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine @testable import SwiftDocC class LogHandleTests: XCTestCase { diff --git a/Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift b/Tests/DocCCommandLineTests/Utility/Sequence+UniqueTests.swift similarity index 97% rename from Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift rename to Tests/DocCCommandLineTests/Utility/Sequence+UniqueTests.swift index 4de534089d..c42c5b13e9 100644 --- a/Tests/CommandLineTests/Utility/Sequence+UniqueTests.swift +++ b/Tests/DocCCommandLineTests/Utility/Sequence+UniqueTests.swift @@ -10,7 +10,7 @@ import XCTest -@testable import CommandLine +@testable import DocCCommandLine class Sequence_UniqueTests: XCTestCase { func testEmpty() { diff --git a/Tests/CommandLineTests/Utility/TestFileSystemTests.swift b/Tests/DocCCommandLineTests/Utility/TestFileSystemTests.swift similarity index 99% rename from Tests/CommandLineTests/Utility/TestFileSystemTests.swift rename to Tests/DocCCommandLineTests/Utility/TestFileSystemTests.swift index 4504f6b141..a5c62179c6 100644 --- a/Tests/CommandLineTests/Utility/TestFileSystemTests.swift +++ b/Tests/DocCCommandLineTests/Utility/TestFileSystemTests.swift @@ -10,7 +10,7 @@ import XCTest import SwiftDocC -@testable import TestHelpers +@testable import DocCTestUtilities class TestFileSystemTests: XCTestCase { diff --git a/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift b/Tests/DocCCommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift similarity index 96% rename from Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift rename to Tests/DocCCommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift index 75c20a70ae..5ad844708b 100644 --- a/Tests/CommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift +++ b/Tests/DocCCommandLineTests/Utility/URL+IsAbsoluteWebURLTests.swift @@ -8,7 +8,7 @@ See https://swift.org/CONTRIBUTORS.txt for Swift project authors */ -@testable import CommandLine +@testable import DocCCommandLine import XCTest class URL_IsAbsoluteWebURLTests: XCTestCase { diff --git a/Tests/CommandLineTests/Utility/URL+RelativeTests.swift b/Tests/DocCCommandLineTests/Utility/URL+RelativeTests.swift similarity index 99% rename from Tests/CommandLineTests/Utility/URL+RelativeTests.swift rename to Tests/DocCCommandLineTests/Utility/URL+RelativeTests.swift index d832546cbd..80f2ab51e8 100644 --- a/Tests/CommandLineTests/Utility/URL+RelativeTests.swift +++ b/Tests/DocCCommandLineTests/Utility/URL+RelativeTests.swift @@ -9,7 +9,7 @@ */ import XCTest -@testable import CommandLine +@testable import DocCCommandLine class URL_RelativeTests: XCTestCase { diff --git a/Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift b/Tests/DocCCommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift similarity index 100% rename from Tests/CommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift rename to Tests/DocCCommandLineTests/Utility/XCTestCase+enableFeatureFlag.swift diff --git a/Tests/CommandLineTests/XCTestCase+LoadingData.swift b/Tests/DocCCommandLineTests/XCTestCase+LoadingData.swift similarity index 98% rename from Tests/CommandLineTests/XCTestCase+LoadingData.swift rename to Tests/DocCCommandLineTests/XCTestCase+LoadingData.swift index 36320b1ae1..73b4086078 100644 --- a/Tests/CommandLineTests/XCTestCase+LoadingData.swift +++ b/Tests/DocCCommandLineTests/XCTestCase+LoadingData.swift @@ -11,7 +11,7 @@ import Foundation import XCTest import SwiftDocC -import TestHelpers +import DocCTestUtilities extension XCTestCase { /// Loads a documentation catalog from an in-memory test file system. diff --git a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift index 6f2045de21..2c8067a3fd 100644 --- a/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift +++ b/Tests/SwiftDocCTests/Checker/Checkers/NonInclusiveLanguageCheckerTests.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class NonInclusiveLanguageCheckerTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift index a241b99318..e8fa915a70 100644 --- a/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift +++ b/Tests/SwiftDocCTests/DeprecatedDiagnosticsDigestWarningTests.swift @@ -10,7 +10,7 @@ import Foundation import SwiftDocC -import TestHelpers +import DocCTestUtilities import XCTest // THIS SHOULD BE REMOVED, RIGHT?! diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift index bd9cdccba2..d0099cc152 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticConsoleWriterDefaultFormattingTest.swift @@ -11,7 +11,7 @@ import XCTest import Markdown @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class DiagnosticConsoleWriterDefaultFormattingTest: XCTestCase { diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift index f6b660fff2..5f0d36fa6f 100644 --- a/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift +++ b/Tests/SwiftDocCTests/Diagnostics/DiagnosticTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SwiftDocC import Markdown @testable import SymbolKit -import TestHelpers +import DocCTestUtilities class DiagnosticTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift index ebef810121..485a9326b8 100644 --- a/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift +++ b/Tests/SwiftDocCTests/DocumentationService/ConvertService/ConvertServiceTests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation @testable import SwiftDocC import SymbolKit -import TestHelpers +import DocCTestUtilities class ConvertServiceTests: XCTestCase { private let testBundleInfo = DocumentationBundle.Info( diff --git a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift index b5ffeafc89..440ac0d3f1 100644 --- a/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Indexing/ExternalRenderNodeTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @_spi(ExternalLinks) @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class ExternalRenderNodeTests: XCTestCase { private func generateExternalResolver() -> TestMultiResultExternalReferenceResolver { diff --git a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift index 317bfd2513..f45415aa26 100644 --- a/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/NavigatorIndexTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities typealias Node = NavigatorTree.Node typealias PageType = NavigatorIndex.PageType diff --git a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift index b73c5425d9..97b4e69348 100644 --- a/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift +++ b/Tests/SwiftDocCTests/Indexing/RenderIndexTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestHelpers +import DocCTestUtilities @testable import SwiftDocC diff --git a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift index 5829a7f63c..2b7cf1ae2e 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutoCapitalizationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class AutoCapitalizationTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift index 879b30faf8..dfe8692f80 100644 --- a/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/AutomaticCurationTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class AutomaticCurationTests: XCTestCase { private let (availableExtensionSymbolKinds, availableNonExtensionSymbolKinds) = Set(AutomaticCuration.groupKindOrder).union(SymbolGraph.Symbol.KindIdentifier.allCases) diff --git a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift index 0fd14c2c9a..feefd6d7e5 100644 --- a/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/BundleDiscoveryTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class BundleDiscoveryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift index 6d8c6ee07d..cfcb8a6f1d 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContext+RootPageTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class DocumentationContext_RootPageTests: XCTestCase { func testArticleOnlyCatalogWithExplicitTechnologyRoot() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift index b4111b9ea0..c31fd844ea 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationContext/DocumentationContextTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities func diffDescription(lhs: String, rhs: String) -> String { let leftLines = lhs.components(separatedBy: .newlines) diff --git a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift index e76e1c5a85..5ec0e691a7 100644 --- a/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/DocumentationCuratorTests.swift @@ -13,7 +13,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import Markdown class DocumentationCuratorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift index ea8b6ed8ce..3cb0abcf82 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalPathHierarchyResolverTests.swift @@ -12,7 +12,7 @@ import XCTest import Markdown import SymbolKit @testable @_spi(ExternalLinks) import SwiftDocC -import TestHelpers +import DocCTestUtilities class ExternalPathHierarchyResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift index 0a4177e645..c1dfb6903a 100644 --- a/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/ExternalReferenceResolverTests.swift @@ -12,7 +12,7 @@ import XCTest @_spi(ExternalLinks) @testable import SwiftDocC import Markdown import SymbolKit -import TestHelpers +import DocCTestUtilities class ExternalReferenceResolverTests: XCTestCase { class TestExternalReferenceResolver: ExternalDocumentationSource { diff --git a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift index 07a9b37ae2..90ff69fa16 100644 --- a/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/Input Discovery/DocumentationInputsProviderTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestHelpers +import DocCTestUtilities @testable import SwiftDocC class DocumentationInputsProviderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift index 58798a1d6c..4ea4270616 100644 --- a/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/NodeTagsTests.swift @@ -10,7 +10,7 @@ import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class NodeTagsTests: XCTestCase { func testSPIMetadata() async throws { diff --git a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift index 429d30582f..1c338f29f7 100644 --- a/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/PathHierarchyTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import Markdown class PathHierarchyTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift index aa86149d4a..b5ca81c975 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SnippetResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import SymbolKit -import TestHelpers +import DocCTestUtilities class SnippetResolverTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift index 8390b3c459..9f6b69867e 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolGraph/SymbolGraphLoaderTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class SymbolGraphLoaderTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift index 8157bd1df6..958629711f 100644 --- a/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift +++ b/Tests/SwiftDocCTests/Infrastructure/SymbolReferenceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class SymbolReferenceTests: XCTestCase { func testUsesIdentifierForUnresolvedSymbols() { diff --git a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift index b49916b042..3f22fc94a5 100644 --- a/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift +++ b/Tests/SwiftDocCTests/LinkTargets/LinkDestinationSummaryTests.swift @@ -11,7 +11,7 @@ import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class LinkDestinationSummaryTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift index f4d38c5ab6..9565c02f2e 100644 --- a/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift +++ b/Tests/SwiftDocCTests/Model/LineHighlighterTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class LineHighlighterTests: XCTestCase { static let bundleID: DocumentationBundle.Identifier = "org.swift.docc.LineHighlighterTests" diff --git a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift index 65c59f72e8..6e7b9cb773 100644 --- a/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift +++ b/Tests/SwiftDocCTests/Model/ParametersAndReturnValidatorTests.swift @@ -13,7 +13,7 @@ import XCTest import Markdown @testable import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class ParametersAndReturnValidatorTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift index 2071a15d3c..6ae837b429 100644 --- a/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift +++ b/Tests/SwiftDocCTests/Model/PropertyListPossibleValuesSectionTests.swift @@ -12,7 +12,7 @@ import XCTest import SymbolKit import Foundation @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class PropertyListPossibleValuesSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift index a09bfc3353..cdd80ea8ed 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeMultiLanguageTests.swift @@ -11,7 +11,7 @@ import Foundation @testable import SwiftDocC import SymbolKit -import TestHelpers +import DocCTestUtilities import XCTest class SemaToRenderNodeMixedLanguageTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift index 47a31bea78..f98a14dcac 100644 --- a/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift +++ b/Tests/SwiftDocCTests/Model/SemaToRenderNodeTests.swift @@ -12,7 +12,7 @@ import Markdown import XCTest import SymbolKit -import TestHelpers +import DocCTestUtilities class SemaToRenderNodeTests: XCTestCase { func testCompileTutorial() async throws { diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift index b38be41e29..e9082ab6c0 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV1Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities // This tests the deprecated V1 implementation of `OutOfProcessReferenceResolver`. // Deprecating the test silences the deprecation warning when running the tests. It doesn't skip the test. diff --git a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift index de7f7b7ece..258183dc41 100644 --- a/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift +++ b/Tests/SwiftDocCTests/OutOfProcessReferenceResolverV2Tests.swift @@ -12,7 +12,7 @@ import XCTest import Foundation import SymbolKit @_spi(ExternalLinks) @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities #if os(macOS) class OutOfProcessReferenceResolverV2Tests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift index 466901e5ff..69d5204ffb 100644 --- a/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift +++ b/Tests/SwiftDocCTests/Rendering/AutomaticSeeAlsoTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class AutomaticSeeAlsoTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift index acf4bddbe4..9605f5bbea 100644 --- a/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/ConstraintsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import SymbolKit fileprivate let jsonDecoder = JSONDecoder() diff --git a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift index 5c3c3df72f..ec96c70035 100644 --- a/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DeclarationsRenderSectionTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import SymbolKit class DeclarationsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift index 8e0b8faeeb..b8d9f4e6b7 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class DefaultAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift index be3ff696ad..0f5597ad71 100644 --- a/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift +++ b/Tests/SwiftDocCTests/Rendering/DefaultCodeListingSyntaxTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class DefaultCodeBlockSyntaxTests: XCTestCase { func testCodeBlockWithoutAnyLanguageOrDefault() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift index 1e055b5540..f80bf9d833 100644 --- a/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/HeadingAnchorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class HeadingAnchorTests: XCTestCase { func testEncodeHeadingAnchor() async throws { diff --git a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift index 8f124da99d..d30f5f0322 100644 --- a/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PlistSymbolTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable public import SwiftDocC -import TestHelpers +import DocCTestUtilities class PlistSymbolTests: XCTestCase { private let plistSymbolURL = Bundle.module.url( diff --git a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift index a7db56d326..c5113a2d75 100644 --- a/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift +++ b/Tests/SwiftDocCTests/Rendering/PropertyListDetailsRenderSectionTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import SymbolKit -import TestHelpers +import DocCTestUtilities class PropertyListDetailsRenderSectionTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift index c1bf0721a9..b3c7ad5182 100644 --- a/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RESTSymbolsTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import SymbolKit fileprivate extension [RenderBlockContent] { diff --git a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift index 150c57d225..0dd79768ab 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderContentCompilerTests.swift @@ -11,7 +11,7 @@ import Foundation import Markdown @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import XCTest typealias Position = RenderBlockContent.CodeBlockOptions.Position diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift index 53e9a1ff48..a042227580 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorSymbolVariantsTests.swift @@ -13,7 +13,7 @@ import XCTest import SymbolKit import Markdown @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class RenderNodeTranslatorSymbolVariantsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift index 7e08409b13..1d2bcd4c83 100644 --- a/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift +++ b/Tests/SwiftDocCTests/Rendering/RenderNodeTranslatorTests.swift @@ -11,7 +11,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities import Markdown import SymbolKit diff --git a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift index e15fd24a7c..0be5cce743 100644 --- a/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift +++ b/Tests/SwiftDocCTests/Rendering/SymbolAvailabilityTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import SymbolKit @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class SymbolAvailabilityTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Rendering/TermListTests.swift b/Tests/SwiftDocCTests/Rendering/TermListTests.swift index 47f2ba4691..f0fa258e53 100644 --- a/Tests/SwiftDocCTests/Rendering/TermListTests.swift +++ b/Tests/SwiftDocCTests/Rendering/TermListTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest import Markdown @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities class TermListTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift index 7b9e9f9bc5..6759025c31 100644 --- a/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ArticleSymbolMentionsTests.swift @@ -11,7 +11,7 @@ import XCTest @testable @preconcurrency import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities import SymbolKit class ArticleSymbolMentionsTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift index dd29abe048..76d2e8a540 100644 --- a/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/ChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class ChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift index 72c9840aa3..a7ab6a6c0c 100644 --- a/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift +++ b/Tests/SwiftDocCTests/Semantics/DoxygenTests.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities @testable import SymbolKit class DoxygenTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift index f88d3190a0..316852c5ae 100644 --- a/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MarkupReferenceResolverTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class MarkupReferenceResolverTests: XCTestCase { func testArbitraryReferenceInComment() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift index fd5c2dc6ca..4c6655da3f 100644 --- a/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift +++ b/Tests/SwiftDocCTests/Semantics/MultipleChoiceTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class MultipleChoiceTests: XCTestCase { func testInvalidEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StackTests.swift b/Tests/SwiftDocCTests/Semantics/StackTests.swift index 30790b35aa..18cb25848e 100644 --- a/Tests/SwiftDocCTests/Semantics/StackTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StackTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class StackTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/StepTests.swift b/Tests/SwiftDocCTests/Semantics/StepTests.swift index 78531eaf33..7e4cf9c979 100644 --- a/Tests/SwiftDocCTests/Semantics/StepTests.swift +++ b/Tests/SwiftDocCTests/Semantics/StepTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class StepTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift index c7dcac396c..fa2bf31c91 100644 --- a/Tests/SwiftDocCTests/Semantics/SymbolTests.swift +++ b/Tests/SwiftDocCTests/Semantics/SymbolTests.swift @@ -12,7 +12,7 @@ import XCTest @testable import SymbolKit @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class SymbolTests: XCTestCase { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift index dd625e618c..5ac5250f80 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialArticleTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class TutorialArticleTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift index e91e3b6731..88d9008173 100644 --- a/Tests/SwiftDocCTests/Semantics/TutorialTests.swift +++ b/Tests/SwiftDocCTests/Semantics/TutorialTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class TutorialTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift index 3e0508e695..2eb43945fa 100644 --- a/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VideoMediaTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class VideoMediaTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift index 22d23ec814..34fbed9bab 100644 --- a/Tests/SwiftDocCTests/Semantics/VolumeTests.swift +++ b/Tests/SwiftDocCTests/Semantics/VolumeTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities class VolumeTests: XCTestCase { func testEmpty() async throws { diff --git a/Tests/SwiftDocCTests/Utility/LMDBTests.swift b/Tests/SwiftDocCTests/Utility/LMDBTests.swift index 6809340a93..09200e43d2 100644 --- a/Tests/SwiftDocCTests/Utility/LMDBTests.swift +++ b/Tests/SwiftDocCTests/Utility/LMDBTests.swift @@ -11,7 +11,7 @@ import XCTest @testable import SwiftDocC -import TestHelpers +import DocCTestUtilities final class SwiftLMDBTests: XCTestCase { var environment: LMDB.Environment! diff --git a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift index 9da247a4e5..66ffb77ac2 100644 --- a/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift +++ b/Tests/SwiftDocCTests/Utility/ListItemExtractorTests.swift @@ -9,7 +9,7 @@ */ import XCTest -import TestHelpers +import DocCTestUtilities @testable import SwiftDocC import Markdown diff --git a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift index 9cb1ac6660..5e6a76cc2f 100644 --- a/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift +++ b/Tests/SwiftDocCTests/Utility/XCTestCase+MentionedIn.swift @@ -10,7 +10,7 @@ @testable import SwiftDocC import XCTest -import TestHelpers +import DocCTestUtilities import SymbolKit extension XCTestCase { diff --git a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift index ab8aa8060d..614e3c0a64 100644 --- a/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift +++ b/Tests/SwiftDocCTests/XCTestCase+LoadingTestData.swift @@ -12,7 +12,7 @@ import Foundation import XCTest @testable import SwiftDocC import Markdown -import TestHelpers +import DocCTestUtilities extension XCTestCase { diff --git a/Tests/signal-test-app/main.swift b/Tests/signal-test-app/main.swift index 4a96e6eb9f..090816f667 100644 --- a/Tests/signal-test-app/main.swift +++ b/Tests/signal-test-app/main.swift @@ -16,7 +16,7 @@ #if os(macOS) || os(Linux) || os(Android) import Foundation -import CommandLine +import DocCCommandLine Signal.on(Signal.all) { _ in print("Signal test app exiting.") From 62d4c53ae0207e6b30e7d5071d36b6c13ce8c369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20R=C3=B6nnqvist?= Date: Fri, 14 Nov 2025 16:41:09 +0100 Subject: [PATCH 5/5] Add prefix to target names in comments and scripts --- CONTRIBUTING.md | 2 +- Package.swift | 2 +- Sources/CMakeLists.txt | 2 +- .../DocumentationCoverageOptionsArgument.swift | 2 +- Sources/DocCCommandLine/CMakeLists.txt | 4 ++-- .../CommandLine.docc/CommandLine.md | 6 +++--- .../SwiftDocC/AddingFeatureFlags.md | 4 ++-- Sources/docc/CMakeLists.txt | 2 +- Tests/signal-test-app/main.swift | 2 +- bin/check-source | 2 +- bin/preview-docs | 16 ++++++++-------- bin/update-gh-pages-documentation-site | 8 ++++---- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71eff08cab..8f2f78468f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -520,7 +520,7 @@ For more in-depth technical information about Swift-DocC, please refer to the project's technical documentation: - [`SwiftDocC` framework documentation](https://swiftlang.github.io/swift-docc/documentation/swiftdocc/) -- [`CommandLine` framework documentation](https://swiftlang.github.io/swift-docc/documentation/commandline/) +- [`DocCCommandLine` framework documentation](https://swiftlang.github.io/swift-docc/documentation/docccommandline/) ### Related Projects diff --git a/Package.swift b/Package.swift index 07cf9c5c43..9a06ad79dc 100644 --- a/Package.swift +++ b/Package.swift @@ -110,7 +110,7 @@ let package = Package( swiftSettings: swiftSettings ), - // Test app for CommandLine + // Test app for DocCCommandLine .executableTarget( name: "signal-test-app", dependencies: [ diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index 4362f918d0..dd11916d8b 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -8,5 +8,5 @@ See https://swift.org/LICENSE.txt for license information #]] add_subdirectory(SwiftDocC) -add_subdirectory(CommandLine) +add_subdirectory(DocCCommandLine) add_subdirectory(docc) diff --git a/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift b/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift index 25b5aabbd3..8f48dbf844 100644 --- a/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift +++ b/Sources/DocCCommandLine/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift @@ -76,7 +76,7 @@ public struct DocumentationCoverageOptionsArgument: ParsableArguments { // // It is safe to add a retroactively conformance here because the other module (SwiftDocC) is in the same package. // -// These conforming types are defined in SwiftDocC and extended in CommandLine, because SwiftDocC doesn't link against ArgumentParser (since it isn't about CLI). +// These conforming types are defined in SwiftDocC and extended in DocCCommandLine, because SwiftDocC doesn't link against ArgumentParser (since it isn't about CLI). // We conform here because this is the first place that we can add the conformance. The implementation is in SwiftDocC. extension SwiftDocC.DocumentationCoverageLevel: ArgumentParser.ExpressibleByArgument {} extension SwiftDocC.DocumentationCoverageOptions.KindFilterOptions.BitFlagRepresentation: ArgumentParser.ExpressibleByArgument {} diff --git a/Sources/DocCCommandLine/CMakeLists.txt b/Sources/DocCCommandLine/CMakeLists.txt index a0552f96dc..7fc05e64c6 100644 --- a/Sources/DocCCommandLine/CMakeLists.txt +++ b/Sources/DocCCommandLine/CMakeLists.txt @@ -7,7 +7,7 @@ Licensed under Apache License v2.0 with Runtime Library Exception See https://swift.org/LICENSE.txt for license information #]] -add_library(CommandLine STATIC +add_library(DocCCommandLine STATIC Action/Action.swift Action/ActionResult.swift Action/Actions/Action+MoveOutput.swift @@ -69,6 +69,6 @@ add_library(CommandLine STATIC Utility/PlatformArgumentParser.swift Utility/Signal.swift Utility/Throttle.swift) -target_link_libraries(CommandLine PUBLIC +target_link_libraries(DocCCommandLine PUBLIC ArgumentParser SwiftDocC) diff --git a/Sources/DocCCommandLine/CommandLine.docc/CommandLine.md b/Sources/DocCCommandLine/CommandLine.docc/CommandLine.md index defdb873b6..6d64bbbfd7 100644 --- a/Sources/DocCCommandLine/CommandLine.docc/CommandLine.md +++ b/Sources/DocCCommandLine/CommandLine.docc/CommandLine.md @@ -1,12 +1,12 @@ -# ``CommandLine`` +# ``DoCCCommandLine`` Build custom documentation workflows by leveraging the DocC compiler pipeline. ## Overview -CommandLine provides a default, command-line workflow for DocC, powered by Swift [Argument Parser](https://apple.github.io/swift-argument-parser/documentation/argumentparser/). `docc` commands, such as `convert` and `preview`, are conformant ``Action`` types that use DocC to perform documentation tasks. +DocCCommandLine provides a default, command-line workflow for DocC, powered by Swift [Argument Parser](https://apple.github.io/swift-argument-parser/documentation/argumentparser/). `docc` commands, such as `convert` and `preview`, are conformant ``Action`` types that use DocC to perform documentation tasks. -Use CommandLine to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``. +Use DocCCommandLine to build a custom, command-line interface and extend it with additional commands. To add a new sub-command called `example`, create a conformant ``Action`` type, `ExampleAction`, that performs the desired work, and add it as a sub-command. Optionally, you can also reuse any of the provided actions like ``ConvertAction``. ```swift public import ArgumentParser diff --git a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md index 52d7220981..844927b441 100644 --- a/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md +++ b/Sources/SwiftDocC/SwiftDocC.docc/SwiftDocC/AddingFeatureFlags.md @@ -17,12 +17,12 @@ value so that the default initializer can be used. ### Feature flags on the command line -Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `CommandLine`. +Command-line feature flags live in the `Docc.Convert.FeatureFlagOptions` in `DocCCommandLine`. This type implements the `ParsableArguments` protocol from Swift Argument Parser to create an option group for the `convert` and `preview` commands. These options are then handled in `ConvertAction.init(fromConvertCommand:)`, still in -`CommandLine`, where they are written into the global feature flags ``FeatureFlags/current`` +`docCCommandLine`, where they are written into the global feature flags ``FeatureFlags/current`` instance, which can then be used during the compilation process. ### Feature flags in Info.plist diff --git a/Sources/docc/CMakeLists.txt b/Sources/docc/CMakeLists.txt index 722df3a849..526b5b5e9f 100644 --- a/Sources/docc/CMakeLists.txt +++ b/Sources/docc/CMakeLists.txt @@ -10,7 +10,7 @@ See https://swift.org/LICENSE.txt for license information add_executable(docc main.swift) target_link_libraries(docc PRIVATE - CommandLine) + DocCCommandLine) install(TARGETS docc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/Tests/signal-test-app/main.swift b/Tests/signal-test-app/main.swift index 090816f667..8b13823f43 100644 --- a/Tests/signal-test-app/main.swift +++ b/Tests/signal-test-app/main.swift @@ -10,7 +10,7 @@ // // Trap signals and exit with a predefined error code. -// Check Tests/CommandLineTests/SignalTests.swift for more details. +// Check Tests/DocCCommandLineTests/SignalTests.swift for more details. // #if os(macOS) || os(Linux) || os(Android) diff --git a/bin/check-source b/bin/check-source index b72b7a4c41..4d896597a4 100755 --- a/bin/check-source +++ b/bin/check-source @@ -48,7 +48,7 @@ for language in swift-or-c bash md-or-tutorial html docker; do reader=head case "$language" in swift-or-c) - exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/CommandLineTests/Test Bundles/*") + exceptions=( -name Package.swift -o -path "./Tests/SwiftDocCTests/Test Bundles/*" -o -path "./Tests/DocCCommandLineTests/Test Bundles/*") matching_files=( -name '*.swift' -o -name '*.c' -o -name '*.h' ) cat > "$tmp" <<"EOF" /* diff --git a/bin/preview-docs b/bin/preview-docs index 1faa752bdf..5d8debcf51 100755 --- a/bin/preview-docs +++ b/bin/preview-docs @@ -28,7 +28,7 @@ while test $# -gt 0; do case "$1" in --help) echo - echo "Usage: $(basename $0) [SwiftDocC|CommandLine|DocC] [-h] [--convert-only]" + echo "Usage: $(basename $0) [SwiftDocC|DocCCommandLine|DocC] [-h] [--convert-only]" echo "Builds the given framework and converts or previews the documentation" echo "Note: To preview you must set the \`DOCC_HTML_DIR\` with a path to a documentation template. @@ -80,24 +80,24 @@ case $FRAMEWORK in --output-path "$DOCS_BUILD_DIR" ;; - "CommandLine") + "DocCCommandLine") - # Generate symbol graph files for CommandLine + # Generate symbol graph files for DocCCommandLine swift build --package-path "$DOCC_ROOT" \ - --target CommandLine \ + --target DocCCommandLine \ -Xswiftc -emit-symbol-graph \ -Xswiftc -emit-symbol-graph-dir -Xswiftc "$SGFS_DIR" echo # Delete the symbol graph files from dependences by looking for - # those without a 'CommandLine' prefix. - find "$SGFS_DIR" -type f ! -name 'CommandLine*' -delete + # those without a 'DocCCommandLine' prefix. + find "$SGFS_DIR" -type f ! -name 'DocCCommandLine*' -delete echo # Compile the documentation and the symbol graph data. - swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/CommandLine/CommandLine.docc" \ + swift run docc $DOCC_CMD "$DOCC_ROOT/Sources/DocCCommandLine/CommandLine.docc" \ --experimental-enable-custom-templates \ --fallback-display-name CommandLine \ --fallback-bundle-identifier org.swift.CommandLine \ @@ -116,7 +116,7 @@ case $FRAMEWORK in *) echo - echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, CommandLine, or DocC." + echo "Error: Unknown module '$FRAMEWORK'. Preview is supported only for SwiftDocC, DocCCommandLine, or DocC." exit 0 ;; esac diff --git a/bin/update-gh-pages-documentation-site b/bin/update-gh-pages-documentation-site index 41b8e41341..c140d06d48 100755 --- a/bin/update-gh-pages-documentation-site +++ b/bin/update-gh-pages-documentation-site @@ -27,7 +27,7 @@ SWIFT_DOCC_ROOT="$(dirname $(dirname $(filepath $0)))" DOCC_BUILD_DIR="$SWIFT_DOCC_ROOT"/.build/docc-gh-pages-build DOCC_OUTPUT_DIR="$DOCC_BUILD_DIR"/SwiftDocC.doccarchive -COMMAND_LINE_OUTPUT_DIR="$DOCC_BUILD_DIR"/CommandLine.doccarchive +COMMAND_LINE_OUTPUT_DIR="$DOCC_BUILD_DIR"/DocCCommandLine.doccarchive mkdir -p "$COMMAND_LINE_OUTPUT_DIR" @@ -60,12 +60,12 @@ swift package \ echo -e "\033[34;1m Building SwiftDocC Utilities docs at $COMMAND_LINE_OUTPUT_DIR \033[0m" -# Generate documentation for the 'CommandLine' target and output it +# Generate documentation for the 'DocCCommandLine' target and output it # to a temporary output directory in the .build directory. swift package \ --allow-writing-to-directory "$DOCC_BUILD_DIR" \ generate-documentation \ - --target CommandLine \ + --target DocCCommandLine \ --disable-indexing \ --source-service github \ --source-service-base-url https://github.com/swiftlang/swift-docc/blob/main \ @@ -79,7 +79,7 @@ echo -e "\033[34;1m Merging docs \033q[0m" # Remove the output directory so that the merge command can output there rm -rf "$SWIFT_DOCC_ROOT/gh-pages/docs" -# Merge the CommandLine docs into the primary SwiftDocC docs +# Merge the DocCCommandLine docs into the primary SwiftDocC docs swift run docc merge \ "$DOCC_OUTPUT_DIR" \ "$COMMAND_LINE_OUTPUT_DIR" \