mirror of
https://github.com/jj-vcs/jj.git
synced 2026-07-07 17:45:22 +08:00
acee40cd5f
Mostly done with OpenCode and Claude Sonnet 4.6 with the following prompt, and reviewed manually: Replace the Result.unwrap with the ? operator in test functions. While doing that, make sure to: * Add TestResult as return type in the test functions where you replace unwrap by the ? operator, and Ok(()) at the end. * Do the replacement only in method with the `#[test]` decorator. * Don't replace unwraps in closures. * Don't replace Option.unwrap. * Be careful to not change the insta snapshot references. * Run the tests each time you're done with a file. * Keep the unwraps that you can't replace with the ? operator. Note that: * You can identify all the Result.unwrap locations with this command: cargo clippy --tests --message-format=short -- -W clippy::unwrap_used 2>&1 | grep / | grep Result | grep <filename> * Begin with the file with the most Result.unwrap in them as shown by this command: cargo clippy --tests --message-format=short -- -W clippy::unwrap_used 2>&1 | grep Result | cut -d: -f1 | sort | uniq -c | sort -nr * Some non test files have inline tests. Before this PR: ❯ cargo clippy --tests --message-format=short -- -W clippy::unwrap_used 2>&1 | grep Result | wc -l 3973 After this PR: ❯ cargo clippy --tests --message-format=short -- -W clippy::unwrap_used 2>&1 | grep Result | wc -l 1064
51 lines
1.6 KiB
Rust
51 lines
1.6 KiB
Rust
// Copyright 2024 The Jujutsu Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
use std::path::Path;
|
|
|
|
use test_case::test_case;
|
|
use testutils::TestRepoBackend;
|
|
use testutils::TestResult;
|
|
use testutils::TestWorkspace;
|
|
|
|
use crate::common::TestEnvironment;
|
|
|
|
#[test_case(TestRepoBackend::Simple ; "simple backend")]
|
|
#[test_case(TestRepoBackend::Git ; "git backend")]
|
|
fn test_root(backend: TestRepoBackend) -> TestResult {
|
|
let test_env = TestEnvironment::default();
|
|
let test_workspace = TestWorkspace::init_with_backend(backend);
|
|
let root = test_workspace.workspace.workspace_root();
|
|
let subdir = root.join("subdir");
|
|
std::fs::create_dir(&subdir)?;
|
|
let output = test_env.run_jj_in(&subdir, ["root"]).success();
|
|
assert_eq!(
|
|
output.stdout.raw(),
|
|
&[root.to_str().unwrap(), "\n"].concat()
|
|
);
|
|
Ok(())
|
|
}
|
|
|
|
#[test]
|
|
fn test_root_outside_a_repo() {
|
|
let test_env = TestEnvironment::default();
|
|
let output = test_env.run_jj_in(Path::new("/"), ["root"]);
|
|
insta::assert_snapshot!(output, @r#"
|
|
------- stderr -------
|
|
Error: There is no jj repo in "."
|
|
[EOF]
|
|
[exit status: 1]
|
|
"#);
|
|
}
|