Migrate tests to Junit5 + AssertJ by rosolko · Pull Request #757 · selenide/selenide

rosolko · 2018-06-27T16:51:33Z

Proposed changes

Introduce BrowserStrategyExtension, ScreenShooterExtension, SoftAssertsExtension, TextReportExtension and test MockWebDriverExtension extensions as port of Junit4 rules.

Still not sure if we need to save old Junit4 test SoftAssertJUnitTest that ignored for a long time.
Also this test requred to save old LegacyIntegrationTest base test.
As solution I propose to delete this methods as test doesn't run.

Note1: Squash commits until merge.

Note2: Also I propose to move Junit4 rules and Junit5 extensions to modules. So no dependencies confuse facing.

Update: Ignored junit4 rule test replaced with documentation.

Checklist

Checkstyle and unit tests pass locally with my changes by running gradle check chrome htmlunit command
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

This reverts commit 4b1cb7e

This reverts commit eb4bb28

This reverts commit 7b3db81

# Conflicts: # src/test/java/com/codeborne/selenide/ex/ListSizeMismatchTest.java # src/test/java/com/codeborne/selenide/ex/TextMismatchTest.java # src/test/java/com/codeborne/selenide/webdriver/RemoteDriverFactoryHeadlessOptionsTest.java

BorisOsipov · 2018-06-27T17:14:49Z

why do you choice AssertJ? what was wrong with hamcrest?

vinogradoff · 2018-06-27T17:23:08Z

Actually hamcrest was bundled with Junit4, that was the reason for me to prefer it over AssertJ. Junit 5 bundles none of them, so now the choice is tougher, because in any case you add extra dependency. I also like AssertJ a bit more :) Viele Grüße Alexei Vinogradov

…

On 27. Juni 2018 at 19:14:52, Boris Osipov ***@***.***) wrote: why do you choice AssertJ? what was wrong with hamcrest? — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#757 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGQ4YNrcJxZ5bXdNmMybCgUDJhjkpokFks5uA72MgaJpZM4U6DB9> .

BorisOsipov · 2018-06-27T17:37:23Z

+/*
+ * Copyright 2018 Aliaksandr Rasolka
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");


Selenide is licensed by MIT. Why we have here Apache 2?

Oops. Sorry about that. Copied from another project.

rosolko · 2018-06-27T18:39:15Z

@BorisOsipov
For first hamcrest for now development really slow.
For second hamcrest going from junit4 and in assert expected going before actual so it's really confusing.
Also assertj provide more fluent api and contains a lot of smart assertions for example - exceptions.
As it's dsl - IDE autocomplete asserts and possible asserts.
Less imports.
More natural and intuitive asserts.
Good articles related:
https://professional-practical-programmer.com/2016/06/26/assert-j/
And:
http://randomthoughtsonjavaprogramming.blogspot.com/2017/03/assertj-vs-hamcrest.html

vinogradoff · 2018-06-27T18:46:08Z

+ * @author Aliaksandr Rasolka
+ * @since 4.12.2
+ */
+public class UnitTest implements WithAssertions {


I don't understand what the metaphor should stand behind this class.
In any case, it should not appear in the main package of selenide, because as far as I know some of Selenide users - there will be many of them trying to use this class in every crazy and terrible way they can find :)

Remove all hamcrest using. Drop legacy integration test with junit4 rules. Remove junit vintage engine. Remove junit4 video recorder. Remove UnitTest class. Use direct implements instead. Add soft assert rule documentation.

# Conflicts: # src/test/java/com/codeborne/selenide/impl/DownloadFileWithProxyServerTest.java # src/test/java/integration/FileDownloadViaHttpGetTest.java # src/test/java/integration/FileDownloadViaProxyTest.java # src/test/java/integration/LocalHttpServer.java # src/test/resources/page_with_uploads.html

# Conflicts: # src/test/java/com/codeborne/selenide/ElementsCollectionTest.java # src/test/java/com/codeborne/selenide/impl/BySelectorCollectionTest.java # src/test/java/com/codeborne/selenide/impl/FilteringCollectionTest.java # src/test/java/com/codeborne/selenide/impl/HeadOfCollectionTest.java # src/test/java/com/codeborne/selenide/impl/LastCollectionElementTest.java # src/test/java/com/codeborne/selenide/impl/TailOfCollectionTest.java # src/test/java/integration/CollectionWaitTest.java

asolntsev · 2018-07-14T16:25:56Z

  id 'checkstyle'
  id 'com.github.spotbugs' version '1.6.2'
  id 'org.sonarqube' version '2.6.2'
+  id 'com.github.ben-manes.versions' version '0.20.0'


What is this for?

asolntsev · 2018-07-14T16:27:31Z

