Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Commit

Permalink
Move BuildableContext related test files from rules to buildable.cont…
Browse files Browse the repository at this point in the history
…ext package

Reviewed By: styurin

fbshipit-source-id: 3359693aca
  • Loading branch information
bobyangyf authored and facebook-github-bot committed Jul 19, 2018
1 parent 0fb92dc commit db710e8
Show file tree
Hide file tree
Showing 52 changed files with 71 additions and 40 deletions.
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/AndroidBinaryTest.java
Expand Up @@ -21,6 +21,7 @@

import com.facebook.buck.android.FilterResourcesSteps.ResourceFilter;
import com.facebook.buck.android.packageable.AndroidPackageableCollection;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -40,7 +41,6 @@
import com.facebook.buck.jvm.java.PrebuiltJarBuilder;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.args.StringArg;
import com.facebook.buck.rules.macros.StringWithMacrosUtils;
import com.facebook.buck.shell.BashStep;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/AndroidBuildConfigTest.java
Expand Up @@ -19,6 +19,7 @@
import static org.junit.Assert.assertEquals;

import com.facebook.buck.android.AndroidBuildConfig.ReadValuesStep;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.description.DescriptionCache;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -27,7 +28,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.rules.coercer.BuildConfigFields;
import com.facebook.buck.step.ExecutionContext;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/ApkGenruleTest.java
Expand Up @@ -19,6 +19,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -40,7 +41,6 @@
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.parser.exceptions.NoSuchBuildTargetException;
import com.facebook.buck.rules.FakeBuildRule;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleCreationContextFactory;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.rules.macros.StringWithMacrosUtils;
Expand Down
Expand Up @@ -19,6 +19,7 @@
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertEquals;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.cell.TestCellPathResolver;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -31,7 +32,6 @@
import com.facebook.buck.core.sourcepath.resolver.impl.DefaultSourcePathResolver;
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
2 changes: 2 additions & 0 deletions test/com/facebook/buck/android/BUCK
Expand Up @@ -303,6 +303,7 @@ java_test(
"//src/com/facebook/buck/worker:worker_pool_factory",
"//src/com/facebook/buck/worker:worker_process",
"//test/com/facebook/buck/android:testutil",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/rules/resolver/impl:testutil",
"//test/com/facebook/buck/core/sourcepath:testutil",
Expand Down Expand Up @@ -463,6 +464,7 @@ java_test(
"//test/com/facebook/buck/android/toolchain:testutil",
"//test/com/facebook/buck/android/toolchain/ndk/impl:testutil",
"//test/com/facebook/buck/config:FakeBuckConfig",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/cell:testutil",
"//test/com/facebook/buck/core/model/targetgraph:testutil",
Expand Down
Expand Up @@ -20,6 +20,7 @@
import static org.junit.Assert.assertThat;

import com.facebook.buck.android.toolchain.ndk.TargetCpuType;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.cell.TestCellPathResolver;
Expand All @@ -31,7 +32,6 @@
import com.facebook.buck.core.sourcepath.resolver.impl.DefaultSourcePathResolver;
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
Expand Up @@ -24,6 +24,7 @@

import com.facebook.buck.android.dalvik.EstimateDexWeightStep;
import com.facebook.buck.android.toolchain.AndroidPlatformTarget;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -41,7 +42,6 @@
import com.facebook.buck.jvm.java.JavaLibraryBuilder;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/DummyRDotJavaTest.java
Expand Up @@ -20,6 +20,7 @@
import static com.facebook.buck.jvm.java.JavaCompilationConstants.DEFAULT_JAVAC;
import static org.junit.Assert.assertEquals;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
import com.facebook.buck.core.rules.ActionGraphBuilder;
Expand All @@ -40,7 +41,6 @@
import com.facebook.buck.jvm.java.JavacToJarStepFactory;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
import com.facebook.buck.testutil.FakeProjectFilesystem;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/DuplicateResourcesTest.java
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assume.assumeFalse;

import com.facebook.buck.config.ActionGraphParallelizationMode;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.cell.TestCellBuilder;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -39,7 +40,6 @@
import com.facebook.buck.jvm.java.KeystoreDescription;
import com.facebook.buck.jvm.java.KeystoreDescriptionArg;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/GenAidlTest.java
Expand Up @@ -20,6 +20,7 @@
import static org.junit.Assert.assertNotEquals;

import com.facebook.buck.android.toolchain.AndroidPlatformTarget;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.description.DescriptionCache;
Expand All @@ -37,7 +38,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.rules.keys.DefaultRuleKeyFactory;
import com.facebook.buck.rules.keys.TestDefaultRuleKeyFactory;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/NdkLibraryTest.java
Expand Up @@ -21,6 +21,7 @@

import com.facebook.buck.android.toolchain.ndk.AndroidNdk;
import com.facebook.buck.android.toolchain.ndk.impl.TestNdkCxxPlatformsProviderFactory;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -30,7 +31,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.io.filesystem.TestProjectFilesystems;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
Expand Up @@ -21,10 +21,10 @@
import static org.junit.Assert.assertTrue;

import com.facebook.buck.android.toolchain.AndroidPlatformTarget;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.jvm.java.JavaCompilationConstants;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/android/TrimUberRDotJavaTest.java
Expand Up @@ -17,6 +17,7 @@
package com.facebook.buck.android;

import com.facebook.buck.core.build.buildable.context.BuildableContext;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.cell.TestCellPathResolver;
Expand All @@ -32,7 +33,6 @@
import com.facebook.buck.jvm.java.FakeJavaLibrary;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
Expand Down
1 change: 1 addition & 0 deletions test/com/facebook/buck/android/aapt/BUCK
Expand Up @@ -77,6 +77,7 @@ java_test(
"//src/com/facebook/buck/worker:worker_job_params",
"//src/com/facebook/buck/worker:worker_pool_factory",
"//src/com/facebook/buck/worker:worker_process",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/rules/resolver/impl:testutil",
"//test/com/facebook/buck/core/sourcepath:testutil",
Expand Down
Expand Up @@ -18,6 +18,7 @@

import static org.junit.Assert.assertThat;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
import com.facebook.buck.core.rules.SourcePathRuleFinder;
Expand All @@ -29,7 +30,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.io.filesystem.TestProjectFilesystems;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
import com.facebook.buck.step.TestExecutionContext;
Expand Down
1 change: 1 addition & 0 deletions test/com/facebook/buck/apple/BUCK
Expand Up @@ -240,6 +240,7 @@ java_test(
"//test/com/facebook/buck/apple:testutil",
"//test/com/facebook/buck/apple/project_generator:testutil",
"//test/com/facebook/buck/config:FakeBuckConfig",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/cell:testutil",
"//test/com/facebook/buck/core/model/targetgraph:testutil",
Expand Down
Expand Up @@ -26,6 +26,7 @@
import static org.junit.Assume.assumeTrue;

import com.facebook.buck.android.TestAndroidPlatformTargetFactory;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
import com.facebook.buck.core.rules.ActionGraphBuilder;
Expand All @@ -37,7 +38,6 @@
import com.facebook.buck.core.sourcepath.resolver.impl.DefaultSourcePathResolver;
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.TestBuildRuleParams;
import com.facebook.buck.rules.args.StringArg;
import com.facebook.buck.rules.keys.DefaultRuleKeyFactory;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/apple/MultiarchFileTest.java
Expand Up @@ -25,6 +25,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.exceptions.HumanReadableException;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -46,7 +47,6 @@
import com.facebook.buck.cxx.CxxInferEnhancer;
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.shell.ShellStep;
import com.facebook.buck.step.ExecutionContext;
import com.facebook.buck.step.Step;
Expand Down
15 changes: 15 additions & 0 deletions test/com/facebook/buck/core/build/buildable/context/BUCK
@@ -0,0 +1,15 @@
java_library(
name = "testutil",
srcs = glob(
["*.java"],
exclude = ["*Test.java"],
),
exported_deps = [
"//src/com/facebook/buck/core/build/buildable/context:context",
],
visibility = ["//test/..."],
deps = [
"//third-party/java/guava:guava",
"//third-party/java/junit:junit",
],
)
Expand Up @@ -14,21 +14,23 @@
* under the License.
*/

package com.facebook.buck.rules;
package com.facebook.buck.core.build.buildable.context;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import com.facebook.buck.core.build.buildable.context.BuildableContext;
import com.google.common.collect.ImmutableSet;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

/** Fake implementation of {@link BuildableContext} for testing. */
/**
* Fake implementation of {@link com.facebook.buck.core.build.buildable.context.BuildableContext}
* for testing.
*/
public class FakeBuildableContext implements BuildableContext {

private final Map<String, Object> metadata = new HashMap<>();
Expand Down
1 change: 1 addition & 0 deletions test/com/facebook/buck/core/rules/impl/BUCK
Expand Up @@ -12,6 +12,7 @@ java_test(
"//src/com/facebook/buck/step/fs:fs",
"//src/com/facebook/buck/util/cache/impl:impl",
"//src/com/facebook/buck/util/hashing:hashing",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/model/targetgraph:testutil",
"//test/com/facebook/buck/core/rules/resolver/impl:testutil",
Expand Down
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -40,7 +41,6 @@
import com.facebook.buck.io.filesystem.TestProjectFilesystems;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.keys.InputBasedRuleKeyFactory;
import com.facebook.buck.rules.keys.TestDefaultRuleKeyFactory;
import com.facebook.buck.rules.keys.TestInputBasedRuleKeyFactory;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/cxx/ArchiveTest.java
Expand Up @@ -21,6 +21,7 @@
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThat;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand All @@ -43,7 +44,6 @@
import com.facebook.buck.cxx.toolchain.GnuArchiver;
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.keys.TestDefaultRuleKeyFactory;
import com.facebook.buck.shell.Genrule;
import com.facebook.buck.shell.GenruleBuilder;
Expand Down
1 change: 1 addition & 0 deletions test/com/facebook/buck/cxx/BUCK
Expand Up @@ -268,6 +268,7 @@ java_test(
"//test/com/facebook/buck/android/toolchain/ndk/impl:testutil",
"//test/com/facebook/buck/apple:testutil",
"//test/com/facebook/buck/config:FakeBuckConfig",
"//test/com/facebook/buck/core/build/buildable/context:testutil",
"//test/com/facebook/buck/core/build/context:testutil",
"//test/com/facebook/buck/core/cell:testutil",
"//test/com/facebook/buck/core/model/targetgraph:testutil",
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/cxx/CxxCompilationDatabaseTest.java
Expand Up @@ -19,6 +19,7 @@
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
import com.facebook.buck.core.model.InternalFlavor;
Expand All @@ -40,7 +41,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.model.BuildTargets;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.args.RuleKeyAppendableFunction;
import com.facebook.buck.rules.coercer.FrameworkPath;
import com.facebook.buck.step.Step;
Expand Down
2 changes: 1 addition & 1 deletion test/com/facebook/buck/cxx/CxxLibraryDescriptionTest.java
Expand Up @@ -34,6 +34,7 @@
import com.facebook.buck.apple.xcode.xcodeproj.SourceTreePath;
import com.facebook.buck.config.FakeBuckConfig;
import com.facebook.buck.core.build.buildable.context.BuildableContext;
import com.facebook.buck.core.build.buildable.context.FakeBuildableContext;
import com.facebook.buck.core.build.context.BuildContext;
import com.facebook.buck.core.build.context.FakeBuildContext;
import com.facebook.buck.core.model.BuildTarget;
Expand Down Expand Up @@ -68,7 +69,6 @@
import com.facebook.buck.io.filesystem.ProjectFilesystem;
import com.facebook.buck.model.BuildTargetFactory;
import com.facebook.buck.rules.DependencyAggregationTestUtil;
import com.facebook.buck.rules.FakeBuildableContext;
import com.facebook.buck.rules.args.Arg;
import com.facebook.buck.rules.args.FileListableLinkerInputArg;
import com.facebook.buck.rules.args.StringArg;
Expand Down

0 comments on commit db710e8

Please sign in to comment.