Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(#20) Cleanup matcher #227

Merged
merged 1 commit into from Feb 14, 2021
Merged

Conversation

victornoel
Copy link
Collaborator

This is for #20 that was incorrectly closed.

@codecov
Copy link

codecov bot commented Feb 13, 2021

Codecov Report

Merging #227 (ce70d22) into master (7364167) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #227      +/-   ##
============================================
+ Coverage     98.83%   98.86%   +0.02%     
- Complexity      142      147       +5     
============================================
  Files            28       28              
  Lines           343      352       +9     
  Branches          4        7       +3     
============================================
+ Hits            339      348       +9     
  Misses            4        4              
Impacted Files Coverage Δ Complexity Δ
...ava/org/llorllale/cactoos/matchers/HasContent.java 100.00% <ø> (ø) 9.00 <0.00> (ø)
...va/org/llorllale/cactoos/matchers/HasProperty.java 100.00% <ø> (ø) 7.00 <0.00> (ø)
...rg/llorllale/cactoos/matchers/MatcherEnvelope.java 100.00% <100.00%> (ø) 4.00 <2.00> (ø)
...n/java/org/llorllale/cactoos/matchers/Matches.java 100.00% <100.00%> (ø) 4.00 <1.00> (+1.00)
.../org/llorllale/cactoos/matchers/MatchesBefore.java 100.00% <100.00%> (ø) 4.00 <2.00> (+1.00)
.../org/llorllale/cactoos/matchers/RunsInThreads.java 87.50% <100.00%> (+4.89%) 8.00 <2.00> (+3.00)
...in/java/org/llorllale/cactoos/matchers/Throws.java 100.00% <100.00%> (ø) 7.00 <0.00> (ø)

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 7364167...ce70d22. Read the comment docs.

@victornoel victornoel force-pushed the cleanup-matcher branch 2 times, most recently from a940952 to aabcfa7 Compare February 13, 2021 18:46
Copy link
Contributor

@baudoliver7 baudoliver7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victornoel Please, see comments below.

@@ -46,7 +47,7 @@
* @since 0.24
* @checkstyle JavadocMethodCheck (500 lines)
*/
public final class RunsInThreads<T> extends TypeSafeMatcher<Func<T, Boolean>> {
public final class RunsInThreads<T> extends TypeSafeDiagnosingMatcher<Func<? super T, Boolean>> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victornoel I think it isn't necessary to use ? super T in TypeSafeDiagnosingMatcher<Func<? super T, Boolean>>. Just T would be enough.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@baudoliver7 yep, I suppose it's not really needed here, I will remove it to not make things over complex

@@ -58,41 +54,15 @@ void matches() {
* Gives negative testing result for the invalid arguments.
*/
@Test
void matchStatus() {
void mismatches() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victornoel What about the match case.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@baudoliver7 I will suppose you mean testing Matches using Matches? it's a good idea

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@victornoel
Copy link
Collaborator Author

@baudoliver7 thank you, it's done

@baudoliver7
Copy link
Contributor

@victornoel thx, looks good to me :)

@victornoel
Copy link
Collaborator Author

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

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

@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

@victornoel Oops, I failed. You can see the full log here (spent 4min)

Please refer to dump files (if any exist) [date].dump, [date]-jvmRun[N].dump and [date].dumpstream.\u001b[m\u001b[m
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:215\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:156\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:148\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (\u001b[1mLifecycleModuleBuilder.java:117\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (\u001b[1mLifecycleModuleBuilder.java:81\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (\u001b[1mSingleThreadedBuilder.java:56\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleStarter.execute (\u001b[1mLifecycleStarter.java:128\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.doExecute (\u001b[1mDefaultMaven.java:305\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.doExecute (\u001b[1mDefaultMaven.java:192\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.execute (\u001b[1mDefaultMaven.java:105\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.execute (\u001b[1mMavenCli.java:956\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.doMain (\u001b[1mMavenCli.java:288\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.main (\u001b[1mMavenCli.java:192\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.NativeMethodAccessorImpl.invoke0 (\u001b[1mNative Method\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.NativeMethodAccessorImpl.invoke (\u001b[1mNativeMethodAccessorImpl.java:62\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.DelegatingMethodAccessorImpl.invoke (\u001b[1mDelegatingMethodAccessorImpl.java:43\u001b[m)
    \u001b[1mat\u001b[m java.lang.reflect.Method.invoke (\u001b[1mMethod.java:498\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (\u001b[1mLauncher.java:282\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.launch (\u001b[1mLauncher.java:225\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (\u001b[1mLauncher.java:406\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.main (\u001b[1mLauncher.java:347\u001b[m)
\u001b[1mCaused by\u001b[m: org.apache.maven.plugin.MojoFailureException: \u001b[1;31mThere are test failures.

Please refer to /home/r/repo/target/surefire-reports for the individual test results.
Please refer to dump files (if any exist) [date].dump, [date]-jvmRun[N].dump and [date].dumpstream.\u001b[m
    \u001b[1mat\u001b[m org.apache.maven.plugin.surefire.SurefireHelper.throwException (\u001b[1mSurefireHelper.java:271\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.plugin.surefire.SurefireHelper.reportExecution (\u001b[1mSurefireHelper.java:159\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.plugin.surefire.SurefirePlugin.handleSummary (\u001b[1mSurefirePlugin.java:373\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeAfterPreconditionsChecked (\u001b[1mAbstractSurefireMojo.java:1018\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.plugin.surefire.AbstractSurefireMojo.execute (\u001b[1mAbstractSurefireMojo.java:848\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (\u001b[1mDefaultBuildPluginManager.java:137\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:210\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:156\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.MojoExecutor.execute (\u001b[1mMojoExecutor.java:148\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (\u001b[1mLifecycleModuleBuilder.java:117\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject (\u001b[1mLifecycleModuleBuilder.java:81\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build (\u001b[1mSingleThreadedBuilder.java:56\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.lifecycle.internal.LifecycleStarter.execute (\u001b[1mLifecycleStarter.java:128\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.doExecute (\u001b[1mDefaultMaven.java:305\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.doExecute (\u001b[1mDefaultMaven.java:192\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.DefaultMaven.execute (\u001b[1mDefaultMaven.java:105\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.execute (\u001b[1mMavenCli.java:956\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.doMain (\u001b[1mMavenCli.java:288\u001b[m)
    \u001b[1mat\u001b[m org.apache.maven.cli.MavenCli.main (\u001b[1mMavenCli.java:192\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.NativeMethodAccessorImpl.invoke0 (\u001b[1mNative Method\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.NativeMethodAccessorImpl.invoke (\u001b[1mNativeMethodAccessorImpl.java:62\u001b[m)
    \u001b[1mat\u001b[m sun.reflect.DelegatingMethodAccessorImpl.invoke (\u001b[1mDelegatingMethodAccessorImpl.java:43\u001b[m)
    \u001b[1mat\u001b[m java.lang.reflect.Method.invoke (\u001b[1mMethod.java:498\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced (\u001b[1mLauncher.java:282\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.launch (\u001b[1mLauncher.java:225\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode (\u001b[1mLauncher.java:406\u001b[m)
    \u001b[1mat\u001b[m org.codehaus.plexus.classworlds.launcher.Launcher.main (\u001b[1mLauncher.java:347\u001b[m)
[\u001b[1;31mERROR\u001b[m] 
[\u001b[1;31mERROR\u001b[m] Re-run Maven using the \u001b[1m-X\u001b[m switch to enable full debug logging.
[\u001b[1;31mERROR\u001b[m] 
[\u001b[1;31mERROR\u001b[m] For more information about the errors and possible solutions, please read the following articles:
[\u001b[1;31mERROR\u001b[m] \u001b[1m[Help 1]\u001b[m http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
container 6ee302ad3ac399f5274d635af0d7e8d17d8a13a873b8ab61d243a30ad7c3b424 is dead
Sun Feb 14 19:09:24 CET 2021

@victornoel
Copy link
Collaborator Author

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

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

@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

@victornoel Oops, I failed. You can see the full log here (spent 9min)

[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-plugin-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-release-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-resources-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-javadoc-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-site-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-plugin-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-resources-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-release-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-source-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-surefire-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-war-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-site-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.doxia:doxia-module-markdown: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.codehaus.mojo:versions-maven-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-source-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-surefire-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-war-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.eluder.coveralls:coveralls-maven-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.jacoco:jacoco-maven-plugin: checking for updates from oss.sonatype.org
[\u001b[1;34mINFO\u001b[m] artifact org.apache.maven.plugins:maven-help-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.codehaus.mojo:versions-maven-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.jacoco:jacoco-maven-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] artifact org.eluder.coveralls:coveralls-maven-plugin: checking for updates from central
[\u001b[1;34mINFO\u001b[m] Generating "\u001b[1mJavadoc\u001b[m" report      \u001b[1m --- \u001b[0;32mmaven-javadoc-plugin:3.2.0:javadoc\u001b[m
[\u001b[1;33mWARNING\u001b[m] Error fetching link: https://github.com/yegor256/cactoos/apidocs. Ignored it.
[\u001b[1;33mWARNING\u001b[m] Error fetching link: http://hamcrest.org/JavaHamcrest/apidocs. Ignored it.
[\u001b[1;33mWARNING\u001b[m] Error fetching link: https://junit.org/junit5/apidocs. Ignored it.
[\u001b[1;33mWARNING\u001b[m] Error fetching link: https://junit.org/junit5/apidocs. Ignored it.
[\u001b[1;33mWARNING\u001b[m] Error fetching link: https://github.com/mockito/mockito/apidocs. Ignored it.
[\u001b[1;34mINFO\u001b[m] No previous run data found, generating javadoc.
[\u001b[1;34mINFO\u001b[m] 
3 warnings
[\u001b[1;33mWARNING\u001b[m] Javadoc Warnings
[\u001b[1;33mWARNING\u001b[m] javadoc: warning - Error fetching URL: http://docs.mockito.googlecode.com/hg/latest/
[\u001b[1;33mWARNING\u001b[m] javadoc: warning - Error fetching URL: http://www.h2database.com/javadoc/
[\u001b[1;33mWARNING\u001b[m] javadoc: warning - Error fetching URL: https://jolbox.com/
[\u001b[1;34mINFO\u001b[m] Generating "\u001b[1mJaCoCo Aggregate\u001b[m" report\u001b[1m --- \u001b[0;32mjacoco-maven-plugin:0.8.5:report-aggregate\u001b[m
[\u001b[1;34mINFO\u001b[m] Generating Sitemap.
[\u001b[1;34mINFO\u001b[m] Rendering \u001b[1m1 generated Doxia document\u001b[m: \u001b[1m1 xdoc\u001b[m
[\u001b[1;34mINFO\u001b[m] \u001b[1m------------------------------------------------------------------------\u001b[m
[\u001b[1;34mINFO\u001b[m] \u001b[1;32mBUILD SUCCESS\u001b[m
[\u001b[1;34mINFO\u001b[m] \u001b[1m------------------------------------------------------------------------\u001b[m
[\u001b[1;34mINFO\u001b[m] Total time:  02:11 min
[\u001b[1;34mINFO\u001b[m] Finished at: 2021-02-14T18:29:59Z
[\u001b[1;34mINFO\u001b[m] \u001b[1m------------------------------------------------------------------------\u001b[m
+ mv /home/r/repo .
++ whoami
+ chown -R root repo
+ '[' -n '' ']'
++ whoami
+ sudo chown -R rultor repo
+ cd repo
+ git push origin master
remote: error: GH006: Protected branch update failed for refs/heads/master.        
remote: error: 2 of 5 required status checks are failing.        
To git@github.com:llorllale/cactoos-matchers.git
 ! [remote rejected] master -> master (protected branch hook declined)
error: failed to push some refs to 'git@github.com:llorllale/cactoos-matchers.git'
container 56780bbd57bf85f4a5ac207ea940c4a2b3051af5569826a00d0d1b7efe1fcdf2 is dead
Sun Feb 14 19:30:59 CET 2021

@victornoel
Copy link
Collaborator Author

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

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

@rultor rultor merged commit ce70d22 into llorllale:master Feb 14, 2021
@rultor
Copy link
Collaborator

rultor commented Feb 14, 2021

@rultor merge

@victornoel Done! FYI, the full log is here (took me 10min)

@victornoel victornoel deleted the cleanup-matcher branch February 14, 2021 19:14
@0crat 0crat added the qa label Feb 14, 2021
@0crat
Copy link
Collaborator

0crat commented Feb 14, 2021

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

@0crat
Copy link
Collaborator

0crat commented Feb 14, 2021

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

@0crat 0crat removed the 0crat/scope label Feb 14, 2021
@sereshqua
Copy link

@0crat quality acceptable

@sereshqua
Copy link

@baudoliver7 please make sure you will find at least 3 issues during next CR, thanks

@0crat 0crat removed the qa label Feb 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants