From 6a181a7a2b03ec263788d137610e86937a57d434 Mon Sep 17 00:00:00 2001 From: Ignat Beresnev Date: Thu, 31 Aug 2023 16:02:13 +0200 Subject: Update copyright (#3149) * Add the default copyright profile and enable IDEA project settings * Add the license notice file --- integration-tests/maven/build.gradle.kts | 4 ++++ .../projects/it-maven/customResources/custom-resource.svg | 6 +++++- .../it-maven/customResources/custom-style-to-add.css | 6 +++++- .../maven/projects/it-maven/customResources/logo-styles.css | 10 +++++++--- integration-tests/maven/projects/it-maven/pom.xml | 4 ++++ .../org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt | 4 ++++ .../org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt | 12 ++++++++---- 7 files changed, 37 insertions(+), 9 deletions(-) (limited to 'integration-tests/maven') diff --git a/integration-tests/maven/build.gradle.kts b/integration-tests/maven/build.gradle.kts index 7fbc4bff..36a28f34 100644 --- a/integration-tests/maven/build.gradle.kts +++ b/integration-tests/maven/build.gradle.kts @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + import org.jetbrains.dependsOnMavenLocalPublication plugins { diff --git a/integration-tests/maven/projects/it-maven/customResources/custom-resource.svg b/integration-tests/maven/projects/it-maven/customResources/custom-resource.svg index 1865f739..c4b95383 100644 --- a/integration-tests/maven/projects/it-maven/customResources/custom-resource.svg +++ b/integration-tests/maven/projects/it-maven/customResources/custom-resource.svg @@ -1,3 +1,7 @@ + + - \ No newline at end of file + diff --git a/integration-tests/maven/projects/it-maven/customResources/custom-style-to-add.css b/integration-tests/maven/projects/it-maven/customResources/custom-style-to-add.css index 408c210e..f949ca1c 100644 --- a/integration-tests/maven/projects/it-maven/customResources/custom-style-to-add.css +++ b/integration-tests/maven/projects/it-maven/customResources/custom-style-to-add.css @@ -1 +1,5 @@ -/* custom stylesheet */ \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +/* custom stylesheet */ diff --git a/integration-tests/maven/projects/it-maven/customResources/logo-styles.css b/integration-tests/maven/projects/it-maven/customResources/logo-styles.css index 2ac57218..c7932753 100644 --- a/integration-tests/maven/projects/it-maven/customResources/logo-styles.css +++ b/integration-tests/maven/projects/it-maven/customResources/logo-styles.css @@ -1,3 +1,7 @@ -#logo { - background-image: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); -} \ No newline at end of file +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + +:root { + --dokka-logo-image-url: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg'); +} diff --git a/integration-tests/maven/projects/it-maven/pom.xml b/integration-tests/maven/projects/it-maven/pom.xml index 9abfa45b..3d1d5f78 100644 --- a/integration-tests/maven/projects/it-maven/pom.xml +++ b/integration-tests/maven/projects/it-maven/pom.xml @@ -1,3 +1,7 @@ + + 4.0.0 diff --git a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt index bf5148ef..7987d45e 100644 --- a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt +++ b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/BiojavaIntegrationTest.kt @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + package org.jetbrains.dokka.it.maven import org.jetbrains.dokka.it.* diff --git a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt index 0b532057..577e75a2 100644 --- a/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt +++ b/integration-tests/maven/src/integrationTest/kotlin/org/jetbrains/dokka/it/maven/MavenIntegrationTest.kt @@ -1,3 +1,7 @@ +/* + * Copyright 2014-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. + */ + package org.jetbrains.dokka.it.maven import org.jetbrains.dokka.it.AbstractIntegrationTest @@ -56,15 +60,15 @@ class MavenIntegrationTest : AbstractIntegrationTest() { assertNoEmptySpans(file) } - assertEquals( - """#logo{background-image:url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg');}""", - stylesDir.resolve("logo-styles.css").readText().replace("\\s".toRegex(), ""), + assertContains( + stylesDir.resolve("logo-styles.css").readText(), + "--dokka-logo-image-url: url('https://upload.wikimedia.org/wikipedia/commons/9/9d/Ubuntu_logo.svg');", ) assertTrue(stylesDir.resolve("custom-style-to-add.css").isFile) projectDir.allHtmlFiles().forEach { file -> if(file.name != "navigation.html") assertTrue("custom-style-to-add.css" in file.readText(), "custom styles not added to html file ${file.name}") } - assertEquals("""/* custom stylesheet */""", stylesDir.resolve("custom-style-to-add.css").readText()) + assertContains(stylesDir.resolve("custom-style-to-add.css").readText(), """/* custom stylesheet */""") assertTrue(imagesDir.resolve("custom-resource.svg").isFile) assertConfiguredVisibility(projectDir) -- cgit