From 2e12834b6a529f63e7a7955f4b5c4db24ee7adf9 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 18 Apr 2018 04:32:44 +0300 Subject: [PATCH] Update copyrights in kotlin.test library Change line number in StackTraceJVMTest due to the added copyright --- .../src/main/kotlin/kotlin.test/Annotations.kt | 15 ++------------- .../src/main/kotlin/kotlin/test/Assertions.kt | 15 ++------------- .../src/main/kotlin/kotlin/test/AssertionsH.kt | 5 +++++ .../main/kotlin/kotlin/test/DefaultAsserter.kt | 5 +++++ .../common/src/main/kotlin/kotlin/test/Utils.kt | 5 +++++ .../common/src/main/kotlin/org/junit/Test.kt | 5 +++++ .../kotlin/kotlin/test/tests/AnnotationsTest.kt | 15 ++------------- .../kotlin/test/tests/BasicAssertionsTest.kt | 5 +++++ .../kotlin.test/js/src/main/kotlin/JsTestApi.kt | 15 ++------------- .../js/src/main/kotlin/kotlin/test/Annotations.kt | 15 ++------------- .../main/kotlin/kotlin/test/DefaultJsAsserter.kt | 15 ++------------- .../main/kotlin/kotlin/test/FrameworkAdapter.kt | 15 ++------------- .../js/src/main/kotlin/kotlin/test/JsImpl.kt | 15 ++------------- .../js/src/main/kotlin/kotlin/test/TestApi.kt | 15 ++------------- .../kotlin/kotlin/test/adapters/BareAdapter.kt | 15 ++------------- .../main/kotlin/kotlin/test/adapters/Externals.kt | 15 ++------------- .../kotlin/test/adapters/JasmineLikeAdapter.kt | 15 ++------------- .../kotlin/kotlin/test/adapters/QUnitAdapter.kt | 15 ++------------- .../js/src/main/kotlin/org/junit/junitTest.kt | 5 +++++ .../junit/src/main/kotlin/Annotations.kt | 2 +- .../junit/src/main/kotlin/JUnitSupport.kt | 5 +++++ .../junit/src/test/kotlin/JUnitContributorTest.kt | 5 +++++ .../jvm/src/main/kotlin/AsserterLookup.kt | 5 +++++ .../jvm/src/main/kotlin/AssertionsImpl.kt | 15 ++------------- .../jvm/src/main/kotlin/CollectionAssertions.kt | 15 ++------------- .../jvm/src/test/kotlin/BasicAssertionsJVMTest.kt | 5 +++++ .../src/test/kotlin/CollectionAssertionTest.kt | 5 +++++ .../jvm/src/test/kotlin/StackTraceJVMTest.kt | 7 ++++++- .../jvm/src/test/kotlin/TestJVMTest.kt | 15 ++------------- .../testng/src/main/kotlin/Annotations.kt | 2 +- .../testng/src/main/kotlin/TestNGSupport.kt | 2 +- .../src/test/kotlin/TestNGContributorTest.kt | 5 +++++ 32 files changed, 101 insertions(+), 212 deletions(-) diff --git a/libraries/kotlin.test/annotations-common/src/main/kotlin/kotlin.test/Annotations.kt b/libraries/kotlin.test/annotations-common/src/main/kotlin/kotlin.test/Annotations.kt index a896a7fd085..bf8c1da4eef 100644 --- a/libraries/kotlin.test/annotations-common/src/main/kotlin/kotlin.test/Annotations.kt +++ b/libraries/kotlin.test/annotations-common/src/main/kotlin/kotlin.test/Annotations.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt index 8f159d992ab..080cc0230ac 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Assertions.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ /** diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt index 610b0ae17e0..bb922e72ea0 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/AssertionsH.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test import kotlin.reflect.KClass diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt index 38b6c53267d..0346ac58fba 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/DefaultAsserter.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test /** diff --git a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt index 99e80dc56db..ac1cc8e6eb8 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/kotlin/test/Utils.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test internal fun messagePrefix(message: String?) = if (message == null) "" else "$message. " diff --git a/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt b/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt index 248f466ff06..520f0f847ac 100644 --- a/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt +++ b/libraries/kotlin.test/common/src/main/kotlin/org/junit/Test.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package org.junit /** @suppress */ diff --git a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/AnnotationsTest.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/AnnotationsTest.kt index 60cc1ca9bb1..f70698a86b6 100644 --- a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/AnnotationsTest.kt +++ b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/AnnotationsTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.tests diff --git a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt index c4b5b18dd5c..336d7e00b26 100644 --- a/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt +++ b/libraries/kotlin.test/common/src/test/kotlin/kotlin/test/tests/BasicAssertionsTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.tests import kotlin.test.* diff --git a/libraries/kotlin.test/js/src/main/kotlin/JsTestApi.kt b/libraries/kotlin.test/js/src/main/kotlin/JsTestApi.kt index 091108be4bc..33216df9d95 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/JsTestApi.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/JsTestApi.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ import kotlin.test.* diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/Annotations.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/Annotations.kt index 8fa6d34cdb7..007a2832422 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/Annotations.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/Annotations.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/DefaultJsAsserter.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/DefaultJsAsserter.kt index 0a23bdb4808..98e3ab99333 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/DefaultJsAsserter.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/DefaultJsAsserter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/FrameworkAdapter.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/FrameworkAdapter.kt index ede1fd1a65e..9d03756ee5f 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/FrameworkAdapter.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/FrameworkAdapter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt index d8f7f1b3bac..aab4dcfb208 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/JsImpl.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/TestApi.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/TestApi.kt index ff91735473b..393b31ffd07 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/TestApi.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/TestApi.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/BareAdapter.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/BareAdapter.kt index a53a716a11b..b02fe77d7ce 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/BareAdapter.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/BareAdapter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.adapters diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/Externals.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/Externals.kt index 703233d7945..0927eda7cd9 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/Externals.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/Externals.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.adapters diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/JasmineLikeAdapter.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/JasmineLikeAdapter.kt index b916e772ab2..d70006240b1 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/JasmineLikeAdapter.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/JasmineLikeAdapter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.adapters diff --git a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/QUnitAdapter.kt b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/QUnitAdapter.kt index 749737ba358..764895457a8 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/QUnitAdapter.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/kotlin/test/adapters/QUnitAdapter.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.adapters diff --git a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt b/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt index b832bdd4aba..843566c707c 100644 --- a/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt +++ b/libraries/kotlin.test/js/src/main/kotlin/org/junit/junitTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package org.junit @Deprecated("Use 'Test' from kotlin.test package", diff --git a/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt b/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt index ad4b5b2c9e1..1067d376cca 100644 --- a/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt +++ b/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ diff --git a/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt b/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt index 48676c7e0d9..f6ad516f1cd 100644 --- a/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt +++ b/libraries/kotlin.test/junit/src/main/kotlin/JUnitSupport.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.junit import org.junit.* diff --git a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt index ae61e6a13f2..605ca4d3faa 100644 --- a/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt +++ b/libraries/kotlin.test/junit/src/test/kotlin/JUnitContributorTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.junit.tests import org.junit.Assert diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt index fc191aa3b61..5334a7d8e18 100644 --- a/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt +++ b/libraries/kotlin.test/jvm/src/main/kotlin/AsserterLookup.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test import java.util.ServiceLoader diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt index eb35e9fc415..bd86c6c5243 100644 --- a/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt +++ b/libraries/kotlin.test/jvm/src/main/kotlin/AssertionsImpl.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ @file:kotlin.jvm.JvmMultifileClass diff --git a/libraries/kotlin.test/jvm/src/main/kotlin/CollectionAssertions.kt b/libraries/kotlin.test/jvm/src/main/kotlin/CollectionAssertions.kt index 7d2348413d8..60a690596f5 100644 --- a/libraries/kotlin.test/jvm/src/main/kotlin/CollectionAssertions.kt +++ b/libraries/kotlin.test/jvm/src/main/kotlin/CollectionAssertions.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2017 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ @file:Suppress("DEPRECATION") diff --git a/libraries/kotlin.test/jvm/src/test/kotlin/BasicAssertionsJVMTest.kt b/libraries/kotlin.test/jvm/src/test/kotlin/BasicAssertionsJVMTest.kt index c6e6dc563e8..f83f59d7c4d 100644 --- a/libraries/kotlin.test/jvm/src/test/kotlin/BasicAssertionsJVMTest.kt +++ b/libraries/kotlin.test/jvm/src/test/kotlin/BasicAssertionsJVMTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.tests import kotlin.test.* diff --git a/libraries/kotlin.test/jvm/src/test/kotlin/CollectionAssertionTest.kt b/libraries/kotlin.test/jvm/src/test/kotlin/CollectionAssertionTest.kt index 4ff1608a8d3..1b8bd54dd92 100644 --- a/libraries/kotlin.test/jvm/src/test/kotlin/CollectionAssertionTest.kt +++ b/libraries/kotlin.test/jvm/src/test/kotlin/CollectionAssertionTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + @file:Suppress("DEPRECATION") package kotlin.test.tests diff --git a/libraries/kotlin.test/jvm/src/test/kotlin/StackTraceJVMTest.kt b/libraries/kotlin.test/jvm/src/test/kotlin/StackTraceJVMTest.kt index f024e2c85c5..12ff1d7c766 100644 --- a/libraries/kotlin.test/jvm/src/test/kotlin/StackTraceJVMTest.kt +++ b/libraries/kotlin.test/jvm/src/test/kotlin/StackTraceJVMTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.tests import org.junit.Test @@ -11,7 +16,7 @@ class StackTraceJVMTest { fun testCurrentStackTrace() { /* <-- line number */ val topFrame = currentStackTrace()[0] assertEquals("StackTraceJVMTest.kt", topFrame.fileName) - assertEquals(12, topFrame.lineNumber) + assertEquals(17, topFrame.lineNumber) } @Test diff --git a/libraries/kotlin.test/jvm/src/test/kotlin/TestJVMTest.kt b/libraries/kotlin.test/jvm/src/test/kotlin/TestJVMTest.kt index 13d185b496b..1f9bdc38033 100644 --- a/libraries/kotlin.test/jvm/src/test/kotlin/TestJVMTest.kt +++ b/libraries/kotlin.test/jvm/src/test/kotlin/TestJVMTest.kt @@ -1,17 +1,6 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ package kotlin.test.tests diff --git a/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt b/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt index 04d3dbddbb5..053673b5ac9 100644 --- a/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt +++ b/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ diff --git a/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt b/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt index df70c782454..6bb24db5f8e 100644 --- a/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt +++ b/libraries/kotlin.test/testng/src/main/kotlin/TestNGSupport.kt @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * that can be found in the license/LICENSE.txt file. */ diff --git a/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt b/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt index 07b0fd39d08..1cdb157ac90 100644 --- a/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt +++ b/libraries/kotlin.test/testng/src/test/kotlin/TestNGContributorTest.kt @@ -1,3 +1,8 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + package kotlin.test.testng.tests import org.testng.Assert