Changed unit tests to use Project or ProjectInternal instead of the i…

…mplementation classes.
valdisrigdon · May 29, 2016 · 431ec56 · 431ec56
1 parent 675024c
commit 431ec56
Show file tree

Hide file tree

Showing 33 changed files with 98 additions and 99 deletions.
diff --git a/...cts/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy b/...cts/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.plugins.quality
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.ReportingBasePlugin
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.TestUtil
@@ -27,7 +27,7 @@ import spock.lang.Specification
 class CodeNarcPluginTest extends Specification {
     @Rule
     public final TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider()
-    DefaultProject project = TestUtil.createRootProject(testDir.testDirectory)
+    ProjectInternal project = TestUtil.createRootProject(testDir.testDirectory)
 
     def setup() {
         project.pluginManager.apply(CodeNarcPlugin)

diff --git a/...cts/code-quality/src/test/groovy/org/gradle/api/plugins/quality/FindBugsPluginTest.groovy b/...cts/code-quality/src/test/groovy/org/gradle/api/plugins/quality/FindBugsPluginTest.groovy
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.plugins.quality
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.ReportingBasePlugin
@@ -34,7 +34,7 @@ import static spock.util.matcher.HamcrestSupport.that
 class FindBugsPluginTest extends Specification {
     @Rule
     public final TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider()
-    DefaultProject project = TestUtil.createRootProject(testDir.testDirectory)
+    ProjectInternal project = TestUtil.createRootProject(testDir.testDirectory)
 
     def setup() {
         project.pluginManager.apply(FindBugsPlugin)

diff --git a/...ects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/JDependPluginTest.groovy b/...ects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/JDependPluginTest.groovy
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.plugins.quality
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.plugins.ReportingBasePlugin
 import org.gradle.api.tasks.SourceSet
@@ -33,7 +33,7 @@ import static spock.util.matcher.HamcrestSupport.that
 class JDependPluginTest extends Specification {
     @Rule
     public final TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider()
-    DefaultProject project = TestUtil.createRootProject(testDir.testDirectory)
+    ProjectInternal project = TestUtil.createRootProject(testDir.testDirectory)
 
     def setup() {
         project.pluginManager.apply(JDependPlugin)

diff --git a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/PmdPluginTest.groovy b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/PmdPluginTest.groovy
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.plugins.quality
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.JavaBasePlugin
 import org.gradle.api.plugins.ReportingBasePlugin
 import org.gradle.api.tasks.SourceSet
@@ -33,7 +33,7 @@ import static spock.util.matcher.HamcrestSupport.that
 class PmdPluginTest extends Specification {
     @Rule
     public final TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider()
-    DefaultProject project = TestUtil.createRootProject(testDir.testDirectory)
+    ProjectInternal project = TestUtil.createRootProject(testDir.testDirectory)
 
     def setup() {
         project.pluginManager.apply(PmdPlugin)

diff --git a/...ects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectRegistryTest.java b/...ects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectRegistryTest.java
@@ -34,9 +34,9 @@
 public class DefaultProjectRegistryTest {
     public static final String CHILD_NAME = "child";
     public static final String CHILD_CHILD_NAME = "childchild";
-    private DefaultProject rootMock;
-    private DefaultProject childMock;
-    private DefaultProject childChildMock;
+    private ProjectInternal rootMock;
+    private ProjectInternal childMock;
+    private ProjectInternal childChildMock;
 
     private DefaultProjectRegistry<ProjectInternal> projectRegistry;
 
@@ -59,8 +59,8 @@ public void addProject() {
         checkAccessMethods(childChildMock, toSortedSet(childChildMock), new TreeSet(), childChildMock);
     }
 
-    private void checkAccessMethods(Project project, SortedSet<DefaultProject> expectedAllProjects,
-                                    SortedSet<DefaultProject> expectedSubProjects, Project expectedGetProject) {
+    private void checkAccessMethods(Project project, SortedSet<ProjectInternal> expectedAllProjects,
+                                    SortedSet<ProjectInternal> expectedSubProjects, Project expectedGetProject) {
         assertSame(expectedGetProject, projectRegistry.getProject(project.getPath()));
         assertEquals(expectedAllProjects, projectRegistry.getAllProjects(project.getPath()));
         assertEquals(expectedSubProjects, projectRegistry.getSubProjects(project.getPath()));
@@ -70,7 +70,7 @@ private void checkAccessMethods(Project project, SortedSet<DefaultProject> expec
 
     @Test
     public void cannotLocateProjectsWithAmbiguousProjectDir() {
-        DefaultProject duplicateProjectDirProject = TestUtil.createChildProject(childMock, "childchild2", childMock.getProjectDir());
+        ProjectInternal duplicateProjectDirProject = TestUtil.createChildProject(childMock, "childchild2", childMock.getProjectDir());
         projectRegistry.addProject(duplicateProjectDirProject);
 
         try {
@@ -96,7 +96,7 @@ public void canLocalAllProjects() {
         assertThat(projectRegistry.getAllProjects(), equalTo(toSet((ProjectInternal) rootMock, childMock,
                 childChildMock)));
     }
-    
+
     @Test
     public void canLocateAllProjectsWhichMatchSpec() {
         Spec<Project> spec = new Spec<Project>() {

diff --git a/subprojects/core/src/test/groovy/org/gradle/api/tasks/ant/AntTargetTest.java b/subprojects/core/src/test/groovy/org/gradle/api/tasks/ant/AntTargetTest.java
@@ -18,7 +18,7 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
-import org.gradle.api.internal.project.DefaultProject;
+import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
 import org.gradle.util.TestUtil;
 import org.junit.Before;
@@ -33,7 +33,7 @@
 
 public class AntTargetTest {
     private final Target antTarget = new Target();
-    private final DefaultProject project = TestUtil.createRootProject();
+    private final ProjectInternal project = TestUtil.createRootProject();
     private final AntTarget task = TestUtil.createTask(AntTarget.class, project);
     @Rule
     public TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider();

diff --git a/...vy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlanParallelTaskHandlingTest.groovy b/...vy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlanParallelTaskHandlingTest.groovy
@@ -19,7 +19,7 @@ package org.gradle.execution.taskgraph
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.tasks.Delete
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
@@ -45,7 +45,7 @@ class DefaultTaskExecutionPlanParallelTaskHandlingTest extends Specification {
     FileSystem fs = NativeServicesTestFixture.instance.get(FileSystem)
 
     DefaultTaskExecutionPlan executionPlan = new DefaultTaskExecutionPlan(Stub(BuildCancellationToken), true)
-    DefaultProject root = createRootProject()
+    ProjectInternal root = createRootProject()
 
     List<TaskInfo> startedTasks = []
     List<Thread> blockedThreads = []

diff --git a/...s/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlanTest.groovy b/...s/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionPlanTest.groovy
@@ -21,7 +21,7 @@ import org.gradle.api.CircularReferenceException
 import org.gradle.api.Task
 import org.gradle.api.internal.TaskInternal
 import org.gradle.api.internal.TaskOutputsInternal
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.internal.tasks.TaskStateInternal
 import org.gradle.api.specs.Spec
 import org.gradle.api.tasks.TaskDependency
@@ -40,7 +40,7 @@ import static org.gradle.util.WrapUtil.toList
 public class DefaultTaskExecutionPlanTest extends Specification {
 
     DefaultTaskExecutionPlan executionPlan
-    DefaultProject root;
+    ProjectInternal root;
     def cancellationHandler = Mock(BuildCancellationToken)
 
     def setup() {

diff --git a/...cts/core/src/test/groovy/org/gradle/execution/taskpath/ProjectFinderByTaskPathTest.groovy b/...cts/core/src/test/groovy/org/gradle/execution/taskpath/ProjectFinderByTaskPathTest.groovy
@@ -16,7 +16,7 @@
 
 package org.gradle.execution.taskpath
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
@@ -25,9 +25,9 @@ class ProjectFinderByTaskPathTest extends Specification {
     def finder = new ProjectFinderByTaskPath()
 
     //root->foo->bar
-    DefaultProject root = TestUtil.createRootProject()
-    DefaultProject foo = TestUtil.createChildProject(root, "foo")
-    DefaultProject bar = TestUtil.createChildProject(foo, "bar")
+    ProjectInternal root = TestUtil.createRootProject()
+    ProjectInternal foo = TestUtil.createChildProject(root, "foo")
+    ProjectInternal bar = TestUtil.createChildProject(foo, "bar")
 
     def "finds root"() {
         expect:

diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/DefaultScriptTest.groovy b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/DefaultScriptTest.groovy
@@ -22,11 +22,11 @@ import org.codehaus.groovy.control.CompilerConfiguration
 import org.gradle.api.initialization.dsl.ScriptHandler
 import org.gradle.api.internal.file.FileLookup
 import org.gradle.api.internal.file.collections.DirectoryFileTreeFactory
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.logging.LoggingManager
+import org.gradle.internal.logging.StandardOutputCapture
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.internal.service.ServiceRegistry
-import org.gradle.internal.logging.StandardOutputCapture
 import org.gradle.util.JUnit4GroovyMockery
 import org.gradle.util.TestUtil
 import org.jmock.integration.junit4.JMock
@@ -57,7 +57,7 @@ class DefaultScriptTest {
         }
 
         DefaultScript script = new GroovyShell(createBaseCompilerConfiguration()).parse(testScriptText)
-        DefaultProject testProject = TestUtil.createRootProject()
+        ProjectInternal testProject = TestUtil.createRootProject()
         testProject.ext.custom = 'true'
         script.setScriptSource(new StringScriptSource('script', '//'))
         script.init(testProject, serviceRegistryMock)
@@ -77,7 +77,7 @@ class DefaultScriptTest {
 // We leave out the path to check import adding
 getName() // call a project method
 assert hasProperty('custom')
-repositories { } 
+repositories { }
 def scriptMethod() { 'scriptMethod' }
 String internalProp = 'a'
 assert internalProp == 'a'

diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java
@@ -25,16 +25,16 @@
 import org.gradle.api.internal.SettingsInternal;
 import org.gradle.api.internal.file.TestFiles;
 import org.gradle.api.internal.initialization.ClassLoaderScope;
-import org.gradle.api.internal.project.DefaultProject;
+import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.configuration.BuildConfigurer;
 import org.gradle.execution.BuildConfigurationActionExecuter;
 import org.gradle.execution.BuildExecuter;
 import org.gradle.execution.TaskGraphExecuter;
 import org.gradle.internal.Factory;
+import org.gradle.internal.logging.LoggingManagerInternal;
 import org.gradle.internal.progress.BuildOperationDetails;
 import org.gradle.internal.progress.BuildOperationExecutor;
 import org.gradle.internal.service.scopes.BuildScopeServices;
-import org.gradle.internal.logging.LoggingManagerInternal;
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
 import org.gradle.util.JUnit4GroovyMockery;
 import org.gradle.util.TestUtil;
@@ -60,8 +60,8 @@ public class DefaultGradleLauncherTest {
     private InitScriptHandler initScriptHandlerMock;
     private SettingsLoader settingsLoaderMock;
     private BuildConfigurer buildConfigurerMock;
-    private DefaultProject expectedRootProject;
-    private DefaultProject expectedCurrentProject;
+    private ProjectInternal expectedRootProject;
+    private ProjectInternal expectedCurrentProject;
     private SettingsInternal settingsMock;
     private StartParameter expectedStartParams;
     private GradleInternal gradleMock;

diff --git a/...ojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy b/...ojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy
@@ -21,7 +21,6 @@ import org.gradle.api.initialization.ProjectDescriptor
 import org.gradle.api.internal.GradleInternal
 import org.gradle.api.internal.file.TestFiles
 import org.gradle.api.internal.initialization.ClassLoaderScope
-import org.gradle.api.internal.project.DefaultProject
 import org.gradle.api.internal.project.IProjectFactory
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
@@ -102,7 +101,7 @@ class InstantiatingBuildLoaderTest extends Specification {
     }
 
     ProjectInternal project(ProjectDescriptor descriptor, ProjectInternal parent) {
-        DefaultProject project
+        ProjectInternal project
         if (parent) {
             project = TestUtil.createChildProject(parent, descriptor.name, descriptor.projectDir)
         } else {

diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractSpockTaskTest.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/api/tasks/AbstractSpockTaskTest.groovy
@@ -22,8 +22,7 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.internal.AbstractTask
 import org.gradle.api.internal.AsmBackedClassGenerator
-import org.gradle.api.internal.project.AbstractProject
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.internal.project.taskfactory.AnnotationProcessingTaskFactory
 import org.gradle.api.internal.project.taskfactory.DefaultTaskClassInfoStore
 import org.gradle.api.internal.project.taskfactory.ITaskFactory
@@ -51,7 +50,7 @@ public abstract class AbstractSpockTaskTest extends Specification {
     @Rule
     public TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
 
-    private AbstractProject project
+    private ProjectInternal project
 
     private static final ITaskFactory TASK_FACTORY = new AnnotationProcessingTaskFactory(new DefaultTaskClassInfoStore(), new TaskFactory(new AsmBackedClassGenerator()))
 
@@ -91,9 +90,9 @@ public abstract class AbstractSpockTaskTest extends Specification {
     }
 
     def testPath() {
-        DefaultProject childProject = TestUtil.createChildProject(project, "child");
+        ProjectInternal childProject = TestUtil.createChildProject(project, "child");
         childProject.getProjectDir().mkdirs();
-        DefaultProject childchildProject = TestUtil.createChildProject(childProject, "childchild");
+        ProjectInternal childchildProject = TestUtil.createChildProject(childProject, "childchild");
         childchildProject.getProjectDir().mkdirs();
 
         when:
@@ -183,11 +182,11 @@ public abstract class AbstractSpockTaskTest extends Specification {
 
     }
 
-    public AbstractProject getProject() {
+    public ProjectInternal getProject() {
         return project;
     }
 
-    public void setProject(AbstractProject project) {
+    public void setProject(ProjectInternal project) {
         this.project = project;
     }
 

diff --git a/...s/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy b/...s/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy
@@ -16,7 +16,7 @@
 
 package org.gradle.test.fixtures
 
-import org.gradle.api.internal.project.DefaultProject
+import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.test.fixtures.file.CleanupTestDirectory
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.TestUtil
@@ -40,7 +40,7 @@ abstract class AbstractProjectBuilderSpec extends Specification {
     // @CleanupTestDirectory annotation.
     @Rule
     final TestNameTestDirectoryProvider temporaryFolder = TestNameTestDirectoryProvider.newInstance()
-    DefaultProject project
+    ProjectInternal project
 
     def setup() {
         project = TestUtil.createRootProject(temporaryFolder.testDirectory)

diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/util/TestUtil.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/util/TestUtil.groovy
@@ -21,7 +21,6 @@ import org.apache.ivy.core.module.id.ModuleId
 import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.codehaus.groovy.control.CompilerConfiguration
 import org.gradle.api.Task
-import org.gradle.api.internal.project.DefaultProject
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.internal.project.taskfactory.ITaskFactory
 import org.gradle.groovy.scripts.DefaultScript
@@ -129,23 +128,23 @@ class TestUtil {
      *     {@link #createRootProject(java.io.File)}
      */
     @Deprecated
-    static DefaultProject createRootProject() {
+    static ProjectInternal createRootProject() {
         NativeServicesTestFixture.initialize()
         createRootProject(TestNameTestDirectoryProvider.newInstance().testDirectory)
     }
 
-    DefaultProject rootProject() {
+    ProjectInternal rootProject() {
         createRootProject(rootDir)
     }
 
-    static DefaultProject createRootProject(File rootDir) {
+    static ProjectInternal createRootProject(File rootDir) {
         return ProjectBuilder
             .builder()
             .withProjectDir(rootDir)
             .build()
     }
 
-    static DefaultProject createChildProject(DefaultProject parent, String name, File projectDir = null) {
+    static ProjectInternal createChildProject(ProjectInternal parent, String name, File projectDir = null) {
         return ProjectBuilder
             .builder()
             .withName(name)

diff --git a/...cts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.groovy b/...cts/ivyservice/moduleconverter/dependencies/ProjectDependencyDescriptorFactoryTest.groovy
@@ -15,11 +15,11 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies
 
+import org.gradle.api.Project
 import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.ProjectDependency
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
 import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency
-import org.gradle.api.internal.project.AbstractProject
 import org.gradle.initialization.ProjectAccessListener
 import org.gradle.internal.component.local.model.DslOriginDependencyMetaData
 import org.gradle.util.TestUtil
@@ -53,7 +53,7 @@ public class ProjectDependencyDescriptorFactoryTest extends AbstractDependencyDe
     }
 
     private ProjectDependency createProjectDependency(String dependencyConfiguration) {
-        AbstractProject dependencyProject = TestUtil.createRootProject();
+        Project dependencyProject = TestUtil.createRootProject();
         dependencyProject.setGroup("someGroup");
         dependencyProject.setVersion("someVersion");
         dependencyProject.configurations.create(dependencyConfiguration)