Skip to content
This repository was archived by the owner on Nov 20, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: carrotsearch/junit-benchmarks
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: scijava/junit-benchmarks
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 42 files changed
  • 3 contributors

Commits on Mar 16, 2014

  1. Add a workaround for JUNITBENCH-54

    Reflection is often not the correct way to do things, but sometimes it
    cannot be helped, for example when JUnit does not give us a chance to
    measure the time the original test statement without including the
    runtime of the methods annotated with @before and @after.
    
    The problem is that JUnit wraps statements into, say, a RunAfter
    statement that ensures that not only the test statement in question is
    executed but also the @After-annotated methods. The same is done for
    @before methods, and for a couple of other things, so that eventually
    the test statement about which we want to gather statistics is wrapped
    into multiple layers of wrapping statements like an onion into its seven
    skins.
    
    With this commit, we cheat and access the private fields of RunAfter and
    friends, and inject our own BenchmarkStatement (wrapping the statement
    we desire to wrap) into the inner-most 'onion skin'.
    
    We also handle the other statements JUnit 4.11 might wrap around our
    desired test statement:
    
    https://github.com/junit-team/junit/blob/r4.11/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java#L251
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 16, 2014
    Configuration menu
    Copy the full SHA
    3e762c3 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2014

  1. Fix handling of ExecutionException

    We should not unwrap the cause one time too many.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 17, 2014
    Configuration menu
    Copy the full SHA
    6386876 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2014

  1. Un-DOS-ify line endings

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    ab6aedf View commit details
    Browse the repository at this point in the history
  2. Switch to SciJava's groupId

    We want to have a deployed version of junit-benchmarks with the
    JUNITBENCH-54 workaround. The best way to get this is to deploy
    ourselves.
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    b23deee View commit details
    Browse the repository at this point in the history
  3. Merge pull request /pull/14

    Add a workaround for JUNITBENCH-54
    
    Reflection is often not the correct way to do things, but sometimes it
    cannot be helped, for example when JUnit does not give us a chance to
    measure the time the original test statement without including the
    runtime of the methods annotated with @before and @after.
    
    The problem is that JUnit wraps statements into, say, a RunAfter
    statement that ensures that not only the test statement in question is
    executed but also the @After-annotated methods. The same is done for
    @before methods, and for a couple of other things, so that eventually
    the test statement about which we want to gather statistics is wrapped
    into multiple layers of wrapping statements like an onion into its seven
    skins.
    
    With this commit, we cheat and access the private fields of RunAfter and
    friends, and inject our own BenchmarkStatement (wrapping the statement
    we desire to wrap) into the inner-most 'onion skin'.
    
    We also handle the other statements JUnit 4.11 might wrap around our
    desired test statement:
    
    https://github.com/junit-team/junit/blob/r4.11/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java#L251
    
    Signed-off-by: Johannes Schindelin johannes.schindelin@gmx.de
    dscho committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    1d0a3ef View commit details
    Browse the repository at this point in the history
  4. Bump to next development cycle

    Signed-off-by: Jenkins <jenkins@dev.loci.wisc.edu>
    dscho authored and Jenkins committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    e42a6bb View commit details
    Browse the repository at this point in the history
  5. Update README

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    c206454 View commit details
    Browse the repository at this point in the history
  6. Avoid the need to call nexus-staging:release after deploy

    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    dscho committed Mar 20, 2014
    Configuration menu
    Copy the full SHA
    5c6b813 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. Fix bug that was introduced with JUnit 4.12

    A field name was changed from fNext to next in JUnit 4.12 breaking the
    benchmarks that are accessing this field.
    
    This commit also modifies a test to reflect new behavior in JUnit 4.12.
    
    Signed-off-by: Curtis Rueden <ctrueden@wisc.edu>
    stelfrich authored and ctrueden committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    d6bbadc View commit details
    Browse the repository at this point in the history
  2. Merge branch 'fix-junit-412-bug'

    Closes #1.
    ctrueden committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    6ca786b View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2016

  1. Bump to next development cycle

    Signed-off-by: Jenkins <jenkins@imagej.net>
    ctrueden authored and Jenkins committed Aug 22, 2016
    Configuration menu
    Copy the full SHA
    e1ef6d0 View commit details
    Browse the repository at this point in the history
Loading