Skip to content

Commit 70de44a

Browse files
Gaurav Gandhigandhi-21
Gaurav Gandhi
authored andcommitted
update assertions for tests
1 parent 7f6fc85 commit 70de44a

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,17 +277,17 @@ class CreateReadmeTest {
277277

278278
val readmePath = Paths.get("tstData", "qdoc", "createFlow", "README.md")
279279
val readme = File(readmePath.toUri())
280-
assertFalse(readme.exists())
280+
assertThat(readme).doesNotExist()
281281

282282
val result = executePuppeteerScript(newReadmeDiffViewerTestScript)
283-
assertFalse(result.contains("Error: Test Failed"))
283+
assertThat(result).doesNotContain("Error: Test Failed")
284284

285285
if (result.contains("Error: Test Failed")) {
286286
println("result: $result")
287287
}
288288

289289
val panel = this.ui.x("//div[contains(@class, 'SimpleDiffPanel')]")
290-
assertTrue(panel.present())
290+
assertThat(panel.present()).isTrue()
291291
}
292292
}
293293

ui-tests-starter/tst-243+/software/aws/toolkits/jetbrains/uitests/docTests/createReadmeTests/CreateReadmeWorkspacesTest.kt

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import com.intellij.ide.starter.models.TestCase
1515
import com.intellij.ide.starter.project.LocalProjectInfo
1616
import com.intellij.ide.starter.runner.CurrentTestMethod
1717
import com.intellij.ide.starter.runner.Starter
18+
import org.assertj.core.api.Assertions.assertThat
1819
import org.junit.jupiter.api.AfterAll
19-
import org.junit.jupiter.api.Assertions.assertFalse
20-
import org.junit.jupiter.api.Assertions.assertTrue
2120
import org.junit.jupiter.api.BeforeAll
2221
import org.junit.jupiter.api.BeforeEach
2322
import org.junit.jupiter.api.Test
@@ -87,19 +86,17 @@ class CreateReadmeWorkspacesTest {
8786

8887
val readmePath = Paths.get("tstData", "qdoc", "createFlow", "README.md")
8988
val readme = File(readmePath.toUri())
90-
assertFalse(readme.exists())
89+
assertThat(readme).doesNotExist()
9190

9291
val result = executePuppeteerScript(acceptReadmeTestScript)
93-
assertFalse(result.contains("Error: Test Failed"))
92+
assertThat(result).doesNotContain("Error: Test Failed")
9493
if (result.contains("Error: Test Failed")) {
9594
println("result: $result")
9695
}
9796

9897
val newReadmePath = Paths.get("tstData", "qdoc", "createFlow", "README.md")
9998
val newReadme = File(newReadmePath.toUri())
100-
assertTrue(newReadme.exists())
101-
assertTrue(newReadme.readText().contains("REST"))
102-
assertTrue(newReadme.readText().contains("API"))
99+
assertThat(newReadme).exists().content().contains("REST", "API")
103100
}
104101
}
105102

@@ -132,16 +129,16 @@ class CreateReadmeWorkspacesTest {
132129

133130
val readmePath = Paths.get("tstData", "qdoc", "createFlow", "src", "README.md")
134131
val readme = File(readmePath.toUri())
135-
assertFalse(readme.exists())
132+
assertThat(readme).exists()
136133

137134
val result = executePuppeteerScript(createReadmeSubFolderPreFolderChangeTestScript)
138135
this.ui.robot.pressAndReleaseKey(KeyEvent.VK_RIGHT)
139136
this.ui.robot.enterText("\\/src")
140137
this.ui.robot.pressAndReleaseKey(KeyEvent.VK_ENTER)
141138
val result2 = executePuppeteerScript(createReadmeSubFolderPostFolderChangeTestScript)
142139

143-
assertFalse(result.contains("Error: Test Failed"))
144-
assertFalse(result2.contains("Error: Test Failed"))
140+
assertThat(result).doesNotContain("Error: Test Failed")
141+
assertThat(result2).doesNotContain("Error: Test Failed")
145142

146143
if (result.contains("Error: Test Failed") || result2.contains("Error: Test Failed")) {
147144
println("result: $result")
@@ -150,7 +147,7 @@ class CreateReadmeWorkspacesTest {
150147

151148
val newReadmePath = Paths.get("tstData", "qdoc", "createFlow", "src", "README.md")
152149
val newReadme = File(newReadmePath.toUri())
153-
assertTrue(newReadme.exists())
150+
assertThat(newReadme).exists()
154151
}
155152
}
156153

@@ -183,20 +180,22 @@ class CreateReadmeWorkspacesTest {
183180

184181
val readmePath = Paths.get("tstData", "qdoc", "README.md")
185182
val readme = File(readmePath.toUri())
186-
assertFalse(readme.exists())
183+
assertThat(readme).exists()
187184

188185
val result = executePuppeteerScript(acceptReadmeTestScript)
189-
assertFalse(result.contains("Error: Test Failed"))
186+
assertThat(result).doesNotContain("Error: Test Failed")
190187
if (result.contains("Error: Test Failed")) {
191188
println("result: $result")
192189
}
193190

194191
val newReadmePath = Paths.get("tstData", "qdoc", "README.md")
195192
val newReadme = File(newReadmePath.toUri())
196-
assertTrue(newReadme.exists())
197-
val readmeContents = newReadme.readText()
198-
assertTrue(readmeContents.contains("REST"))
199-
assertTrue(readmeContents.contains("API"))
193+
assertThat(newReadme).exists()
194+
.content()
195+
.contains(
196+
"REST",
197+
"API"
198+
)
200199
}
201200
}
202201

0 commit comments

Comments
 (0)