Fix some tests

1 files changed, 22 insertions, 24 deletions

diff --git a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
index 327cead8..33e8c9c4 100644
--- a/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
+++ b/runners/gradle-integration-tests/testData/typeSafeConfiguration/build.gradle
@@ -26,47 +26,45 @@ def configureDokkaTypeSafely(DokkaTask dokka) {
         moduleName = "some String"
         outputFormat = "some String"
         outputDirectory = "some String"
+        dokkaFatJar = file("some File")
+        cacheRoot = null as String
+        impliedPlatforms = new ArrayList<String>()
+
+        kotlinTasks(new Callable<List<Object>>() {
+            @Override
+            List<Object> call() {
+                return defaultKotlinTasks()
+            }
+        })
+    }
+    dokka.extensions.findByName("configuration").with {
+
         classpath = Collections.singleton(file("someClassDir"))
         includes = Collections.emptyList()
-        linkMappings = new ArrayList<LinkMapping>()
         samples = Collections.emptyList()
         jdkVersion = 6
-        sourceDirs = Collections.<File>emptyList()
-        sourceRoots = new ArrayList<SourceRoot>()
-        dokkaFatJar = file("some File")
+        sourceDirs = Collections.<File> emptyList()
+        sourceRoots = new ArrayList<GradleSourceRootImpl>()
+
         includeNonPublic = false
         skipDeprecated = false
         skipEmptyPackages = true
         reportUndocumented = true
-        perPackageOptions = new ArrayList<PackageOptions>()
-        impliedPlatforms = Collections.<String>emptyList()
+        perPackageOptions = new ArrayList<GradlePackageOptionsImpl>()
+        impliedPlatforms = Collections.<String> emptyList()
         externalDocumentationLinks = new ArrayList<DokkaConfiguration.ExternalDocumentationLink>()
         noStdlibLink = false
-        cacheRoot = null as String
         languageVersion = null as String
         apiVersion = null as String
-        kotlinTasks(new Callable<List<Object>>() {
-            @Override
-            List<Object> call() {
-                return defaultKotlinTasks()
-            }
-        })
-        linkMapping(new Action<LinkMapping>() {
-            @Override
-            void execute(LinkMapping mapping) {
-                mapping.dir = "some String"
-                mapping.url = "some String"
-            }
-        })
-        sourceRoot(new Action<SourceRoot>() {
+        sourceRoot(new Action<GradleSourceRootImpl>() {
             @Override
-            void execute(SourceRoot sourceRoot) {
+            void execute(GradleSourceRootImpl sourceRoot) {
                 sourceRoot.path = "some String"
             }
         })
-        packageOptions(new Action<PackageOptions>() {
+        packageOptions(new Action<GradlePackageOptionsImpl>() {
             @Override
-            void execute(PackageOptions packageOptions) {
+            void execute(GradlePackageOptionsImpl packageOptions) {
                 packageOptions.prefix = "some String"
             }
         })