Skip to content

Commit b2acbc4

Browse files
committed
Fix illegal Windows filesystem character
Windows does not allow the : character to be used in paths.
1 parent 107fce3 commit b2acbc4

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorImplTest.kt

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ class AffectedModuleDetectorImplTest {
2121
@JvmField
2222
val attachLogsRule = AttachLogsTestRule()
2323
private val logger = attachLogsRule.logger
24+
2425
@Rule
2526
@JvmField
2627
val tmpFolder = TemporaryFolder()
28+
2729
@Rule
2830
@JvmField
2931
val tmpFolder2 = TemporaryFolder()
@@ -43,10 +45,10 @@ class AffectedModuleDetectorImplTest {
4345
private lateinit var p12: Project
4446
private lateinit var p13: Project
4547
private val pathsAffectingAllModules = setOf(
46-
"tools/android/buildSrc",
47-
"android/gradlew",
48-
"android/gradle",
49-
"dbx/core/api/"
48+
convertToFilePath("tools", "android", "buildSrc"),
49+
convertToFilePath("android", "gradlew"),
50+
convertToFilePath("android", "gradle"),
51+
convertToFilePath("dbx", "core", "api")
5052
)
5153
private lateinit var affectedModuleConfiguration: AffectedModuleConfiguration
5254

@@ -81,18 +83,21 @@ class AffectedModuleDetectorImplTest {
8183
8284
*/
8385

86+
// Root projects
8487
root = ProjectBuilder.builder()
8588
.withProjectDir(tmpDir)
8689
.withName("root")
8790
.build()
8891
// Project Graph expects supportRootFolder.
89-
(root.properties.get("ext") as ExtraPropertiesExtension).set("supportRootFolder", tmpDir)
92+
(root.properties["ext"] as ExtraPropertiesExtension).set("supportRootFolder", tmpDir)
9093
root2 = ProjectBuilder.builder()
9194
.withProjectDir(tmpDir2)
9295
.withName("root2/ui")
9396
.build()
9497
// Project Graph expects supportRootFolder.
95-
(root2.properties.get("ext") as ExtraPropertiesExtension).set("supportRootFolder", tmpDir2)
98+
(root2.properties["ext"] as ExtraPropertiesExtension).set("supportRootFolder", tmpDir2)
99+
100+
// Library modules
96101
p1 = ProjectBuilder.builder()
97102
.withProjectDir(tmpDir.resolve("p1"))
98103
.withName("p1")
@@ -104,29 +109,29 @@ class AffectedModuleDetectorImplTest {
104109
.withParent(root)
105110
.build()
106111
p3 = ProjectBuilder.builder()
107-
.withProjectDir(tmpDir.resolve("p1:p3"))
112+
.withProjectDir(tmpDir.resolve("p1/p3"))
108113
.withName("p3")
109114
.withParent(p1)
110115
.build()
111116
val p3config = p3.configurations.create("p3config")
112117
p3config.dependencies.add(p3.dependencies.project(mutableMapOf("path" to ":p1")))
113118
p4 = ProjectBuilder.builder()
114-
.withProjectDir(tmpDir.resolve("p1:p3:p4"))
119+
.withProjectDir(tmpDir.resolve("p1/p3/p4"))
115120
.withName("p4")
116121
.withParent(p3)
117122
.build()
118123
val p4config = p4.configurations.create("p4config")
119124
p4config.dependencies.add(p4.dependencies.project(mutableMapOf("path" to ":p1:p3")))
120125
p5 = ProjectBuilder.builder()
121-
.withProjectDir(tmpDir.resolve("p2:p5"))
126+
.withProjectDir(tmpDir.resolve("p2/p5"))
122127
.withName("p5")
123128
.withParent(p2)
124129
.build()
125130
val p5config = p5.configurations.create("p5config")
126131
p5config.dependencies.add(p5.dependencies.project(mutableMapOf("path" to ":p2")))
127132
p5config.dependencies.add(p5.dependencies.project(mutableMapOf("path" to ":p1:p3")))
128133
p6 = ProjectBuilder.builder()
129-
.withProjectDir(tmpDir.resolve("p1:p3:p6"))
134+
.withProjectDir(tmpDir.resolve("p1/p3/p6"))
130135
.withName("p6")
131136
.withParent(p3)
132137
.build()
@@ -152,6 +157,8 @@ class AffectedModuleDetectorImplTest {
152157
.withName("benchmark")
153158
.withParent(root)
154159
.build()
160+
161+
// UI modules
155162
p12 = ProjectBuilder.builder()
156163
.withProjectDir(tmpDir2.resolve("compose"))
157164
.withName("compose")
@@ -630,6 +637,7 @@ class AffectedModuleDetectorImplTest {
630637
)
631638
)
632639
}
640+
633641
@Test
634642
fun changeInNormalOnlyDependent_normalBuild() {
635643
val detector = AffectedModuleDetectorImpl(

0 commit comments

Comments
 (0)