Skip to content

Commit

Permalink
finished tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdgeorge4153
mdgeorge4153 committed Feb 28, 2025
1 parent e74fb9f commit ebbc1fa
Show file tree
Hide file tree
Showing 11 changed files with 608 additions and 8 deletions.
16 changes: 8 additions & 8 deletions external-crates/move/crates/move-package/tests/test_sources/implicits/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Expected:
- note difference between situation when `b` has no deps: no dep from `b` to `i2`

```
a ───→ b
a ───→ c
│└────┼┐
│┌────┘│
↓↓ ↓
Expand All @@ -172,21 +172,21 @@ i1 ──→ i2

```
a:
B: b
D: d
b:
I1: i1'
d:
I2: i2a
i1': no deps
i2a: no deps
```

Expected:
- implicits added for `a`
- no implicits added for `b`, but `i1'` is replaced with `i1` because of implicit override in `a`
- note difference between situation when `b` has no deps: no dep from `b` to `i2`
- no implicits added for `d`, but `i2a` is replaced with `i2` because of implicit override in `a`
- note difference between situation when `d` has no deps: no dep from `d` to `i1`

```
a ───→ b
a ───→ d
│└────┐│
│ ││
↓ ↓↓
Expand Down
6 changes: 6 additions & 0 deletions external-crates/move/crates/move-package/tests/test_sources/implicits/c/Move.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "C"
edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move

[dependencies]
I1 = { local = "../i1a", override = true }
6 changes: 6 additions & 0 deletions external-crates/move/crates/move-package/tests/test_sources/implicits/d/Move.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "D"
edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move

[dependencies]
I2 = { local = "../i2a", override = true }
2 changes: 2 additions & 0 deletions ...rates/move/crates/move-package/tests/test_sources/implicits/override_dep_1/Move.implicits
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
I1 = { local = "../i1", override = true }
I2 = { local = "../i2", override = true }
Empty file added ...crates/move/crates/move-package/tests/test_sources/implicits/override_dep_1/Move.resolved
View file
Empty file.
6 changes: 6 additions & 0 deletions ...nal-crates/move/crates/move-package/tests/test_sources/implicits/override_dep_1/Move.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "A"
edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move

[dependencies]
C = { local = "../c" }
286 changes: 286 additions & 0 deletions ...s/move/crates/move-package/tests/test_sources/implicits/override_dep_1/[email protected]
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@
---
source: crates/move-package/tests/test_runner.rs
---
ResolvedGraph {
graph: DependencyGraph {
root_path: "tests/test_sources/implicits/override_dep_1",
root_package_id: "A",
root_package_name: "A",
package_graph: {
"A": [
(
"C",
Outgoing,
),
(
"I1",
Outgoing,
),
(
"I2",
Outgoing,
),
],
"C": [
(
"A",
Incoming,
),
(
"I1",
Outgoing,
),
],
"I1": [
(
"C",
Incoming,
),
(
"A",
Incoming,
),
(
"I2",
Outgoing,
),
],
"I2": [
(
"I1",
Incoming,
),
(
"A",
Incoming,
),
],
},
package_table: {
"C": Package {
kind: Local(
"../c",
),
version: None,
resolver: None,
},
"I1": Package {
kind: Local(
"../i1",
),
version: None,
resolver: None,
},
"I2": Package {
kind: Local(
"../i2",
),
version: None,
resolver: None,
},
},
always_deps: {
"A",
"C",
"I1",
"I2",
},
manifest_digest: "00046EB6A71A0C93A0F85E7AB9B2BDFDA13E48676C184A1057BABD1B3ACE3C27",
deps_digest: "060AD7E57DFB13104F21BE5F5C3759D03F0553FC3229247D9A7A6B45F50D03A3",
},
build_options: BuildConfig {
dev_mode: true,
test_mode: false,
generate_docs: false,
save_disassembly: false,
install_dir: Some(
"ELIDED_FOR_TEST",
),
force_recompilation: false,
lock_file: Some(
"ELIDED_FOR_TEST",
),
fetch_deps_only: false,
skip_fetch_latest_git_deps: false,
default_flavor: None,
default_edition: None,
deps_as_root: false,
silence_warnings: false,
warnings_are_errors: false,
json_errors: false,
additional_named_addresses: {},
lint_flag: LintFlag {
no_lint: false,
lint: false,
},
implicit_dependencies: {
"I1": Internal(
InternalDependency {
kind: Local(
"../i1",
),
subst: None,
digest: None,
dep_override: true,
},
),
"I2": Internal(
InternalDependency {
kind: Local(
"../i2",
),
subst: None,
digest: None,
dep_override: true,
},
),
},
},
package_table: {
"A": Package {
source_package: SourceManifest {
package: PackageInfo {
name: "A",
authors: [],
license: None,
edition: Some(
Edition {
edition: "2024",
release: Some(
"beta",
),
},
),
flavor: None,
custom_properties: {},
},
addresses: None,
dev_address_assignments: None,
build: None,
dependencies: {
"C": Internal(
InternalDependency {
kind: Local(
"../c",
),
subst: None,
digest: None,
dep_override: false,
},
),
},
dev_dependencies: {},
},
package_path: "ELIDED_FOR_TEST",
renaming: {},
resolved_table: {},
source_digest: "ELIDED_FOR_TEST",
},
"C": Package {
source_package: SourceManifest {
package: PackageInfo {
name: "C",
authors: [],
license: None,
edition: Some(
Edition {
edition: "2024",
release: Some(
"beta",
),
},
),
flavor: None,
custom_properties: {},
},
addresses: None,
dev_address_assignments: None,
build: None,
dependencies: {
"I1": Internal(
InternalDependency {
kind: Local(
"../i1a",
),
subst: None,
digest: None,
dep_override: true,
},
),
},
dev_dependencies: {},
},
package_path: "ELIDED_FOR_TEST",
renaming: {},
resolved_table: {},
source_digest: "ELIDED_FOR_TEST",
},
"I1": Package {
source_package: SourceManifest {
package: PackageInfo {
name: "I1",
authors: [],
license: None,
edition: Some(
Edition {
edition: "2024",
release: Some(
"beta",
),
},
),
flavor: None,
custom_properties: {},
},
addresses: None,
dev_address_assignments: None,
build: None,
dependencies: {
"I2": Internal(
InternalDependency {
kind: Local(
"../i2",
),
subst: None,
digest: None,
dep_override: false,
},
),
},
dev_dependencies: {},
},
package_path: "ELIDED_FOR_TEST",
renaming: {},
resolved_table: {},
source_digest: "ELIDED_FOR_TEST",
},
"I2": Package {
source_package: SourceManifest {
package: PackageInfo {
name: "I2",
authors: [],
license: None,
edition: Some(
Edition {
edition: "2024",
release: Some(
"beta",
),
},
),
flavor: None,
custom_properties: {},
},
addresses: None,
dev_address_assignments: None,
build: None,
dependencies: {},
dev_dependencies: {},
},
package_path: "ELIDED_FOR_TEST",
renaming: {},
resolved_table: {},
source_digest: "ELIDED_FOR_TEST",
},
},
}
2 changes: 2 additions & 0 deletions ...rates/move/crates/move-package/tests/test_sources/implicits/override_dep_2/Move.implicits
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
I1 = { local = "../i1", override = true }
I2 = { local = "../i2", override = true }
Empty file added ...crates/move/crates/move-package/tests/test_sources/implicits/override_dep_2/Move.resolved
View file
Empty file.
6 changes: 6 additions & 0 deletions ...nal-crates/move/crates/move-package/tests/test_sources/implicits/override_dep_2/Move.toml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "A"
edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move

[dependencies]
D = { local = "../d" }
Loading

0 comments on commit ebbc1fa

Please sign in to comment.