Skip to content

Commit

Permalink
Removing GUAVA Ticker and FakeTicker from junitrunner.
Browse files Browse the repository at this point in the history
Bazel users that are using a different Guava version than the one in the
junitrunner jar are getting an IncompatibleClassChangeError. Rewriting
parts of junitrunner code so it won't depend on Guava anymore.

Continuing progress on issue bazelbuild#1150.

--
MOS_MIGRATED_REVID=131938872
  • Loading branch information
iirina authored and aehlig committed Sep 1, 2016
1 parent be128a5 commit 45fd841
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

package com.google.testing.junit.runner.junit4;

import com.google.common.base.Ticker;
import com.google.testing.junit.runner.internal.SignalHandlers;
import com.google.testing.junit.runner.util.TestNameProvider;
import com.google.testing.junit.runner.util.Ticker;

import dagger.Module;
import dagger.Provides;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

import static java.util.concurrent.TimeUnit.NANOSECONDS;

import com.google.common.base.Ticker;
import com.google.testing.junit.junit4.runner.DynamicTestException;
import com.google.testing.junit.runner.sharding.ShardingEnvironment;
import com.google.testing.junit.runner.sharding.ShardingFilters;
import com.google.testing.junit.runner.util.TestPropertyRunnerIntegration;
import com.google.testing.junit.runner.util.Ticker;
import java.io.IOException;
import java.io.OutputStream;
import java.io.StringWriter;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Copyright 2010 The Bazel Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.testing.junit.runner.util;

import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;

/**
* A Ticker whose value can be advanced programmatically in test.
* <p> The ticker can be configured so that the time is incremented whenever {@link #read} is
* called.
*
* <p> This class is thread-safe.
*/
public class FakeTicker extends Ticker {

private final AtomicLong nanos = new AtomicLong();
private volatile long autoIncrementStepNanos;

/** Advances the ticker value by {@code time} in {@code timeUnit}. */
public FakeTicker advance(long time, TimeUnit timeUnit) {
return advance(timeUnit.toNanos(time));
}

/** Advances the ticker value by {@code nanoseconds}. */
public FakeTicker advance(long nanoseconds) {
nanos.addAndGet(nanoseconds);
return this;
}

/**
* Sets the increment applied to the ticker whenever it is queried.
*
* <p>The default behavior is to auto increment by zero. i.e: The ticker is left unchanged when
* queried.
*/
public FakeTicker setAutoIncrementStep(long autoIncrementStep, TimeUnit timeUnit) {
if (autoIncrementStep < 0) {
throw new IllegalArgumentException("May not auto-increment by a negative amount");
}
this.autoIncrementStepNanos = timeUnit.toNanos(autoIncrementStep);
return this;
}

@Override
public long read() {
return nanos.getAndAdd(autoIncrementStepNanos);
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// Copyright 2016 The Bazel Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.testing.junit.runner.util;

/**
* A time source; returns a time value representing the number of nanoseconds elapsed since some
* fixed but arbitrary point in time.
*
* <p><b>Warning:</b> this interface can only be used to measure elapsed time, not wall time.
*/
public abstract class Ticker {
/**
* Constructor for use by subclasses.
*/
protected Ticker() {}

/**
* Returns the number of nanoseconds elapsed since this ticker's fixed point of reference.
*/
public abstract long read();

/**
* A ticker that reads the current time using {@link System#nanoTime}.
*
* @since 10.0
*/
public static Ticker systemTicker() {
return SYSTEM_TICKER;
}

private static final Ticker SYSTEM_TICKER =
new Ticker() {
@Override
public long read() {
return System.nanoTime();
}
};
}

0 comments on commit 45fd841

Please sign in to comment.