GitHub user merrimanr opened a pull request:
https://github.com/apache/metron/pull/909
METRON-1429: SearchIntegrationTest refactor
## Contributor Comments
This PR cleans up SearchIntegrationTest which will make it easier to create
a Solr implementation. Changes include:
- Updated the "all_query_returns_all_results" method in
SearchIntegrationTest to only contain a single test rather than also including
duplicate tests that were moved to their own methods during the ES 5 upgrade
work. Tests that were not duplicated were moved to their own method.
- Removed logic from ElasticsearchSearchIntegrationTest that rewrites guids
without the `-` character. This made the tests confusing because different ids
were being used for validation and is no longer needed.
- Metaalert data was removed and tests involving metaalerts were updated to
use other sensors instead. There is no reason for metaalerts to be included
here as there are other dedicated metaalert integration tests.
- Improved the "get_all_latest_guid" test by using guids from different
sensor types.
All tests should still run after this change.
## Pull Request Checklist
Thank you for submitting a contribution to Apache Metron.
Please refer to our [Development
Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235)
for the complete guide to follow for contributions.
Please refer also to our [Build Verification
Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview)
for complete smoke testing guides.
In order to streamline the review of the contribution we ask you follow
these guidelines and ask you to double check the following:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? If not one needs to
be created at [Metron
Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
- [x] Does your PR title start with METRON-XXXX where XXXX is the JIRA
number you are trying to resolve? Pay particular attention to the hyphen "-"
character.
- [x] Has your PR been rebased against the latest commit within the target
branch (typically master)?
### For code changes:
- [x] Have you included steps to reproduce the behavior or problem that is
being changed or addressed?
- [x] Have you included steps or a guide to how the change may be verified
and tested manually?
- [x] Have you ensured that the full suite of tests and checks have been
executed in the root metron folder via:
```
mvn -q clean integration-test install && build_utils/verify_licenses.sh
```
- [x] Have you written or updated unit tests and or integration tests to
verify your changes?
- [x] If adding new dependencies to the code, are these dependencies
licensed in a way that is compatible for inclusion under [ASF
2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] Have you verified the basic functionality of the build by building
and running locally with Vagrant full-dev environment or the equivalent?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in
which it is rendered by building and verifying the site-book? If not then run
the following commands and the verify changes via
`site-book/target/site/index.html`:
```
cd site-book
mvn site
```
#### Note:
Please ensure that once the PR is submitted, you check travis-ci for build
issues and submit an update to your PR as soon as possible.
It is also recommended that [travis-ci](https://travis-ci.org) is set up
for your personal repository such that your branches are built there before
submitting a pull request.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/merrimanr/incubator-metron METRON-1429
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/909.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #909
----
commit 76455986a14d12ed720a83c091616a1904ffb2b1
Author: merrimanr <merrimanr@...>
Date: 2018-01-24T19:07:46Z
initial commit
commit a29ed14c39a79ce5918212baa9b075706319e4de
Author: merrimanr <merrimanr@...>
Date: 2018-01-24T20:31:11Z
added back metaalert test data
commit 5c6293dd5302cddf3f212a982fed8c2d0ec2e391
Author: merrimanr <merrimanr@...>
Date: 2018-01-24T22:33:53Z
Merge remote-tracking branch 'mirror/master' into METRON-1429
----
---
