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

WIP - TACKLE268 #122

Closed
wants to merge 11 commits into from
Closed

Conversation

mrizzi
Copy link
Contributor

@mrizzi mrizzi commented Aug 23, 2021

Temporary PR meant to fix the issues from builds in #107.
Not the best way of dealing but the issues are not reproducible locally due to a different test execution order.

carlosthe19916 and others added 11 commits July 9, 2021 10:21
* TACKLE-271: case insensitive headers now allowed in import csv file (#82)

* TACKLE-290 importer native image tests (#88)

* TACKLE-290 importer native image tests

* TACKLE-290: removed userTransactions in tests

* TACKLE-290: convert to use endpoints

* TACKLE-290: convert to use endpoints so NativeImageTests don't fail

* TACKLE-290:inititialise mocks

* TACKLE-290: initialise mocks

* TACKLE-290: add wiremock http server to enable native image tests to call out to remote rest api

* TACKLE-290: tidy up importer test code

* TACKLE-290: increase test coverage for importer

* TACKLE-290: added extra test

* TACKLE-290: test coverage

* TACKLE-290: fix problem with controls services query parameters not being picked up

* TACKLE-290: remove status field from ApplicationImport

* Tackle 290 - Fix native tests (#6)

* Comment tests

* Restart changes

* comment test

* comment test

* comment test

* Working tests

* build tests inside own gh account

* fix ImportServiceTest

* Remove comments

* restore gh workflow

* restore gh workflow

* TACKLE-290: fix merged test to be native-compliant

* TACKLE-290 Removed 'baseUri' and changed 'mp-rest/uri' props (#7)

* TACKLE-290: alter order of ImportServiceTest methods

* TACKLE-290: alter test method ordering

* TACKLE-290 Refactored some tests and WireMock (#8)

Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: Marco Rizzi <[email protected]>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.8.0 to 3.12.0 (#117)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.8.0 to 3.12.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.8.0...v3.12.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump wiremock-jre8 from 2.29.0 to 2.30.1 (#120)

Bumps [wiremock-jre8](https://github.com/tomakehurst/wiremock) from 2.29.0 to 2.30.1.
- [Release notes](https://github.com/tomakehurst/wiremock/releases)
- [Commits](wiremock/wiremock@2.29.0...2.30.1)

---
updated-dependencies:
- dependency-name: com.github.tomakehurst:wiremock-jre8
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump assertj-core from 2.6.0 to 3.20.2 (#76)

Bumps [assertj-core](https://github.com/assertj/assertj-core) from 2.6.0 to 3.20.2.
- [Release notes](https://github.com/assertj/assertj-core/releases)
- [Commits](assertj/assertj@assertj-core-2.6.0...assertj-core-3.20.2)

---
updated-dependencies:
- dependency-name: org.assertj:assertj-core
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump postgresql from 1.15.2 to 1.16.0 (#96)

Bumps [postgresql](https://github.com/testcontainers/testcontainers-java) from 1.15.2 to 1.16.0.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/master/CHANGELOG.md)
- [Commits](testcontainers/testcontainers-java@1.15.2...1.16.0)

---
updated-dependencies:
- dependency-name: org.testcontainers:postgresql
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Maven pom.xml(deps-dev): Bump mockito-core from 3.12.0 to 3.12.1 (#121)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.0 to 3.12.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.12.0...v3.12.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* TACKLE-268 Properly clean data inserted during test execution ('Import-app-8')

Co-authored-by: Mark Brophy <[email protected]>
Co-authored-by: Carlos E. Feria Vila <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	src/test/java/io/tackle/applicationimporter/ImportServiceTest.java
TACKLE-268 Enhancements after the review
@codecov
Copy link

codecov bot commented Aug 23, 2021

Codecov Report

Merging #122 (696ae60) into main (181b593) will increase coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##               main     #122      +/-   ##
============================================
+ Coverage     97.27%   97.32%   +0.04%     
- Complexity      219      220       +1     
============================================
  Files            25       25              
  Lines           441      448       +7     
  Branches         22       23       +1     
============================================
+ Hits            429      436       +7     
  Misses            9        9              
  Partials          3        3              
Impacted Files Coverage Δ
...plicationinventory/entities/ApplicationImport.java 100.00% <ø> (ø)
...e/applicationinventory/services/ImportService.java 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 181b593...696ae60. Read the comment docs.

@mrizzi
Copy link
Contributor Author

mrizzi commented Aug 23, 2021

Closing as last commit fixed the tests execution in GH.

@mrizzi mrizzi closed this Aug 23, 2021
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.

2 participants