Initial solution of Integration tests control. #185

miroslavpojer · 2024-04-12T08:33:01Z

'sbt test' now does no run Integration tests
To run IT ot DB tests is needed to call extra command defined in .sbtrc

Depends on #196

- 'sbt test' now does no run Integration tests - To run IT ot DB tests is needed to call extra command defined in .sbtrc

.github/workflows/jacoco_check.yml

.sbtrc

database/src/test/scala/za/co/absa/atum/database/runs/CreateOrUpdateAdditionalDataTest.scala

.sbtrc

server/src/test/scala/za/co/absa/atum/server/api/controller/CheckpointControllerSpec.scala

server/src/test/scala/za/co/absa/atum/server/aws/AwsSecretsProviderSpec.scala

Updated chapter in readme. file.

.sbtrc

.github/workflows/jacoco_check.yml

.github/workflows/build.yml

salamonpavel · 2024-04-16T11:58:38Z

README.md

+
+### Test controls
+
+The project uses the `.sbtrc` [(link)](https://www.scala-sbt.org/1.x/docs/Best-Practices.html#.sbtrc) file to manage and control the execution of integration tests. The Integration tests are the ones with the tag `Integration test.` Below are the commands configured in the `.sbtrc` file to facilitate different testing scenarios:


tag IntegrationTest

Fixed in commit - cb82439.

server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala

...a/za/co/absa/atum/server/api/database/runs/functions/CreatePartitioningIfNotExistsSpec.scala

lsulak · 2024-04-22T09:00:57Z

README.md

+```
+alias test=; testOnly -- -l IntegrationTest
+
+# `-l IntegrationTest`: This switch excludes all tests labeled as `IntegrationTest,` allowing only only executing unit tests.


Suggested change

# `-l IntegrationTest`: This switch excludes all tests labeled as `IntegrationTest,` allowing only only executing unit tests.

# `-l IntegrationTest`: This switch excludes all tests labeled as `IntegrationTest,` allowing only executing unit tests.

Fixed in commit - 3be6f06.

lsulak · 2024-04-22T09:18:47Z

.github/workflows/jacoco_check.yml

@@ -50,7 +50,7 @@ jobs:
      - name: Add coverage to PR


Btw, is this unit test coverage or combined? What does sbt jacoco do?

If it runs sbt test under the hood, which excludes the ITs (I assume this is what's happening, judging by the output of sbt jacoco on my localhost), then it might make sense to update the naming/titles/sentences in the jacoco YAML files - so that things are a bit more explicit & bot comments generated in PRs would reflect that.

Also, please rename this file to something like jacoco_check_agent.yml (we have _server already so it would be more obvious)

Here is the overview:

agent - unit test only (no IT/DB test in module)

model - unit test only (no IT/DB test in module)

database - db test only (no IT/Unit test in module)

server - integration test only (no Unit/DB test in module)

Yes but the naming of the files (potentially also steps) still deserves improving, such as this jacoco_check.yml

Sure, I am open to proposals.
Current naming is trying to be self-descriptive.

so jacoco_check.yml -> jacoco_check_agent.yml / jacoco_check_agent_model.yml❓

It could be done, yes. Byt why?
I would suggest to do future review here after project fixes issue with multiple java version need.

Okay, let's address this outside of this PR.

lsulak

I finished the review for now. The biggest thing I'd like to be changed definitely is the scope of these tags and then few improvements/answers regarding the YML jacoco file(s).

github-actions · 2024-05-14T06:49:11Z

JaCoCo model module code coverage report - scala 2.13.11

Build Failed

github-actions · 2024-05-14T06:49:31Z

JaCoCo server module code coverage report - scala 2.13.11

Overall Project	70.78%	❌

There is no coverage information present for the Files changed

.github/workflows/build.yml

.../atum/server/api/database/runs/functions/CreatePartitioningIfNotExistsIntegrationTests.scala

benedeki · 2024-05-16T22:23:53Z

.sbtrc

+
+# CPS QA types aliases
+# * Unit tests
+alias test=; testOnly *UnitTests


Problem is, that tasks that include testing like assembly don't take aliases into account and run them according to original definition. This creates an IMHO inconsistent behavior.

This problem can be solved by adding this line into module settings in build.sbt.
(assembly / test) := {},

Is that acceptable for modules with Integration tests and external dependencies?

See the commit where with the proposed solution - ed76338

- Added examples how to manage tests in rest of sbt commands (assembly, publish).

lsulak · 2024-05-21T14:13:22Z

build.sbt

-  jacocoExcludes := jacocoProjectExcludes()
+  jacocoExcludes := jacocoProjectExcludes(),
+  (assembly / test) := {},
+  (publish / test) := { (Test / testOnly).toTask(" *UnitTests").value }


why a space here?

Ah, it could be removed.

benedeki · 2024-05-22T10:41:50Z

This item depends on:

~~#193: Drop support of Spark 2.4 #196~~
By Dependent Issues.

# Conflicts: # build.sbt

Initial solution of Integration tests control.

e1ad209

- 'sbt test' now does no run Integration tests - To run IT ot DB tests is needed to call extra command defined in .sbtrc

miroslavpojer self-assigned this Apr 12, 2024

miroslavpojer added 6 commits April 12, 2024 10:47

Debugging file to identify the source of problem.

8b61557

Merge branch 'master' into feature/new-sbt-integration-tests

15b9fcd

Debugging file to identify the source of problem.

79512f9

Debugging file to identify the source of problem.

6ee894e

Debugging file to identify the source of problem.

eb35565

Debugging file to identify the source of problem.

107ba53

miroslavpojer marked this pull request as ready for review April 12, 2024 09:18

miroslavpojer requested review from benedeki, lsulak, TebaleloS, Zejnilovic, dk1844 and salamonpavel as code owners April 12, 2024 09:18

Debugging file to identify the source of problem.

46ff776

Zejnilovic reviewed Apr 12, 2024

View reviewed changes

.github/workflows/jacoco_check.yml Show resolved Hide resolved

.github/workflows/jacoco_check.yml Outdated Show resolved Hide resolved

.sbtrc Outdated Show resolved Hide resolved

benedeki reviewed Apr 14, 2024

View reviewed changes

miroslavpojer added 3 commits April 15, 2024 08:07

Fix review comments.

297057f

Added description of Integration test controls.

5c62f86

Retested solution and removed testDB alias.

464118b

Updated chapter in readme. file.

benedeki reviewed Apr 15, 2024

View reviewed changes

.sbtrc Outdated Show resolved Hide resolved

benedeki reviewed Apr 15, 2024

View reviewed changes

.github/workflows/jacoco_check.yml Show resolved Hide resolved

.github/workflows/build.yml Outdated Show resolved Hide resolved

salamonpavel reviewed Apr 16, 2024

View reviewed changes

server/src/test/scala/za/co/absa/atum/server/api/controller/PartitioningControllerSpec.scala Outdated Show resolved Hide resolved

salamonpavel reviewed Apr 16, 2024

View reviewed changes

...a/za/co/absa/atum/server/api/database/runs/functions/CreatePartitioningIfNotExistsSpec.scala Outdated Show resolved Hide resolved

lsulak reviewed Apr 22, 2024

View reviewed changes

lsulak mentioned this pull request Apr 22, 2024

Feature/118 jacoco it test AbsaOSS/fa-db#123

Merged

- Removed matrix from build.yml.

acc44df

Zejnilovic previously approved these changes May 14, 2024

View reviewed changes

- Test suffixes migrates to plural version.

939d266

miroslavpojer dismissed Zejnilovic’s stale review via 939d266 May 15, 2024 09:58

miroslavpojer requested a review from Zejnilovic May 15, 2024 10:02

lsulak reviewed May 15, 2024

View reviewed changes

.github/workflows/build.yml Show resolved Hide resolved

lsulak reviewed May 15, 2024

View reviewed changes

.../atum/server/api/database/runs/functions/CreatePartitioningIfNotExistsIntegrationTests.scala Outdated Show resolved Hide resolved

lsulak previously approved these changes May 15, 2024

View reviewed changes

- Removed forgotten test env definition.

d36e6af

miroslavpojer dismissed lsulak’s stale review via d36e6af May 16, 2024 09:35

miroslavpojer requested a review from lsulak May 16, 2024 09:40

lsulak previously approved these changes May 16, 2024

View reviewed changes

benedeki added the dependent The item depends on some other open item (Issue or PR) label May 16, 2024

benedeki reviewed May 16, 2024

View reviewed changes

- Renamed one last test file following naming conventions.

ed76338

- Added examples how to manage tests in rest of sbt commands (assembly, publish).

miroslavpojer dismissed lsulak’s stale review via ed76338 May 21, 2024 04:46

miroslavpojer requested review from lsulak and benedeki May 21, 2024 04:53

lsulak reviewed May 21, 2024

View reviewed changes

lsulak previously approved these changes May 21, 2024

View reviewed changes

benedeki removed the dependent The item depends on some other open item (Issue or PR) label May 22, 2024

miroslavpojer added 2 commits May 23, 2024 07:09

Merge branch 'refs/heads/master' into feature/new-sbt-integration-tests

b962730

# Conflicts: # build.sbt

- Applied changes after merge master.

b177140

miroslavpojer dismissed lsulak’s stale review via b177140 May 23, 2024 08:52

benedeki approved these changes May 23, 2024

View reviewed changes

miroslavpojer merged commit cc8892e into master May 23, 2024
7 of 10 checks passed

miroslavpojer deleted the feature/new-sbt-integration-tests branch May 23, 2024 13:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Initial solution of Integration tests control. #185

Initial solution of Integration tests control. #185

miroslavpojer commented Apr 12, 2024 •

edited by benedeki

Loading

salamonpavel Apr 16, 2024

miroslavpojer May 2, 2024

lsulak Apr 22, 2024

miroslavpojer May 2, 2024

lsulak Apr 22, 2024 •

edited

Loading

miroslavpojer May 3, 2024

lsulak May 6, 2024

miroslavpojer May 7, 2024

lsulak May 15, 2024

miroslavpojer May 16, 2024

lsulak May 16, 2024

lsulak left a comment

github-actions bot commented May 14, 2024 •

edited

Loading

github-actions bot commented May 14, 2024 •

edited

Loading

benedeki May 16, 2024

miroslavpojer May 17, 2024

miroslavpojer May 21, 2024

lsulak May 21, 2024

miroslavpojer May 21, 2024

benedeki commented May 22, 2024


		### Test controls

		The project uses the `.sbtrc` [(link)](https://www.scala-sbt.org/1.x/docs/Best-Practices.html#.sbtrc) file to manage and control the execution of integration tests. The Integration tests are the ones with the tag `Integration test.` Below are the commands configured in the `.sbtrc` file to facilitate different testing scenarios:

	# `-l IntegrationTest`: This switch excludes all tests labeled as `IntegrationTest,` allowing only only executing unit tests.
	# `-l IntegrationTest`: This switch excludes all tests labeled as `IntegrationTest,` allowing only executing unit tests.

Initial solution of Integration tests control. #185

Initial solution of Integration tests control. #185

Conversation

miroslavpojer commented Apr 12, 2024 • edited by benedeki Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lsulak Apr 22, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lsulak left a comment

Choose a reason for hiding this comment

github-actions bot commented May 14, 2024 • edited Loading

JaCoCo model module code coverage report - scala 2.13.11

Build Failed

github-actions bot commented May 14, 2024 • edited Loading

JaCoCo server module code coverage report - scala 2.13.11

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

benedeki commented May 22, 2024

miroslavpojer commented Apr 12, 2024 •

edited by benedeki

Loading

lsulak Apr 22, 2024 •

edited

Loading

github-actions bot commented May 14, 2024 •

edited

Loading

github-actions bot commented May 14, 2024 •

edited

Loading