Move fixtures from :ide into a separate package

valdisrigdon · May 26, 2016 · 46be082 · 46be082
1 parent 87ff9e3
commit 46be082
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/...rc/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginBasicIntegrationTest.groovy b/...rc/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginBasicIntegrationTest.groovy
@@ -19,7 +19,7 @@ package org.gradle.play.plugins.ide
 import org.gradle.play.integtest.fixtures.PlayApp
 import org.gradle.play.integtest.fixtures.app.BasicPlayApp
 
-import static org.gradle.plugins.ide.idea.IdeaFixtures.parseIml
+import static org.gradle.plugins.ide.fixtures.IdeaFixtures.parseIml
 
 class PlayIdeaPluginBasicIntegrationTest extends PlayIdeaPluginIntegrationTest {
 

diff --git a/...lay/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginIntegrationTest.groovy b/...lay/src/integTest/groovy/org/gradle/play/plugins/ide/PlayIdeaPluginIntegrationTest.groovy
@@ -16,10 +16,10 @@
 
 package org.gradle.play.plugins.ide
 
-import org.gradle.plugins.ide.idea.IdeaModuleFixture
+import org.gradle.plugins.ide.fixtures.IdeaModuleFixture
 
-import static org.gradle.plugins.ide.idea.IdeaFixtures.parseIml
-import static org.gradle.plugins.ide.idea.IdeaFixtures.parseIpr
+import static org.gradle.plugins.ide.fixtures.IdeaFixtures.parseIml
+import static org.gradle.plugins.ide.fixtures.IdeaFixtures.parseIpr
 
 abstract class PlayIdeaPluginIntegrationTest extends PlayIdePluginIntegrationTest {
 

diff --git a/...rojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationSpec.groovy b/...rojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationSpec.groovy
@@ -17,8 +17,8 @@
 package org.gradle.plugins.ide
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
-import org.gradle.plugins.ide.idea.IdeaFixtures
-import org.gradle.plugins.ide.idea.IdeaModuleFixture
+import org.gradle.plugins.ide.fixtures.IdeaFixtures
+import org.gradle.plugins.ide.fixtures.IdeaModuleFixture
 
 abstract class AbstractIdeIntegrationSpec extends AbstractIntegrationSpec {
     protected IdeaModuleFixture parseIml(String moduleFile) {

diff --git a/...rojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy b/...rojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy
@@ -19,8 +19,8 @@ package org.gradle.plugins.ide
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.executer.ExecutionResult
-import org.gradle.plugins.ide.idea.IdeaFixtures
-import org.gradle.plugins.ide.idea.IdeaModuleFixture
+import org.gradle.plugins.ide.fixtures.IdeaFixtures
+import org.gradle.plugins.ide.fixtures.IdeaModuleFixture
 import org.gradle.test.fixtures.file.TestFile
 
 abstract class AbstractIdeIntegrationTest extends AbstractIntegrationTest {

diff --git a/...tegTest/groovy/org/gradle/plugins/ide/idea/IdeaJavaLanguageSettingsIntegrationTest.groovy b/...tegTest/groovy/org/gradle/plugins/ide/idea/IdeaJavaLanguageSettingsIntegrationTest.groovy
@@ -19,6 +19,7 @@ package org.gradle.plugins.ide.idea
 import org.gradle.api.JavaVersion
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.plugins.ide.AbstractIdeIntegrationSpec
+import org.gradle.plugins.ide.fixtures.IdeaFixtures
 import org.junit.Rule
 
 class IdeaJavaLanguageSettingsIntegrationTest extends AbstractIdeIntegrationSpec {

diff --git a/...egTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy b/...egTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy
@@ -15,6 +15,7 @@
  */
 package org.gradle.plugins.ide.idea
 import org.gradle.plugins.ide.AbstractSourcesAndJavadocJarsIntegrationTest
+import org.gradle.plugins.ide.fixtures.IdeaModuleFixture
 import org.gradle.test.fixtures.server.http.HttpArtifact
 
 class IdeaSourcesAndJavadocJarsIntegrationTest extends AbstractSourcesAndJavadocJarsIntegrationTest {
@@ -48,4 +49,4 @@ class IdeaSourcesAndJavadocJarsIntegrationTest extends AbstractSourcesAndJavadoc
     void expectBehaviorAfterBrokenIvyArtifact(HttpArtifact httpArtifact) {
         httpArtifact.expectGet()
     }
-}
+}
diff --git a/...adle/plugins/ide/idea/IdeaFixtures.groovy → .../plugins/ide/fixtures/IdeaFixtures.groovy b/...adle/plugins/ide/idea/IdeaFixtures.groovy → .../plugins/ide/fixtures/IdeaFixtures.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.plugins.ide.idea
+package org.gradle.plugins.ide.fixtures
 
 class IdeaFixtures {
     static parseFile(File file) {

diff --git a/...plugins/ide/idea/IdeaModuleFixture.groovy → ...ins/ide/fixtures/IdeaModuleFixture.groovy b/...plugins/ide/idea/IdeaModuleFixture.groovy → ...ins/ide/fixtures/IdeaModuleFixture.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.plugins.ide.idea
+package org.gradle.plugins.ide.fixtures
 
 import groovy.transform.ToString
 import groovy.util.slurpersupport.GPathResult

diff --git a/...lugins/ide/idea/IdeaProjectFixture.groovy → ...ns/ide/fixtures/IdeaProjectFixture.groovy b/...lugins/ide/idea/IdeaProjectFixture.groovy → ...ns/ide/fixtures/IdeaProjectFixture.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.plugins.ide.idea
+package org.gradle.plugins.ide.fixtures
 
 import groovy.util.slurpersupport.GPathResult
 

diff --git a/...t/groovy/org/gradle/integtests/composite/CompositeBuildIdeaProjectCrossVersionSpec.groovy b/...t/groovy/org/gradle/integtests/composite/CompositeBuildIdeaProjectCrossVersionSpec.groovy
@@ -16,7 +16,7 @@
 
 package org.gradle.integtests.composite
 
-import org.gradle.plugins.ide.idea.IdeaFixtures
+import org.gradle.plugins.ide.fixtures.IdeaFixtures
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.maven.MavenFileRepository
 import spock.lang.Ignore