FMWK-69 Fix condition timeout and improve tests #442
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
roimenashe
commented
Oct 18, 2022
•
roimenashe
commented
- Use count() that are not as-info based in tests (which doesn't exclude deleted record that wasn't removed yet).
- Reduce redundant code executions - use BeforeAll() instead of BeforeEach() when possible.
- Remove blockhound for inactivity (latest version release was on April 2021) - it is also complicates our build and tests.
- Refactor test operations (reactive and non-reactive).
…set (using count() and as-info command behind the scenes). 2. Refactor test operations (reactive and non-reactive).
ijusti
approved these changes
Oct 18, 2022
| protected boolean isEntityClassSetEmpty(Class<?> clazz) { | ||
| Long count = template.count(clazz).block(); | ||
| if (count != null) { | ||
| return count == 0; |
There was a problem hiding this comment.
0 is int
Suggested change
| return count == 0; | |
| return count == 0L; |
There was a problem hiding this comment.
It's completely internal infrastructure for our test flow, just replaced it with different logic (basically a scan and count) because template.count takes too much time due to Aerospike internal delete mechanism which doesn't actually removes the records - only removes the entry from the PK.
Check latest commit.
|
Do not merge yet - working on improving the test flow (currently takes 15min to complete). |
…ead of excluding the objects that was marked for deletion. It takes time for template.count(clazz) to reach 0 after truncate. Revert duration limit back to 10 sec.
…de records for deletion).
… 2021) and it complicates our build and tests. 2. Refactor tests - use BeforeAll over BeforeEach when possible (logically) to reduce tests total execution time.
roimenashe
changed the title
…-timeouts-in-tests # Conflicts: # src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateCountTests.java # src/test/java/org/springframework/data/aerospike/core/AerospikeTemplateFindByQueryTests.java # src/test/java/org/springframework/data/aerospike/core/reactive/ReactiveAerospikeTemplateCountRelatedTests.java # src/test/java/org/springframework/data/aerospike/core/reactive/ReactiveAerospikeTemplateFindByQueryTests.java # src/test/java/org/springframework/data/aerospike/query/QualifierTests.java # src/test/java/org/springframework/data/aerospike/query/reactive/ReactiveQualifierTests.java # src/test/java/org/springframework/data/aerospike/repository/PersonRepositoryQueryTests.java
reugn
approved these changes
Oct 20, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.