+ * @author Aliaksandr Rasolka
+ * @since 4.12.2
+ */
+public class BrowserStrategyExtension implements AfterAllCallback {


Add javadoc with usage sample.

It's not clear from javadoc, is this "browser per class" or "browser per method"?

asolntsev · 2018-07-14T16:29:51Z

+
+  /**
+   * Initialize default screen shooter extension with disabled successful tests capture.
+   */


remove useless javadoc

call this(false)

asolntsev · 2018-07-14T16:30:06Z

+public class ScreenShooterExtension implements BeforeAllCallback, AfterEachCallback, AfterAllCallback {
+  private static final Logger log = Logger.getLogger(ScreenShooterExtension.class.getName());
+
+  private boolean captureSuccessfulTests;


make the field final

asolntsev · 2018-07-14T16:30:39Z

+   * @return ErrorsCollector instance
+   *
+   * @see ErrorsCollector
+   */


remove useless javadoc

asolntsev · 2018-07-14T16:31:03Z

+   * Used during extension registration.
+   *
+   * @see ErrorsCollector
+   */


instead of useless javadoc, please add a code sample: how to use this class?

Fix-up javadoc for extensions.

rosolko · 2018-07-16T20:25:49Z

@asolntsev All issues were fixed.

rosolko added 30 commits June 8, 2018 14:11

Migrate to build stages

4b1cb7e

Revert "Migrate to build stages"

e2324ff

This reverts commit 4b1cb7e

Merge branch 'master' of https://github.com/codeborne/selenide

f9c49b1

Merge branch 'master' of https://github.com/codeborne/selenide

6a96967

Migrate integration tests to junit5

154f1c1

Migrate all tests to junit5

5ea2aae

Migrate collections unit tests to assertj.

eb4bb28

Revert "Migrate collections unit tests to assertj."

7b3db81

This reverts commit eb4bb28

Revert "Revert "Migrate collections unit tests to assertj.""

2e90a26

This reverts commit 7b3db81

Update assertj asserts using for collection unit tests.

fb82d74

Update assertj asserts using for commands and conditions unit tests.

5cddefb

Update assertj asserts using for exception unit tests.

659dda7

Update assertj asserts using for log events unit tests.

099d5c9

Update assertj asserts using for proxy unit tests.

5e3cd97

Update assertj asserts using for webdriver unit tests.

9a70027

Update assertj asserts using for base unit tests.

8835cee

Update assertj asserts using for impl unit tests.

33bbed6

Update assertj asserts using for grid integration tests.

a14f6a8

Fix up log events and testng unit tests.

de94404

Migrate to assertj commands, proxy and some core integration tests.

c326a0d

Migrate to assertj more core integration tests.

567c316

Migrate to assertj more core integration tests.

7e964f2

Migrate to assertj more core integration tests.

c1353fd

Migrate to assertj more core integration tests.

7a73651

Fix minor issues.

e0e48a4

Remove unused dependencies.

f54b63f

Move video recorder version to ext block.

07e2a13

Merge branch 'master' of https://github.com/codeborne/selenide

86d50c5

Remove debug parameters for chrome and firefox test tasks.

51b0482

Merge branch 'master' into junit5

83582e3

# Conflicts: # src/test/java/com/codeborne/selenide/ex/ListSizeMismatchTest.java # src/test/java/com/codeborne/selenide/ex/TextMismatchTest.java # src/test/java/com/codeborne/selenide/webdriver/RemoteDriverFactoryHeadlessOptionsTest.java

Resolve merge conflicts against master.

d664f53

rosolko requested review from BorisOsipov and asolntsev June 27, 2018 16:51

Fix migration issue.

266356e

BorisOsipov reviewed Jun 27, 2018

View reviewed changes

Remove invalid file header license.

97ae8a8

vinogradoff reviewed Jun 27, 2018

View reviewed changes

rosolko added 10 commits June 28, 2018 10:10

Remove all junit4 tests.

248b658

Remove all hamcrest using. Drop legacy integration test with junit4 rules. Remove junit vintage engine. Remove junit4 video recorder. Remove UnitTest class. Use direct implements instead. Add soft assert rule documentation.

Simplify integration test by merging set-up methods to one.

ed98ca0

Merge remote-tracking branch 'origin/master'

ce1ab80

Merge branch 'master' of https://github.com/codeborne/selenide

e662dec

Merge branch 'master' of https://github.com/codeborne/selenide

5aae8a1

Resole master merge conflicts.

e1edafb

Merge branch 'master' of https://github.com/codeborne/selenide

0197804

Fix some tests after merge.

fd9a21c

BorisOsipov approved these changes Jul 14, 2018

View reviewed changes

asolntsev requested changes Jul 14, 2018

View reviewed changes

rosolko added 3 commits July 15, 2018 19:13

Remove version plugin.

a41cbe7

Fix-up javadoc for extensions.

Fix checkstyle with suppression for junit5 package.

9705548

Made junit4 and hamcrest package illegal.

d953718

asolntsev approved these changes Jul 17, 2018

View reviewed changes

asolntsev added this to the 4.12.3 milestone Jul 17, 2018

asolntsev merged commit 994c263 into selenide:master Jul 17, 2018

rosolko deleted the junit5 branch July 18, 2018 06:26

Conversation

rosolko commented Jun 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes

Checklist

Uh oh!

BorisOsipov commented Jun 27, 2018

Uh oh!

vinogradoff commented Jun 27, 2018 via email

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rosolko commented Jun 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rosolko commented Jul 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

rosolko commented Jun 27, 2018 •

edited

Loading

rosolko commented Jun 27, 2018 •

edited

Loading

rosolko commented Jul 16, 2018 •

edited

Loading