From cca703a9d74e865240ca46ce162937aa74820507 Mon Sep 17 00:00:00 2001 From: Florian Weikert Date: Mon, 7 Dec 2015 09:56:38 +0000 Subject: Migrated base test classes to JUnit 4 and deleted their temporary *ForJunit4 versions: devtools/build/lib/analysis/util/AnalysisTestCase.java devtools/build/lib/analysis/util/BuildViewTestCase.java devtools/build/lib/packages/util/PackageLoadingTestCase.java devtools/build/lib/testutil/FoundationTestCase.java -- MOS_MIGRATED_REVID=109560679 --- .../com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java') diff --git a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java index 9aa07753dd..670029feb1 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/skylark/util/SkylarkTestCase.java @@ -21,7 +21,7 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.util.BuildViewTestCaseForJunit4; +import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.packages.PackageFactory; import com.google.devtools.build.lib.packages.PackageFactory.PackageContext; import com.google.devtools.build.lib.rules.SkylarkModules; @@ -35,7 +35,7 @@ import org.junit.Before; /** * A class to contain the common functionality for Skylark tests. */ -public abstract class SkylarkTestCase extends BuildViewTestCaseForJunit4 { +public abstract class SkylarkTestCase extends BuildViewTestCase { // We don't have multiple inheritance, so we fake it. protected EvaluationTestCase ev; -- cgit v1.2.3