Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Simplify layer setup for integration-tests and reduce to two layers #2339

Merged
merged 9 commits into from Dec 19, 2022

Conversation

seakayone
Copy link
Collaborator

@seakayone seakayone commented Dec 15, 2022

Pull Request Checklist

Task Description/Number

Reduce the number of integration-test layers to two and extract common layers to a single val.

Issue Number: DEV-628

Basic Requirements

Please check if your PR fulfills the following requirements:

  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

  • Bugfix: represents bug fixes
  • Refactor: represents production code refactoring
  • Feature: represents a new feature
  • Documentation: documentation changes (no production code change)
  • Chore: maintenance tasks (no production code change)
  • Style: styles updates (no production code change)
  • Test: all about tests: adding, refactoring tests (no production code change)
  • Other... Please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Does this PR change client-test-data?

  • Yes (don't forget to update the JS-LIB team about the change)
  • No

@codecov
Copy link

codecov bot commented Dec 15, 2022

Codecov Report

Base: 86.68% // Head: 86.48% // Decreases project coverage by -0.19% ⚠️

Coverage data is based on head (21b9044) compared to base (26e9596).
Patch coverage: 8.33% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2339      +/-   ##
==========================================
- Coverage   86.68%   86.48%   -0.20%     
==========================================
  Files         250      257       +7     
  Lines       28252    28315      +63     
==========================================
- Hits        24490    24488       -2     
- Misses       3762     3827      +65     
Impacted Files Coverage Δ
webapi/src/main/scala/org/knora/webapi/Main.scala 0.00% <0.00%> (ø)
...main/scala/org/knora/webapi/config/AppConfig.scala 81.63% <ø> (ø)
.../main/scala/org/knora/webapi/core/HttpServer.scala 100.00% <ø> (ø)
...main/scala/org/knora/webapi/core/HttpServerZ.scala 0.00% <0.00%> (ø)
.../knora/webapi/core/InstrumentationHttpServer.scala 0.00% <0.00%> (ø)
.../knora/webapi/http/handler/ExceptionHandlerZ.scala 0.00% <0.00%> (ø)
...org/knora/webapi/http/status/ApiStatusCodesZ.scala 0.00% <0.00%> (ø)
...nora/webapi/instrumentation/health/HealthApp.scala 0.00% <0.00%> (ø)
.../knora/webapi/instrumentation/index/IndexApp.scala 0.00% <0.00%> (ø)
...api/instrumentation/prometheus/PrometheusApp.scala 0.00% <0.00%> (ø)
... and 3 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@seakayone seakayone self-assigned this Dec 16, 2022
@seakayone seakayone changed the title Wip/improve test setup chore: Simplify layer setup for integration-tests and reduce to two layers Dec 16, 2022
@seakayone seakayone marked this pull request as ready for review December 16, 2022 12:59
Comment on lines +33 to +34
type CommonR0 = ActorSystem with IIIFService with AppConfig
type CommonR = ApiRoutes

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the CommonR0 and CommonR stand for? R is for "Routes", I guess? What about the 0? Could you write this explicitly? It would be clearer, I guess.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The names for the parameters come from the signature of the function which uses it:
def makeSome[R0, R]. I am open for suggestions for a better naming.

@seakayone seakayone merged commit 94836e8 into main Dec 19, 2022
@seakayone seakayone deleted the wip/improve-test-setup branch December 19, 2022 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants