(#1082) Replace forbidden API calls #1114

vladhss · 2019-04-23T13:25:31Z

This is for #1082
I replaced forbidden API calls in org.cactoos.collection package, updated to-do.

codecov-io · 2019-04-23T13:31:11Z

Codecov Report

Merging #1114 into master will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master    #1114   +/-   ##
=========================================
  Coverage     88.77%   88.77%           
  Complexity     1588     1588           
=========================================
  Files           275      275           
  Lines          3946     3946           
  Branches        214      214           
=========================================
  Hits           3503     3503           
  Misses          390      390           
  Partials         53       53

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b74f80c...622165a. Read the comment docs.

0crat · 2019-04-23T13:31:40Z

Job #1114 is now in scope, role is REV

0crat · 2019-04-23T13:44:46Z

This pull request #1114 is assigned to @ilyakharlamov /z, here is why; the budget is 15 minutes, see §4; please, read §27 and when you decide to accept the changes, inform @llorllale /z (the architect) right in this ticket; if you decide that this PR should not be accepted ever, also inform the architect; this blog post will help you understand what is expected from a code reviewer; there will be no monetary reward for this job

ilyakharlamov · 2019-04-23T14:16:27Z

src/test/java/org/cactoos/collection/BehavesAsCollection.java

@@ -62,26 +62,52 @@ public BehavesAsCollection(final E item) {
    @SuppressWarnings({ "unchecked", "PMD.ClassCastExceptionWithToArray" })
    public boolean matchesSafely(final Collection<E> col) {
        MatcherAssert.assertThat(
-            col, new IsCollectionContaining<>(new IsEqual<>(this.sample))
+            "Must contain item",


Even though MatcherAssert.assertThat is still used, we are in transition to OO/Junit5 new Assertion for all the new code added.
Please use new Assertion<>().affirm()

ilyakharlamov · 2019-04-23T14:17:18Z

src/test/java/org/cactoos/collection/FilteredTest.java

@@ -54,6 +54,7 @@ public void behavesAsCollection() throws Exception {
    @Test
    public void filterList() {
        MatcherAssert.assertThat(
+            "Length must change",


new Assertion<>().affirm()

@umbrah message should be "length equal to number of items matching filter"

@umbrah actually I don't understand what the difference is between this test and the size() test below. I think this one can be deleted

ilyakharlamov · 2019-04-23T14:19:00Z

src/test/java/org/cactoos/collection/StickyTest.java

@@ -79,6 +83,7 @@ public void decoratesArray() throws Exception {
    @Test
    public void testEmpty() {
        MatcherAssert.assertThat(
+            "Must be empty",


new Assertion<>().affirm()

ilyakharlamov · 2019-04-23T14:20:30Z

src/test/java/org/cactoos/collection/TailOfTest.java

-            Matchers.contains(
-                "three",
-                "four"
+            new IsCollectionContaining<>(


throws Exception is not needed here

vladhss · 2019-04-23T15:22:14Z

@ilyakharlamov I replaced all MatcherAssert.assertThat with new Assertion<>().affirm() and removed throws Exception where it is not needed, please check

ilyakharlamov · 2019-04-23T16:43:46Z

@llorllale it's good to merge

llorllale · 2019-04-23T23:18:28Z

src/test/java/org/cactoos/collection/HeadOfTest.java

-                "two",
-                "three"
+            new IsCollectionContaining<>(
+                new AnyOf<>(


@Umbrah are you sure the logic is preserved here? Why not use AllOf?

llorllale · 2019-04-23T23:19:06Z

src/test/java/org/cactoos/collection/BehavesAsCollection.java

+        new Assertion<>(
+            "Must contain item",
+            () -> col,
+            new IsCollectionContaining<>(


@umbrah can't you use HasValues?

llorllale · 2019-04-23T23:20:42Z

src/test/java/org/cactoos/collection/BehavesAsCollection.java

+        new Assertion<>(
+            "Size must be more than 0",
+            () -> col,
+            new IsCollectionWithSize<>(


@umbrah HasSize

llorllale · 2019-04-23T23:20:54Z

src/test/java/org/cactoos/collection/BehavesAsCollection.java

+            () -> new ListOf<>(
+                (E[]) col.toArray()
+            ),
+            new IsCollectionContaining<>(


@umbrah HasValues

llorllale · 2019-04-23T23:21:08Z

src/test/java/org/cactoos/collection/BehavesAsCollection.java

+        new Assertion<>(
+            "Array from collection must contain item",
+            () -> new ListOf<>(array),
+            new IsCollectionContaining<>(


@umbrah HasValues

llorllale · 2019-04-23T23:25:33Z

src/test/java/org/cactoos/collection/FilteredTest.java

-            new Filtered<String>(
+    public void size() {
+        new Assertion<>(
+            "Size must change",


@umbrah message must be "size is equal to number of items matching the filter"

llorllale · 2019-04-23T23:28:12Z

src/test/java/org/cactoos/collection/ReversedTest.java

-            Matchers.arrayContaining(4, 3, 2, 1)
-        );
+            new IsArrayContaining<>(
+                new AnyOf<>(


@umbrah AllOf?

llorllale · 2019-04-23T23:28:35Z

src/test/java/org/cactoos/collection/ReversedTest.java

-            Matchers.arrayContaining(5, 4, 3, 2, 1)
-        );
+            new IsArrayContaining<>(
+                new AnyOf<>(


@umbrah AllOf?

@Umbrah better yet, HasValues

llorllale · 2019-04-23T23:29:55Z

src/test/java/org/cactoos/collection/SkippedTest.java

-            Matchers.contains(
-                "three",
-                "four"
+            new IsCollectionContaining<>(


@umbrah HasValues

llorllale · 2019-04-23T23:30:47Z

@umbrah see above.

Basically I worry that the logic may not have translated correctly into the new refactored code. Also, take a look at the available matchers from cactoos-matchers - will probably make your life easier in most cases.

vladhss · 2019-04-24T11:45:41Z

@llorllale The logic was incorrect, I updated all usages of IsCollectionContaining<>(AnyOf<>(...)) with AllOf<>(IsCollectionContaining<>(...)). I cannot use HasValues and HasSize as we do not have it in last published version of cactoos-matchers. Please check.

llorllale · 2019-04-25T00:59:49Z

@rultor merge

rultor · 2019-04-25T01:00:34Z

@rultor merge

@llorllale OK, I'll try to merge now. You can check the progress of the merge here

rultor · 2019-04-25T01:19:00Z

@rultor merge

@llorllale Done! FYI, the full log is here (took me 18min)

0crat · 2019-04-25T01:41:21Z

Job was finished in 35 hours, bonus for fast delivery is possible (see §36)

0crat · 2019-04-25T01:45:40Z

@sereshqua /z please review this job completed by @ilyakharlamov /z, as in §30; the job will be fully closed and all payments will be made when the quality review is completed

0crat · 2019-04-25T01:47:48Z

Job #1114 is not in the agenda of @ilyakharlamov /z, can't inspect

0crat · 2019-04-25T01:49:47Z

The job #1114 is now out of scope

0crat · 2019-04-25T01:50:59Z

Payment to ARC for a closed pull request, as in §28: +10 point(s) just awarded to @llorllale /z

sereshqua · 2019-04-25T03:47:19Z

@0crat quality good

0crat · 2019-04-25T03:57:06Z

Order was finished, quality is "good": +25 point(s) just awarded to @ilyakharlamov /z

0crat · 2019-04-25T03:57:18Z

Quality review completed: +4 point(s) just awarded to @sereshqua /z

0crat added the scope label Apr 23, 2019

ilyakharlamov suggested changes Apr 23, 2019

View reviewed changes

llorllale reviewed Apr 23, 2019

View reviewed changes

(#1082) Replace forbidden API calls

622165a

rultor merged commit 622165a into yegor256:master Apr 25, 2019

0crat removed the scope label Apr 25, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(#1082) Replace forbidden API calls #1114

(#1082) Replace forbidden API calls #1114

vladhss commented Apr 23, 2019

codecov-io commented Apr 23, 2019 •

edited

Loading

0crat commented Apr 23, 2019

0crat commented Apr 23, 2019

ilyakharlamov Apr 23, 2019

ilyakharlamov Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

ilyakharlamov Apr 23, 2019

ilyakharlamov Apr 23, 2019

vladhss commented Apr 23, 2019

ilyakharlamov commented Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale Apr 23, 2019

llorllale commented Apr 23, 2019

vladhss commented Apr 24, 2019

llorllale commented Apr 25, 2019

rultor commented Apr 25, 2019

rultor commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

sereshqua commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

(#1082) Replace forbidden API calls #1114

(#1082) Replace forbidden API calls #1114

Conversation

vladhss commented Apr 23, 2019

codecov-io commented Apr 23, 2019 • edited Loading

Codecov Report

0crat commented Apr 23, 2019

0crat commented Apr 23, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vladhss commented Apr 23, 2019

ilyakharlamov commented Apr 23, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

llorllale commented Apr 23, 2019

vladhss commented Apr 24, 2019

llorllale commented Apr 25, 2019

rultor commented Apr 25, 2019

rultor commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

sereshqua commented Apr 25, 2019

0crat commented Apr 25, 2019

0crat commented Apr 25, 2019

codecov-io commented Apr 23, 2019 •

edited

Loading