search

aerospike / aerospike-client-java

Aerospike Java Client Library
Other
236 stars 212 forks source link

Enhance query engine tests #155

Closed Aloren closed 4 years ago

Aloren commented 4 years ago

use standard assertj assertions to simplify the tests logic

BrianNichols commented 4 years ago

This will appear in the next java client release as well.

BrianNichols commented 4 years ago

I have updated this repo with all previous merged pull requests. This pull request now also has merge conflicts.

Aloren commented 4 years ago

Could you please firstly merge https://github.com/aerospike/aerospike-client-java/pull/154 ? So that I could resolve all conflicts at once.

BrianNichols commented 4 years ago

I did merge #154 into our private repo and updated this public repo yesterday. See public repo commit: https://github.com/aerospike/aerospike-client-java/commit/22ff2f3900382d7b03b04f4c48cabffca08a5e37

Github doesn't show the pull request as merged, but the commit is already there.

BrianNichols commented 4 years ago

Conflicts still exist. Closing pull request.