diff options
Diffstat (limited to 'crates/shirabe/tests')
18 files changed, 59 insertions, 66 deletions
diff --git a/crates/shirabe/tests/advisory/auditor_test.rs b/crates/shirabe/tests/advisory/auditor_test.rs index e3b72536..3a066ed7 100644 --- a/crates/shirabe/tests/advisory/auditor_test.rs +++ b/crates/shirabe/tests/advisory/auditor_test.rs @@ -24,11 +24,11 @@ use shirabe::repository::RepositoryInterfaceHandle; use shirabe::repository::RepositorySet; use shirabe::repository::SearchResult; use shirabe::repository::SecurityAdvisoryResult; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::date_create; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::SimpleConstraint; +use shirabe_symfony_console::output::output_interface; fn constraint(operator: &str, version: &str) -> shirabe_semver::constraint::AnyConstraint { SimpleConstraint::new(operator.to_string(), version.to_string(), None).into() diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs index 4e8a0f05..f0bde547 100644 --- a/crates/shirabe/tests/application_test.rs +++ b/crates/shirabe/tests/application_test.rs @@ -12,12 +12,12 @@ use shirabe::command::about_command::AboutCommand; use shirabe::command::self_update_command::SelfUpdateCommand; use shirabe::console::application::ApplicationHandle; use shirabe::util::platform::Platform; -use shirabe_external_packages::symfony::console::command::Command; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::{PHP_EOL, PHP_SERVER, PhpMixed, time}; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::output_interface::OutputInterface; fn set_up() { Platform::put_env("COMPOSER_DISABLE_XDEBUG_WARN", "1"); diff --git a/crates/shirabe/tests/autoload/autoload_generator_test.rs b/crates/shirabe/tests/autoload/autoload_generator_test.rs index 81a4040f..cd0a3e5b 100644 --- a/crates/shirabe/tests/autoload/autoload_generator_test.rs +++ b/crates/shirabe/tests/autoload/autoload_generator_test.rs @@ -18,10 +18,10 @@ use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterface use shirabe::script::ScriptEvents; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::{PhpMixed, dirname, preg_quote, realpath, strtr}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, MatchAllConstraint, SimpleConstraint}; +use shirabe_symfony_console::output::output_interface; use tempfile::TempDir; /// The mock `InstallationManager::getInstallPath` used throughout the test: metapackages return diff --git a/crates/shirabe/tests/command/archive_command_test.rs b/crates/shirabe/tests/command/archive_command_test.rs index 6d20fda0..ac1ad462 100644 --- a/crates/shirabe/tests/command/archive_command_test.rs +++ b/crates/shirabe/tests/command/archive_command_test.rs @@ -15,13 +15,13 @@ use shirabe::repository::{ InstalledArrayRepository, RepositoryInterfaceHandle, RepositoryManagerInterface, }; use shirabe::util::Platform; -use shirabe_external_packages::symfony::console::command::command::Command; -use shirabe_external_packages::symfony::console::input::InputInterface; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::output::OutputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; +use shirabe_symfony_console::command::command::Command; +use shirabe_symfony_console::input::InputInterface; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::output::OutputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; // PHP mocks `Composer\Package\Archiver\ArchiveManager` with // getMockBuilder(...)->disableOriginalConstructor(). diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs index edb5806f..7ea3059c 100644 --- a/crates/shirabe/tests/common/io_mock.rs +++ b/crates/shirabe/tests/common/io_mock.rs @@ -5,9 +5,9 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable}; use shirabe::util::platform::Platform; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_pcre::Preg; use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote}; +use shirabe_symfony_console::output::output_interface; use std::collections::VecDeque; // A single entry of the IO expectation list. PHP models these as associative diff --git a/crates/shirabe/tests/common/test_case.rs b/crates/shirabe/tests/common/test_case.rs index 7f8e1d54..e15d2883 100644 --- a/crates/shirabe/tests/common/test_case.rs +++ b/crates/shirabe/tests/common/test_case.rs @@ -21,16 +21,16 @@ use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::{PhpMixed, PhpResource}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::{AnyConstraint, SimpleConstraint}; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::console_output::ConsoleOutput; +use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::output::stream_output::StreamOutput; use std::path::PathBuf; use tempfile::TempDir; @@ -309,8 +309,8 @@ pub fn get_application_tester() -> ApplicationTester { /// ref: Symfony\Component\Console\Tester\ApplicationTester::run options. /// -/// Lives in the test harness (not `shirabe_external_packages`) because the tester drives shirabe's -/// own `ApplicationHandle`, which the external-packages crate cannot depend on. +/// Lives in the test harness (not `shirabe_symfony_console`) because the tester drives shirabe's +/// own `ApplicationHandle`, which the console crate cannot depend on. #[derive(Debug, Default)] pub struct RunOptions { pub interactive: Option<bool>, diff --git a/crates/shirabe/tests/completion_functional_test.rs b/crates/shirabe/tests/completion_functional_test.rs index 89478d9d..66f2f87b 100644 --- a/crates/shirabe/tests/completion_functional_test.rs +++ b/crates/shirabe/tests/completion_functional_test.rs @@ -14,7 +14,7 @@ mod bootstrap; use serial_test::serial; use shirabe::console::application::{Application, ApplicationHandle}; -use shirabe_external_packages::symfony::console::tester::command_completion_tester::CommandCompletionTester; +use shirabe_symfony_console::tester::command_completion_tester::CommandCompletionTester; struct RestoreCwd(std::path::PathBuf); @@ -48,8 +48,7 @@ fn assert_complete(input: &str, expected_suggestions: Option<&[&str]>) { let base = application.__base_application(); let command = { let mut app_ref = base.borrow_mut(); - let app_dyn: &mut dyn shirabe_external_packages::symfony::console::application::Application = - &mut *app_ref; + let app_dyn: &mut dyn shirabe_symfony_console::application::Application = &mut *app_ref; let app = app_dyn .as_any_mut() .downcast_mut::<Application>() diff --git a/crates/shirabe/tests/console/html_output_formatter_test.rs b/crates/shirabe/tests/console/html_output_formatter_test.rs index 31bd460d..e0835973 100644 --- a/crates/shirabe/tests/console/html_output_formatter_test.rs +++ b/crates/shirabe/tests/console/html_output_formatter_test.rs @@ -2,9 +2,7 @@ use indexmap::IndexMap; use shirabe::console::html_output_formatter::HtmlOutputFormatter; -use shirabe_external_packages::symfony::console::formatter::{ - OutputFormatterStyle, OutputFormatterStyleInterface, -}; +use shirabe_symfony_console::formatter::{OutputFormatterStyle, OutputFormatterStyleInterface}; #[test] fn test_formatting() { diff --git a/crates/shirabe/tests/documentation_test.rs b/crates/shirabe/tests/documentation_test.rs index 7a13ce1d..ad945aa3 100644 --- a/crates/shirabe/tests/documentation_test.rs +++ b/crates/shirabe/tests/documentation_test.rs @@ -1,8 +1,8 @@ //! ref: composer/tests/Composer/Test/DocumentationTest.php use shirabe::console::application::ApplicationHandle; -use shirabe_external_packages::symfony::console::command::Command; -use shirabe_external_packages::symfony::console::descriptor::application_description::ApplicationDescription; +use shirabe_symfony_console::command::Command; +use shirabe_symfony_console::descriptor::application_description::ApplicationDescription; fn get_command_name(command: &std::rc::Rc<std::cell::RefCell<dyn Command>>) -> String { let mut name = command.borrow().get_name().unwrap_or_default(); diff --git a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs index 817a6954..a343d056 100644 --- a/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs +++ b/crates/shirabe/tests/event_dispatcher/event_dispatcher_test.rs @@ -26,9 +26,9 @@ use shirabe::script::ScriptEvents; use shirabe::util::platform::Platform; use shirabe::util::process_executor::{MockHandler, ProcessExecutor}; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; +use shirabe_symfony_console::output::output_interface; fn tear_down() { Platform::clear_env("COMPOSER_SKIP_SCRIPTS"); diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs index 4c6ce981..295d9250 100644 --- a/crates/shirabe/tests/installer_test.rs +++ b/crates/shirabe/tests/installer_test.rs @@ -42,20 +42,18 @@ use shirabe::util::r#loop::Loop; use shirabe::util::platform::Platform; use shirabe::util::process_executor::ProcessExecutor; use shirabe_class_map_generator::class_map::ClassMap; -use shirabe_external_packages::symfony::console::command::command::Command as SymfonyCommand; -use shirabe_external_packages::symfony::console::command::command::CommandData; -use shirabe_external_packages::symfony::console::input::input_argument::InputArgument; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::input_option::InputOption; -use shirabe_external_packages::symfony::console::input::string_input::StringInput; -use shirabe_external_packages::symfony::console::output::output_interface::{ - OutputInterface, VERBOSITY_NORMAL, -}; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_pcre::preg::Preg; use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex}; use shirabe_semver::VersionParser; use shirabe_semver::constraint::AnyConstraint; +use shirabe_symfony_console::command::command::Command as SymfonyCommand; +use shirabe_symfony_console::command::command::CommandData; +use shirabe_symfony_console::input::input_argument::InputArgument; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::input_option::InputOption; +use shirabe_symfony_console::input::string_input::StringInput; +use shirabe_symfony_console::output::output_interface::{OutputInterface, VERBOSITY_NORMAL}; +use shirabe_symfony_console::output::stream_output::StreamOutput; // removeDirectory of tempComposerHome (a path produced by the unported install pipeline) is not // ported; the cwd management (setUp's chdir(__DIR__) / tearDown's chdir($this->prevCwd)) and the diff --git a/crates/shirabe/tests/io/buffer_io_test.rs b/crates/shirabe/tests/io/buffer_io_test.rs index c33fd804..5036a172 100644 --- a/crates/shirabe/tests/io/buffer_io_test.rs +++ b/crates/shirabe/tests/io/buffer_io_test.rs @@ -2,8 +2,8 @@ use shirabe::io::IOInterfaceImmutable; use shirabe::io::buffer_io::BufferIO; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; #[test] fn test_set_user_inputs() { diff --git a/crates/shirabe/tests/io/console_io_test.rs b/crates/shirabe/tests/io/console_io_test.rs index 15e7100b..c3240ea5 100644 --- a/crates/shirabe/tests/io/console_io_test.rs +++ b/crates/shirabe/tests/io/console_io_test.rs @@ -16,15 +16,15 @@ use shirabe::io::ConsoleIO; use shirabe::io::IOInterfaceImmutable; use shirabe::io::IOInterfaceMutable; use shirabe::io::io_interface::NORMAL; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::console::output::console_output_interface::ConsoleOutputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::console_output::ConsoleOutput; +use shirabe_symfony_console::output::console_output_interface::ConsoleOutputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; /// Builds a ConsoleIO backed by real, side-effect-free Input/Output/QuestionHelper. PHP uses /// PHPUnit mocks here, but for tests that exercise only the authentication map they carry no diff --git a/crates/shirabe/tests/package/version/version_selector_test.rs b/crates/shirabe/tests/package/version/version_selector_test.rs index 16ad5fe2..8a3e44a5 100644 --- a/crates/shirabe/tests/package/version/version_selector_test.rs +++ b/crates/shirabe/tests/package/version/version_selector_test.rs @@ -15,10 +15,10 @@ use shirabe::package::version::VersionSelector; use shirabe::package::version::version_parser::VersionParser; use shirabe::repository::PlatformRepository; use shirabe::repository::RepositorySetInterface; -use shirabe_external_packages::symfony::console::output::output_interface; use shirabe_php_shim::PhpMixed; use shirabe_php_shim::{PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION}; use shirabe_semver::constraint::AnyConstraint; +use shirabe_symfony_console::output::output_interface; mockall::mock! { RepositorySet {} diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs index 65a8872b..0ef36923 100644 --- a/crates/shirabe/tests/plugin/plugin_installer_test.rs +++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs @@ -29,10 +29,10 @@ use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::Catch as _; use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; use shirabe_symfony_process::PhpExecutableFinder; use tempfile::TempDir; diff --git a/crates/shirabe/tests/question/strict_confirmation_question_test.rs b/crates/shirabe/tests/question/strict_confirmation_question_test.rs index f7f79eb6..3e1ae72e 100644 --- a/crates/shirabe/tests/question/strict_confirmation_question_test.rs +++ b/crates/shirabe/tests/question/strict_confirmation_question_test.rs @@ -1,14 +1,12 @@ //! ref: composer/tests/Composer/Test/Question/StrictConfirmationQuestionTest.php use shirabe::question::StrictConfirmationQuestion; -use shirabe_external_packages::symfony::console::helper::question_helper::{ - QuestionHelper, QuestionHelperInterface, -}; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::streamable_input_interface::StreamableInputInterface; -use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::helper::question_helper::{QuestionHelper, QuestionHelperInterface}; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::streamable_input_interface::StreamableInputInterface; +use shirabe_symfony_console::output::output_interface::OutputInterface; +use shirabe_symfony_console::output::stream_output::StreamOutput; const TRUE_ANSWER_REGEX: &str = "/^y(?:es)?$/i"; const FALSE_ANSWER_REGEX: &str = "/^no?$/i"; diff --git a/crates/shirabe/tests/util/http_downloader_test.rs b/crates/shirabe/tests/util/http_downloader_test.rs index f1883721..fcbfd925 100644 --- a/crates/shirabe/tests/util/http_downloader_test.rs +++ b/crates/shirabe/tests/util/http_downloader_test.rs @@ -10,9 +10,9 @@ use shirabe::io::buffer_io::BufferIO; use shirabe::io::io_interface; use shirabe::util::Platform; use shirabe::util::http_downloader::HttpDownloader; -use shirabe_external_packages::symfony::console::output::output_interface::VERBOSITY_NORMAL; use shirabe_php_shim::Catch as _; use shirabe_php_shim::{PHP_EOL, PhpMixed}; +use shirabe_symfony_console::output::output_interface::VERBOSITY_NORMAL; // PHP performs a live HTTP get to assert the URL's user:pass is captured via // setAuthentication. The credential capture happens in `add_job`, before any diff --git a/crates/shirabe/tests/util/process_executor_test.rs b/crates/shirabe/tests/util/process_executor_test.rs index 268bc548..b772c1bc 100644 --- a/crates/shirabe/tests/util/process_executor_test.rs +++ b/crates/shirabe/tests/util/process_executor_test.rs @@ -8,14 +8,14 @@ use shirabe::io::ConsoleIO; use shirabe::io::IOInterface; use shirabe::io::buffer_io::BufferIO; use shirabe::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::console::helper::QuestionHelper; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::console::output::buffered_output::BufferedOutput; -use shirabe_external_packages::symfony::console::output::output_interface::{ +use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim}; +use shirabe_symfony_console::helper::QuestionHelper; +use shirabe_symfony_console::input::array_input::ArrayInput; +use shirabe_symfony_console::input::input_interface::InputInterface; +use shirabe_symfony_console::output::buffered_output::BufferedOutput; +use shirabe_symfony_console::output::output_interface::{ OutputInterface, VERBOSITY_DEBUG, VERBOSITY_NORMAL, }; -use shirabe_php_shim::{PHP_EOL, ob_get_clean, ob_start, trim}; #[test] fn test_execute_captures_output() { |