Improve the build and test times and add Codecov.io #541
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -250,8 +250,8 @@ class CMSContraMapSpec extends WordSpec with Matchers with GeneratorDrivenProper | |
| val minWidth = data1.distinct.size | ||
|
|
||
| forAll( | ||
| (Gen.choose(1, 70), "depth"), | ||
| (Gen.choose(minWidth, 1000), "width"), | ||
| (Gen.choose(Int.MinValue, Int.MaxValue), "seed")) { (depth: Int, width: Int, seed: Int) => | ||
| val cms1: TopCMS[Seq[Byte]] = TopPctCMS.monoid[Seq[Byte]](depth, width, seed, 0.01).create(data1) | ||
| cms1.heavyHitters should be(Set(oneKey, twoKey, threeKey, fourKey, fiveKey)) | ||
|
|
@@ -373,6 +373,9 @@ abstract class CMSTest[K: CMSHasher: FromIntLike] extends WordSpec with Matchers | |
| val EPS = 0.001 | ||
| val SEED = 1 | ||
|
|
||
| private[this] val maxDepth = 70 | ||
| private[this] val maxWidth = 1000 | ||
|
|
||
| // We use TopPctCMS for testing CMSCounting functionality. We argue that because TopPctCMS[K] encapsulates CMS[K] | ||
| // and uses it for all its counting/querying functionality (like an adapter) we can test CMS[K] indirectly through | ||
| // testing TopPctCMS[K]. | ||
|
|
@@ -579,8 +582,8 @@ abstract class CMSTest[K: CMSHasher: FromIntLike] extends WordSpec with Matchers | |
| val minWidth = data1.distinct.size | ||
|
|
||
| forAll( | ||
| (Gen.choose(minDepth, maxDepth), "depth"), | ||
| (Gen.choose(minWidth, maxWidth), "width"), | ||
| (Gen.choose(Int.MinValue, Int.MaxValue), "seed")) { (depth: Int, width: Int, seed: Int) => | ||
| val cms1 = TopPctCMS.monoid[K](depth, width, seed, 0.01).create(data1) | ||
| cms1.heavyHitters should be(Set(1, 2, 3, 4, 5).toK[K]) | ||
|
|
@@ -600,11 +603,11 @@ abstract class CMSTest[K: CMSHasher: FromIntLike] extends WordSpec with Matchers | |
| val data1 = Seq(1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5).toK[K] | ||
|
|
||
| val minDepth = 2 // Use 2 to be on the safe side in case we happen to run into hash collisions | ||
| val minWidth = data1.distinct.size * 4 | ||
|
|
||
| forAll( | ||
| (Gen.choose(minDepth, maxDepth), "depth"), | ||
| (Gen.choose(minWidth, maxWidth), "width"), | ||
| (Gen.choose(Int.MinValue, Int.MaxValue), "seed")) { (depth: Int, width: Int, seed: Int) => | ||
| val cms1 = TopPctCMS.aggregator[K](depth, width, seed, 0.01).apply(data1) | ||
| cms1.heavyHitters should be(Set(1, 2, 3, 4, 5).toK[K]) | ||
|
|
@@ -784,50 +787,30 @@ abstract class CMSTest[K: CMSHasher: FromIntLike] extends WordSpec with Matchers | |
| val minWidth = data1.distinct.size | ||
|
|
||
| forAll( | ||
| (Gen.choose(minDepth, maxDepth), "depth"), | ||
| (Gen.choose(minWidth, maxWidth), "width"), | ||
| (Gen.choose(Int.MinValue, Int.MaxValue), "seed")) { (depth: Int, width: Int, seed: Int) => | ||
| val size = math.abs(seed % 5) + 1 // a number 1 to 5 | ||
| val hh = ((6 - size) to 5).toSet | ||
| val cms = TopNCMS.monoid[K](depth, width, seed, size).create(data1) | ||
| cms.heavyHitters should be(hh.toK[K]) | ||
| } | ||
| } | ||
|
|
||
| "work as an Aggregator when created from a single, small stream" in { | ||
| val data1 = Seq(1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5).toK[K] | ||
|
|
||
| val minDepth = 2 // Use 2 to be on the safe side in case we happen to run into hash collisions | ||
|
There was a problem hiding this comment. Are these being removed because of redundancy? There was a problem hiding this comment. Yes. They are tested by the replaced line (we only check one for each of
|
||
| val minWidth = data1.distinct.size * 2 | ||
|
|
||
| forAll( | ||
| (Gen.choose(minDepth, maxDepth), "depth"), | ||
| (Gen.choose(minWidth, maxWidth), "width"), | ||
| (Gen.choose(Int.MinValue, Int.MaxValue), "seed")) { (depth: Int, width: Int, seed: Int) => | ||
| val size = math.abs(seed % 5) + 1 // a number 1 to 5 | ||
| val hh = ((6 - size) to 5).toSet | ||
| val cms = TopNCMS.aggregator[K](depth, width, seed, size).apply(data1) | ||
| cms.heavyHitters should be(hh.toK[K]) | ||
| } | ||
| } | ||
|
|
||
|
|
||
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use these in the changes to the
Gens above?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a different class and I didn't want to yak shave too much. Just want the minimal change to enable code coverage to work.