This repository was archived by the owner on Aug 20, 2025. It is now read-only.
METRON-2172 Solr Updates Not Tested in Integration Test #1465
Conversation
This file contains hidden or 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
mmiklavc
reviewed
Jul 18, 2019
| } | ||
|
|
||
|
|
||
| private SolrDocument createSolrDocument(String sensorType, Long timestamp) { |
Contributor
There was a problem hiding this comment.
Thank you for this - simple types like this should not be mocked. Good improvement.
mmiklavc
reviewed
Jul 18, 2019
| solrDocument.addField(Constants.GUID, UUID.randomUUID().toString()); | ||
| solrDocument.addField(Constants.SENSOR_TYPE, sensorType); | ||
| solrDocument.addField(Constants.Fields.TIMESTAMP.getName(), timestamp); | ||
| solrDocument.addField("ip_src_addr", "192.168.1.1"); |
Contributor
There was a problem hiding this comment.
Constants.Fields.SRC_ADDR
mmiklavc
reviewed
Jul 18, 2019
| * as maps, so they look the same when validation occurs in the integration tests. | ||
| * @param fields | ||
| */ | ||
| protected static void reformatComments(Map<String, Object> fields) { |
Contributor
There was a problem hiding this comment.
How about normalizeCommentsAsMap for a name?
Contributor
Author
There was a problem hiding this comment.
That is more descriptive. Done.
Contributor
|
Looks pretty good. A couple small nits and I think this is good to go. |
Contributor
|
+1 thanks @nickwallen |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
The
SolrUpdateIntegrationTestis not testing that theSolrDaocan update and retrieve values. This fix is similar to what was done for Elasticsearch in #1451.This replaces #1454 which was a more involved refactor that fixed some issues with code duplication and provided additional unit tests. I am going to break-off just the bare minimum of what we need to fix the broken tests, rather than fix and refactor in the same PR.
What?
This gap in the integration test is hiding a couple bugs.
A timestamp is not being populated in the documents returned from Solr.
The integration test is not accounting for the fact that comments are serialized differently when written to Solr versus Elasticsearch. When comments are written to Solr, they are serialized as a list of JSON strings. When comments are written to Elasticsearch, they are serialized as a list of maps.
Why?
These problems arise because of the way the test is setup. Instead of directly testing a
SolrDaothis test runs against aMultiIndexDaoinitialized with both aSolrDaoand anHBaseDao. On retrievals theMultIndexDaowill return the document from whichever index responds first.With the current test setup, the underlying
SolrDaowill never retrieve the document that the test case is expecting. In all cases where the test passes, the document is actually being returned from theHBaseDaowhich is actually just interacting with a mock backend. The test needs to actually test that we can update and retrieve documents from Elasticsearch.Changes
The
SolrUpdateIntegrationTestwas changed so that it specifically tests aSolrDao.The
UpdateIntegrationTestwas changed so that it can handle comments stored as either strings or maps. This allows the same integration tests to continue to work when run against either Solr or Elasticsearch.Acceptance Testing
Validate against Elasticsearch.
Validate against Solr.
Pull Request Checklist