From e5e2b196d7e5a7c9e442c80917290cb006c976c5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 3 Jul 2015 10:07:15 +0200 Subject: [PATCH] IDEA-CR-3419 move kt file according to code style --- .../testSrc/BinaryRequestHandlerTest.kt | 2 +- .../built-in-server/testSrc/RestApiTest.kt | 2 +- .../com/intellij/options/SchemeManagerTest.kt | 21 ++++++++++++++++--- .../intellij/testFramework}/FixtureRule.kt | 3 +-- .../testFramework}/TemporaryDirectory.kt | 2 +- .../intellij/testFramework}/matchers.kt | 2 +- 6 files changed, 23 insertions(+), 9 deletions(-) rename platform/testFramework/testSrc/{ => com/intellij/testFramework}/FixtureRule.kt (93%) rename platform/testFramework/testSrc/{ => com/intellij/testFramework}/TemporaryDirectory.kt (96%) rename platform/testFramework/testSrc/{ => com/intellij/testFramework}/matchers.kt (97%) diff --git a/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt b/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt index 1d3b65cc977f..dbce08860f58 100644 --- a/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt +++ b/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt @@ -1,5 +1,6 @@ package org.jetbrains.ide +import com.intellij.testFramework.FixtureRule import com.intellij.util.Consumer import com.intellij.util.concurrency.Semaphore import com.intellij.util.net.NetUtils @@ -17,7 +18,6 @@ import org.jetbrains.io.ChannelExceptionHandler import org.jetbrains.io.Decoder import org.jetbrains.io.MessageDecoder import org.jetbrains.io.NettyUtil -import org.jetbrains.testFramework.FixtureRule import org.junit.Rule import org.junit.Test import org.junit.rules.RuleChain diff --git a/platform/built-in-server/testSrc/RestApiTest.kt b/platform/built-in-server/testSrc/RestApiTest.kt index b4716ebfac5e..223cc0121693 100644 --- a/platform/built-in-server/testSrc/RestApiTest.kt +++ b/platform/built-in-server/testSrc/RestApiTest.kt @@ -2,10 +2,10 @@ package org.jetbrains.ide import com.google.gson.stream.JsonWriter import com.intellij.openapi.vfs.CharsetToolkit +import com.intellij.testFramework.FixtureRule import io.netty.handler.codec.http.HttpResponseStatus import org.hamcrest.CoreMatchers.equalTo import org.jetbrains.ide.TestManager.TestDescriptor -import org.jetbrains.testFramework.FixtureRule import org.junit.Assert.assertThat import org.junit.Rule import org.junit.Test diff --git a/platform/platform-tests/testSrc/com/intellij/options/SchemeManagerTest.kt b/platform/platform-tests/testSrc/com/intellij/options/SchemeManagerTest.kt index 2cb9d57572d9..fffcb55dda35 100644 --- a/platform/platform-tests/testSrc/com/intellij/options/SchemeManagerTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/options/SchemeManagerTest.kt @@ -1,3 +1,18 @@ +/* + * Copyright 2000-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. + */ package com.intellij.options import com.intellij.openapi.application.invokeAndWaitIfNeed @@ -9,7 +24,10 @@ import com.intellij.openapi.util.JDOMUtil import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil +import com.intellij.testFramework.FixtureRule import com.intellij.testFramework.PlatformTestUtil +import com.intellij.testFramework.TemporaryDirectory +import com.intellij.testFramework.exists import com.intellij.util.SmartList import com.intellij.util.lang.CompoundRuntimeException import com.intellij.util.xmlb.SkipDefaultValuesSerializationFilters @@ -25,9 +43,6 @@ import org.hamcrest.CoreMatchers.sameInstance import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.collection.IsMapContaining.hasKey import org.jdom.Element -import org.jetbrains.testFramework.FixtureRule -import org.jetbrains.testFramework.TemporaryDirectory -import org.jetbrains.testFramework.exists import org.junit.Rule import org.junit.Test import java.io.File diff --git a/platform/testFramework/testSrc/FixtureRule.kt b/platform/testFramework/testSrc/com/intellij/testFramework/FixtureRule.kt similarity index 93% rename from platform/testFramework/testSrc/FixtureRule.kt rename to platform/testFramework/testSrc/com/intellij/testFramework/FixtureRule.kt index 06506fa0c744..b28101e05f4a 100644 --- a/platform/testFramework/testSrc/FixtureRule.kt +++ b/platform/testFramework/testSrc/com/intellij/testFramework/FixtureRule.kt @@ -13,10 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.testFramework +package com.intellij.testFramework import com.intellij.openapi.application.invokeAndWaitIfNeed -import com.intellij.testFramework.UsefulTestCase import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory import org.junit.rules.ExternalResource diff --git a/platform/testFramework/testSrc/TemporaryDirectory.kt b/platform/testFramework/testSrc/com/intellij/testFramework/TemporaryDirectory.kt similarity index 96% rename from platform/testFramework/testSrc/TemporaryDirectory.kt rename to platform/testFramework/testSrc/com/intellij/testFramework/TemporaryDirectory.kt index d49ca2587174..bddbac49783e 100644 --- a/platform/testFramework/testSrc/TemporaryDirectory.kt +++ b/platform/testFramework/testSrc/com/intellij/testFramework/TemporaryDirectory.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.testFramework +package com.intellij.testFramework import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtilRt diff --git a/platform/testFramework/testSrc/matchers.kt b/platform/testFramework/testSrc/com/intellij/testFramework/matchers.kt similarity index 97% rename from platform/testFramework/testSrc/matchers.kt rename to platform/testFramework/testSrc/com/intellij/testFramework/matchers.kt index 7f2fb364bba4..88dba511bd03 100644 --- a/platform/testFramework/testSrc/matchers.kt +++ b/platform/testFramework/testSrc/com/intellij/testFramework/matchers.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.testFramework +package com.intellij.testFramework import org.hamcrest.Description import org.hamcrest.Factory