From 14c91801310348759ae9725a330c8bd025e06ae5 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 3 Jan 2018 10:22:44 +0100 Subject: [PATCH] move jetCheck to org.jetbrains --- .../propertyBased/AbstractApplyAndRevertTestCase.java | 2 +- .../java/propertyBased/JavaCodeInsightSanityTest.java | 4 ++-- .../java/propertyBased/JavaPsiIndexConsistencyTest.kt | 4 ++-- .../com/intellij/java/propertyBased/UnivocityTest.java | 6 +++--- .../jetbrains}/jetCheck/AbstractDataStructure.java | 2 +- .../jetbrains}/jetCheck/BoundedIntDistribution.java | 2 +- .../{ => org/jetbrains}/jetCheck/CannotRestoreValue.java | 2 +- .../jetbrains}/jetCheck/CannotSatisfyCondition.java | 2 +- .../{ => org/jetbrains}/jetCheck/CounterExampleImpl.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/DataStructure.java | 2 +- .../{ => org/jetbrains}/jetCheck/FrequencyGenerator.java | 2 +- .../jetbrains}/jetCheck/GenerativeDataStructure.java | 2 +- jetCheck/src/{ => org/jetbrains}/jetCheck/Generator.java | 2 +- .../{ => org/jetbrains}/jetCheck/GeneratorException.java | 2 +- .../{ => org/jetbrains}/jetCheck/ImperativeCommand.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/IntCustomizer.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/IntDistribution.java | 2 +- jetCheck/src/{ => org/jetbrains}/jetCheck/Iteration.java | 2 +- jetCheck/src/{ => org/jetbrains}/jetCheck/NodeId.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/PropertyChecker.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/PropertyFailure.java | 2 +- .../{ => org/jetbrains}/jetCheck/PropertyFailureImpl.java | 2 +- .../{ => org/jetbrains}/jetCheck/PropertyFalsified.java | 4 ++-- .../src/{ => org/jetbrains}/jetCheck/RemoveListRange.java | 2 +- .../{ => org/jetbrains}/jetCheck/ReplayDataStructure.java | 2 +- jetCheck/src/{ => org/jetbrains}/jetCheck/Scenario.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/ScenarioImpl.java | 2 +- jetCheck/src/{ => org/jetbrains}/jetCheck/ShrinkStep.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/StatusNotifier.java | 2 +- .../src/{ => org/jetbrains}/jetCheck/StructureNode.java | 2 +- .../test/{ => org/jetbrains}/jetCheck/ExceptionTest.java | 7 +++++-- .../test/{ => org/jetbrains}/jetCheck/GeneratorTest.java | 7 +++++-- .../jetbrains}/jetCheck/PropertyCheckerTestCase.java | 5 ++++- .../jetbrains}/jetCheck/RecursiveGeneratorTest.java | 5 ++++- .../test/{ => org/jetbrains}/jetCheck/ShrinkTest.java | 6 +++--- .../jetbrains}/jetCheck/StatefulGeneratorTest.java | 8 +++++--- .../com/intellij/psi/impl/PsiEventConsistencyTest.kt | 6 +++--- .../propertyBased/CheckHighlighterConsistency.java | 2 +- .../intellij/testFramework/propertyBased/DeleteRange.java | 4 ++-- .../testFramework/propertyBased/InsertLineComment.java | 2 +- .../testFramework/propertyBased/InsertString.java | 2 +- .../testFramework/propertyBased/InvokeCompletion.java | 4 ++-- .../testFramework/propertyBased/InvokeIntention.java | 2 +- .../testFramework/propertyBased/MadTestingUtil.java | 6 +++--- .../propertyBased/PsiIndexConsistencyTester.kt | 2 +- .../testSrc/com/intellij/util/text/StringUtilTest.java | 4 ++-- .../python/propertyBased/PythonCodeInsightSanityTest.java | 4 ++-- 47 files changed, 80 insertions(+), 66 deletions(-) rename jetCheck/src/{ => org/jetbrains}/jetCheck/AbstractDataStructure.java (95%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/BoundedIntDistribution.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/CannotRestoreValue.java (71%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/CannotSatisfyCondition.java (93%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/CounterExampleImpl.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/DataStructure.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/FrequencyGenerator.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/GenerativeDataStructure.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/Generator.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/GeneratorException.java (88%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/ImperativeCommand.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/IntCustomizer.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/IntDistribution.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/Iteration.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/NodeId.java (96%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/PropertyChecker.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/PropertyFailure.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/PropertyFailureImpl.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/PropertyFalsified.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/RemoveListRange.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/ReplayDataStructure.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/Scenario.java (96%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/ScenarioImpl.java (99%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/ShrinkStep.java (97%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/StatusNotifier.java (98%) rename jetCheck/src/{ => org/jetbrains}/jetCheck/StructureNode.java (99%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/ExceptionTest.java (90%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/GeneratorTest.java (96%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/PropertyCheckerTestCase.java (89%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/RecursiveGeneratorTest.java (90%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/ShrinkTest.java (91%) rename jetCheck/test/{ => org/jetbrains}/jetCheck/StatefulGeneratorTest.java (96%) diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java index 63dc33a6bc99..785bce960161 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/AbstractApplyAndRevertTestCase.java @@ -43,7 +43,7 @@ import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.TestDataProvider; import com.intellij.testFramework.UsefulTestCase; import com.intellij.util.containers.ContainerUtil; -import jetCheck.Generator; +import org.jetbrains.jetCheck.Generator; import java.io.File; import java.util.ArrayList; diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java index 3ec4a34d5f20..c9c673365b9c 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaCodeInsightSanityTest.java @@ -23,8 +23,8 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.SkipSlowTestLocally; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.propertyBased.*; -import jetCheck.Generator; -import jetCheck.PropertyChecker; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.PropertyChecker; import org.jetbrains.annotations.NotNull; import java.util.function.Function; diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaPsiIndexConsistencyTest.kt b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaPsiIndexConsistencyTest.kt index 87623a781908..8003b857c652 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaPsiIndexConsistencyTest.kt +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/JavaPsiIndexConsistencyTest.kt @@ -33,8 +33,8 @@ import com.intellij.testFramework.propertyBased.PsiIndexConsistencyTester.Action import com.intellij.testFramework.propertyBased.PsiIndexConsistencyTester.Action.* import com.intellij.testFramework.propertyBased.PsiIndexConsistencyTester.Model import com.intellij.testFramework.propertyBased.PsiIndexConsistencyTester.RefKind -import jetCheck.Generator -import jetCheck.PropertyChecker +import org.jetbrains.jetCheck.Generator +import org.jetbrains.jetCheck.PropertyChecker /** * @author peter diff --git a/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java b/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java index cd252f002476..592ced2814ad 100644 --- a/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java +++ b/java/java-tests/testSrc/com/intellij/java/propertyBased/UnivocityTest.java @@ -23,9 +23,9 @@ import com.intellij.testFramework.SkipSlowTestLocally; import com.intellij.testFramework.propertyBased.*; import com.intellij.util.SystemProperties; import com.intellij.util.containers.ContainerUtil; -import jetCheck.Generator; -import jetCheck.IntDistribution; -import jetCheck.PropertyChecker; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.IntDistribution; +import org.jetbrains.jetCheck.PropertyChecker; import java.util.List; import java.util.concurrent.atomic.AtomicLong; diff --git a/jetCheck/src/jetCheck/AbstractDataStructure.java b/jetCheck/src/org/jetbrains/jetCheck/AbstractDataStructure.java similarity index 95% rename from jetCheck/src/jetCheck/AbstractDataStructure.java rename to jetCheck/src/org/jetbrains/jetCheck/AbstractDataStructure.java index 098d276233d8..80b7b92b5df2 100644 --- a/jetCheck/src/jetCheck/AbstractDataStructure.java +++ b/jetCheck/src/org/jetbrains/jetCheck/AbstractDataStructure.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/BoundedIntDistribution.java b/jetCheck/src/org/jetbrains/jetCheck/BoundedIntDistribution.java similarity index 97% rename from jetCheck/src/jetCheck/BoundedIntDistribution.java rename to jetCheck/src/org/jetbrains/jetCheck/BoundedIntDistribution.java index 41ce31c3ec7c..badcda1d8388 100644 --- a/jetCheck/src/jetCheck/BoundedIntDistribution.java +++ b/jetCheck/src/org/jetbrains/jetCheck/BoundedIntDistribution.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import java.util.Random; import java.util.function.ToIntFunction; diff --git a/jetCheck/src/jetCheck/CannotRestoreValue.java b/jetCheck/src/org/jetbrains/jetCheck/CannotRestoreValue.java similarity index 71% rename from jetCheck/src/jetCheck/CannotRestoreValue.java rename to jetCheck/src/org/jetbrains/jetCheck/CannotRestoreValue.java index 99410fdd15db..ad5ac59cb95b 100644 --- a/jetCheck/src/jetCheck/CannotRestoreValue.java +++ b/jetCheck/src/org/jetbrains/jetCheck/CannotRestoreValue.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; /** * @author peter diff --git a/jetCheck/src/jetCheck/CannotSatisfyCondition.java b/jetCheck/src/org/jetbrains/jetCheck/CannotSatisfyCondition.java similarity index 93% rename from jetCheck/src/jetCheck/CannotSatisfyCondition.java rename to jetCheck/src/org/jetbrains/jetCheck/CannotSatisfyCondition.java index c2fd344e853c..ea65eba05411 100644 --- a/jetCheck/src/jetCheck/CannotSatisfyCondition.java +++ b/jetCheck/src/org/jetbrains/jetCheck/CannotSatisfyCondition.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/CounterExampleImpl.java b/jetCheck/src/org/jetbrains/jetCheck/CounterExampleImpl.java similarity index 98% rename from jetCheck/src/jetCheck/CounterExampleImpl.java rename to jetCheck/src/org/jetbrains/jetCheck/CounterExampleImpl.java index 3e38e248b9ea..17ec189f44c5 100644 --- a/jetCheck/src/jetCheck/CounterExampleImpl.java +++ b/jetCheck/src/org/jetbrains/jetCheck/CounterExampleImpl.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/DataStructure.java b/jetCheck/src/org/jetbrains/jetCheck/DataStructure.java similarity index 97% rename from jetCheck/src/jetCheck/DataStructure.java rename to jetCheck/src/org/jetbrains/jetCheck/DataStructure.java index 61b7cd62bf8d..9acf9518cf33 100644 --- a/jetCheck/src/jetCheck/DataStructure.java +++ b/jetCheck/src/org/jetbrains/jetCheck/DataStructure.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/FrequencyGenerator.java b/jetCheck/src/org/jetbrains/jetCheck/FrequencyGenerator.java similarity index 98% rename from jetCheck/src/jetCheck/FrequencyGenerator.java rename to jetCheck/src/org/jetbrains/jetCheck/FrequencyGenerator.java index 3c0068c33e4a..24dd79e95278 100644 --- a/jetCheck/src/jetCheck/FrequencyGenerator.java +++ b/jetCheck/src/org/jetbrains/jetCheck/FrequencyGenerator.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/GenerativeDataStructure.java b/jetCheck/src/org/jetbrains/jetCheck/GenerativeDataStructure.java similarity index 97% rename from jetCheck/src/jetCheck/GenerativeDataStructure.java rename to jetCheck/src/org/jetbrains/jetCheck/GenerativeDataStructure.java index 68231fe40d45..58f0c8fa82c1 100644 --- a/jetCheck/src/jetCheck/GenerativeDataStructure.java +++ b/jetCheck/src/org/jetbrains/jetCheck/GenerativeDataStructure.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/Generator.java b/jetCheck/src/org/jetbrains/jetCheck/Generator.java similarity index 99% rename from jetCheck/src/jetCheck/Generator.java rename to jetCheck/src/org/jetbrains/jetCheck/Generator.java index c3c0337754da..e76579cd327c 100644 --- a/jetCheck/src/jetCheck/Generator.java +++ b/jetCheck/src/org/jetbrains/jetCheck/Generator.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/GeneratorException.java b/jetCheck/src/org/jetbrains/jetCheck/GeneratorException.java similarity index 88% rename from jetCheck/src/jetCheck/GeneratorException.java rename to jetCheck/src/org/jetbrains/jetCheck/GeneratorException.java index 0862d8256b41..2fdccfdbfc2c 100644 --- a/jetCheck/src/jetCheck/GeneratorException.java +++ b/jetCheck/src/org/jetbrains/jetCheck/GeneratorException.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; /** * @author peter diff --git a/jetCheck/src/jetCheck/ImperativeCommand.java b/jetCheck/src/org/jetbrains/jetCheck/ImperativeCommand.java similarity index 99% rename from jetCheck/src/jetCheck/ImperativeCommand.java rename to jetCheck/src/org/jetbrains/jetCheck/ImperativeCommand.java index 6c6655db13ca..07a7472a0c86 100644 --- a/jetCheck/src/jetCheck/ImperativeCommand.java +++ b/jetCheck/src/org/jetbrains/jetCheck/ImperativeCommand.java @@ -1,7 +1,7 @@ /* * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/IntCustomizer.java b/jetCheck/src/org/jetbrains/jetCheck/IntCustomizer.java similarity index 99% rename from jetCheck/src/jetCheck/IntCustomizer.java rename to jetCheck/src/org/jetbrains/jetCheck/IntCustomizer.java index 977443d92bb8..db9977058e78 100644 --- a/jetCheck/src/jetCheck/IntCustomizer.java +++ b/jetCheck/src/org/jetbrains/jetCheck/IntCustomizer.java @@ -1,5 +1,5 @@ // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/IntDistribution.java b/jetCheck/src/org/jetbrains/jetCheck/IntDistribution.java similarity index 98% rename from jetCheck/src/jetCheck/IntDistribution.java rename to jetCheck/src/org/jetbrains/jetCheck/IntDistribution.java index bb41b61b0c71..0c675680153a 100644 --- a/jetCheck/src/jetCheck/IntDistribution.java +++ b/jetCheck/src/org/jetbrains/jetCheck/IntDistribution.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import java.util.List; import java.util.Random; diff --git a/jetCheck/src/jetCheck/Iteration.java b/jetCheck/src/org/jetbrains/jetCheck/Iteration.java similarity index 99% rename from jetCheck/src/jetCheck/Iteration.java rename to jetCheck/src/org/jetbrains/jetCheck/Iteration.java index d6ecdc6426eb..9b9652ccbcde 100644 --- a/jetCheck/src/jetCheck/Iteration.java +++ b/jetCheck/src/org/jetbrains/jetCheck/Iteration.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/NodeId.java b/jetCheck/src/org/jetbrains/jetCheck/NodeId.java similarity index 96% rename from jetCheck/src/jetCheck/NodeId.java rename to jetCheck/src/org/jetbrains/jetCheck/NodeId.java index 0a4e9f769f81..c90fdfe81c8b 100644 --- a/jetCheck/src/jetCheck/NodeId.java +++ b/jetCheck/src/org/jetbrains/jetCheck/NodeId.java @@ -1,5 +1,5 @@ // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/PropertyChecker.java b/jetCheck/src/org/jetbrains/jetCheck/PropertyChecker.java similarity index 99% rename from jetCheck/src/jetCheck/PropertyChecker.java rename to jetCheck/src/org/jetbrains/jetCheck/PropertyChecker.java index 88abc2ba1550..9e73fdc94cc7 100644 --- a/jetCheck/src/jetCheck/PropertyChecker.java +++ b/jetCheck/src/org/jetbrains/jetCheck/PropertyChecker.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/PropertyFailure.java b/jetCheck/src/org/jetbrains/jetCheck/PropertyFailure.java similarity index 98% rename from jetCheck/src/jetCheck/PropertyFailure.java rename to jetCheck/src/org/jetbrains/jetCheck/PropertyFailure.java index 10301d2afae1..f61768f762d7 100644 --- a/jetCheck/src/jetCheck/PropertyFailure.java +++ b/jetCheck/src/org/jetbrains/jetCheck/PropertyFailure.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/PropertyFailureImpl.java b/jetCheck/src/org/jetbrains/jetCheck/PropertyFailureImpl.java similarity index 99% rename from jetCheck/src/jetCheck/PropertyFailureImpl.java rename to jetCheck/src/org/jetbrains/jetCheck/PropertyFailureImpl.java index b6f255b267d3..e9b875aff24d 100644 --- a/jetCheck/src/jetCheck/PropertyFailureImpl.java +++ b/jetCheck/src/org/jetbrains/jetCheck/PropertyFailureImpl.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/PropertyFalsified.java b/jetCheck/src/org/jetbrains/jetCheck/PropertyFalsified.java similarity index 97% rename from jetCheck/src/jetCheck/PropertyFalsified.java rename to jetCheck/src/org/jetbrains/jetCheck/PropertyFalsified.java index 8a7c9b6b9ace..3dc0afe1cd55 100644 --- a/jetCheck/src/jetCheck/PropertyFalsified.java +++ b/jetCheck/src/org/jetbrains/jetCheck/PropertyFalsified.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import java.util.ArrayList; import java.util.List; @@ -106,7 +106,7 @@ public class PropertyFalsified extends RuntimeException { List result = new ArrayList<>(); for (StackTraceElement element : e.getStackTrace()) { String s = element.toString(); - if (s.startsWith("jetCheck.CounterExampleImpl.checkProperty")) { + if (s.startsWith("org.jetbrains.jetCheck.CounterExampleImpl.checkProperty")) { break; } result.add(s); diff --git a/jetCheck/src/jetCheck/RemoveListRange.java b/jetCheck/src/org/jetbrains/jetCheck/RemoveListRange.java similarity index 98% rename from jetCheck/src/jetCheck/RemoveListRange.java rename to jetCheck/src/org/jetbrains/jetCheck/RemoveListRange.java index d78c9c804d39..6af694f74546 100644 --- a/jetCheck/src/jetCheck/RemoveListRange.java +++ b/jetCheck/src/org/jetbrains/jetCheck/RemoveListRange.java @@ -1,7 +1,7 @@ /* * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/ReplayDataStructure.java b/jetCheck/src/org/jetbrains/jetCheck/ReplayDataStructure.java similarity index 97% rename from jetCheck/src/jetCheck/ReplayDataStructure.java rename to jetCheck/src/org/jetbrains/jetCheck/ReplayDataStructure.java index 6a26bac8854b..296891ff95bc 100644 --- a/jetCheck/src/jetCheck/ReplayDataStructure.java +++ b/jetCheck/src/org/jetbrains/jetCheck/ReplayDataStructure.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/Scenario.java b/jetCheck/src/org/jetbrains/jetCheck/Scenario.java similarity index 96% rename from jetCheck/src/jetCheck/Scenario.java rename to jetCheck/src/org/jetbrains/jetCheck/Scenario.java index 80b09f50c06e..916229b6133c 100644 --- a/jetCheck/src/jetCheck/Scenario.java +++ b/jetCheck/src/org/jetbrains/jetCheck/Scenario.java @@ -1,7 +1,7 @@ /* * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ -package jetCheck; +package org.jetbrains.jetCheck; /** Represents the execution history of an {@link ImperativeCommand} sequence */ public interface Scenario { diff --git a/jetCheck/src/jetCheck/ScenarioImpl.java b/jetCheck/src/org/jetbrains/jetCheck/ScenarioImpl.java similarity index 99% rename from jetCheck/src/jetCheck/ScenarioImpl.java rename to jetCheck/src/org/jetbrains/jetCheck/ScenarioImpl.java index 0dbea7d824e4..c23165b68ca8 100644 --- a/jetCheck/src/jetCheck/ScenarioImpl.java +++ b/jetCheck/src/org/jetbrains/jetCheck/ScenarioImpl.java @@ -1,7 +1,7 @@ /* * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/ShrinkStep.java b/jetCheck/src/org/jetbrains/jetCheck/ShrinkStep.java similarity index 97% rename from jetCheck/src/jetCheck/ShrinkStep.java rename to jetCheck/src/org/jetbrains/jetCheck/ShrinkStep.java index 63c035621e6b..003fb0cf287a 100644 --- a/jetCheck/src/jetCheck/ShrinkStep.java +++ b/jetCheck/src/org/jetbrains/jetCheck/ShrinkStep.java @@ -1,7 +1,7 @@ /* * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/src/jetCheck/StatusNotifier.java b/jetCheck/src/org/jetbrains/jetCheck/StatusNotifier.java similarity index 98% rename from jetCheck/src/jetCheck/StatusNotifier.java rename to jetCheck/src/org/jetbrains/jetCheck/StatusNotifier.java index a29af52ea17f..650c7465cf81 100644 --- a/jetCheck/src/jetCheck/StatusNotifier.java +++ b/jetCheck/src/org/jetbrains/jetCheck/StatusNotifier.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; diff --git a/jetCheck/src/jetCheck/StructureNode.java b/jetCheck/src/org/jetbrains/jetCheck/StructureNode.java similarity index 99% rename from jetCheck/src/jetCheck/StructureNode.java rename to jetCheck/src/org/jetbrains/jetCheck/StructureNode.java index c8ac7807a1f4..a2afed65a0aa 100644 --- a/jetCheck/src/jetCheck/StructureNode.java +++ b/jetCheck/src/org/jetbrains/jetCheck/StructureNode.java @@ -1,4 +1,4 @@ -package jetCheck; +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/jetCheck/test/jetCheck/ExceptionTest.java b/jetCheck/test/org/jetbrains/jetCheck/ExceptionTest.java similarity index 90% rename from jetCheck/test/jetCheck/ExceptionTest.java rename to jetCheck/test/org/jetbrains/jetCheck/ExceptionTest.java index 1d056168fad5..c4e53bada88e 100644 --- a/jetCheck/test/jetCheck/ExceptionTest.java +++ b/jetCheck/test/org/jetbrains/jetCheck/ExceptionTest.java @@ -1,6 +1,9 @@ -package jetCheck; +/* + * Copyright 2000-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 file. + */ +package org.jetbrains.jetCheck; -import static jetCheck.Generator.*; +import static org.jetbrains.jetCheck.Generator.*; /** * @author peter diff --git a/jetCheck/test/jetCheck/GeneratorTest.java b/jetCheck/test/org/jetbrains/jetCheck/GeneratorTest.java similarity index 96% rename from jetCheck/test/jetCheck/GeneratorTest.java rename to jetCheck/test/org/jetbrains/jetCheck/GeneratorTest.java index efb64763b92f..d933b38a6992 100644 --- a/jetCheck/test/jetCheck/GeneratorTest.java +++ b/jetCheck/test/org/jetbrains/jetCheck/GeneratorTest.java @@ -1,10 +1,13 @@ -package jetCheck; +/* + * Copyright 2000-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 file. + */ +package org.jetbrains.jetCheck; import java.util.*; import java.util.function.Predicate; import java.util.stream.Collectors; -import static jetCheck.Generator.*; +import static org.jetbrains.jetCheck.Generator.*; /** * @author peter diff --git a/jetCheck/test/jetCheck/PropertyCheckerTestCase.java b/jetCheck/test/org/jetbrains/jetCheck/PropertyCheckerTestCase.java similarity index 89% rename from jetCheck/test/jetCheck/PropertyCheckerTestCase.java rename to jetCheck/test/org/jetbrains/jetCheck/PropertyCheckerTestCase.java index d62ad3ceef47..e49633d79e74 100644 --- a/jetCheck/test/jetCheck/PropertyCheckerTestCase.java +++ b/jetCheck/test/org/jetbrains/jetCheck/PropertyCheckerTestCase.java @@ -1,4 +1,7 @@ -package jetCheck; +/* + * Copyright 2000-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 file. + */ +package org.jetbrains.jetCheck; import junit.framework.TestCase; diff --git a/jetCheck/test/jetCheck/RecursiveGeneratorTest.java b/jetCheck/test/org/jetbrains/jetCheck/RecursiveGeneratorTest.java similarity index 90% rename from jetCheck/test/jetCheck/RecursiveGeneratorTest.java rename to jetCheck/test/org/jetbrains/jetCheck/RecursiveGeneratorTest.java index 8dd2bbfb8c7d..d2d0135d4b7b 100644 --- a/jetCheck/test/jetCheck/RecursiveGeneratorTest.java +++ b/jetCheck/test/org/jetbrains/jetCheck/RecursiveGeneratorTest.java @@ -1,4 +1,7 @@ -package jetCheck; +/* + * Copyright 2000-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 file. + */ +package org.jetbrains.jetCheck; import java.util.List; import java.util.stream.Collectors; diff --git a/jetCheck/test/jetCheck/ShrinkTest.java b/jetCheck/test/org/jetbrains/jetCheck/ShrinkTest.java similarity index 91% rename from jetCheck/test/jetCheck/ShrinkTest.java rename to jetCheck/test/org/jetbrains/jetCheck/ShrinkTest.java index f47b131cf426..fb7f9e2440ae 100644 --- a/jetCheck/test/jetCheck/ShrinkTest.java +++ b/jetCheck/test/org/jetbrains/jetCheck/ShrinkTest.java @@ -1,7 +1,7 @@ /* - * Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2000-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 file. */ -package jetCheck; +package org.jetbrains.jetCheck; import java.util.Arrays; import java.util.HashSet; @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import java.util.function.Predicate; -import static jetCheck.Generator.*; +import static org.jetbrains.jetCheck.Generator.*; /** * @author peter diff --git a/jetCheck/test/jetCheck/StatefulGeneratorTest.java b/jetCheck/test/org/jetbrains/jetCheck/StatefulGeneratorTest.java similarity index 96% rename from jetCheck/test/jetCheck/StatefulGeneratorTest.java rename to jetCheck/test/org/jetbrains/jetCheck/StatefulGeneratorTest.java index 97156bf21802..12b0a3a70828 100644 --- a/jetCheck/test/jetCheck/StatefulGeneratorTest.java +++ b/jetCheck/test/org/jetbrains/jetCheck/StatefulGeneratorTest.java @@ -1,5 +1,7 @@ -// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -package jetCheck; +/* + * Copyright 2000-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 file. + */ +package org.jetbrains.jetCheck; import org.jetbrains.annotations.NotNull; @@ -7,7 +9,7 @@ import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; -import static jetCheck.Generator.*; +import static org.jetbrains.jetCheck.Generator.*; /** * @author peter diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt index 38dd4c94a8cd..09065d9ad184 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/PsiEventConsistencyTest.kt @@ -12,9 +12,9 @@ import com.intellij.psi.impl.source.tree.* import com.intellij.psi.tree.IElementType import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase -import jetCheck.Generator -import jetCheck.IntDistribution -import jetCheck.PropertyChecker +import org.jetbrains.jetCheck.Generator +import org.jetbrains.jetCheck.IntDistribution +import org.jetbrains.jetCheck.PropertyChecker import one.util.streamex.IntStreamEx /** diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/CheckHighlighterConsistency.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/CheckHighlighterConsistency.java index 3a0190dd18d2..666840142863 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/CheckHighlighterConsistency.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/CheckHighlighterConsistency.java @@ -24,7 +24,7 @@ import com.intellij.psi.PsiFile; import com.intellij.testFramework.LexerTestCase; import org.jetbrains.annotations.NotNull; import org.junit.Assert; -import jetCheck.Generator; +import org.jetbrains.jetCheck.Generator; /** * Checks that incrementally updated editor highlighter produces the same result as it would diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/DeleteRange.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/DeleteRange.java index b0128cdfcfe2..37071d7dd5dd 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/DeleteRange.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/DeleteRange.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import jetCheck.Generator; -import jetCheck.IntDistribution; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.IntDistribution; import java.util.Objects; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertLineComment.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertLineComment.java index 5e382e02d5b2..a4aafd379cd8 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertLineComment.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertLineComment.java @@ -5,7 +5,7 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import jetCheck.Generator; +import org.jetbrains.jetCheck.Generator; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertString.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertString.java index fee949ee4948..208b91e3a710 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertString.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InsertString.java @@ -18,7 +18,7 @@ package com.intellij.testFramework.propertyBased; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import jetCheck.Generator; +import org.jetbrains.jetCheck.Generator; public class InsertString extends ActionOnRange { private final String myToInsert; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeCompletion.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeCompletion.java index 15389b810e0e..70f59931ac24 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeCompletion.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeCompletion.java @@ -40,8 +40,8 @@ import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.TestLookupElementPresentation; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; -import jetCheck.Generator; -import jetCheck.IntDistribution; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.IntDistribution; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeIntention.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeIntention.java index edae4600fad4..c42876d2323a 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeIntention.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/InvokeIntention.java @@ -34,7 +34,7 @@ import com.intellij.psi.util.PsiUtilBase; import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.util.containers.ContainerUtil; -import jetCheck.Generator; +import org.jetbrains.jetCheck.Generator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/MadTestingUtil.java b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/MadTestingUtil.java index 9e3e98af40f0..299723a25f6b 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/MadTestingUtil.java +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/MadTestingUtil.java @@ -42,9 +42,9 @@ import com.intellij.testFramework.UsefulTestCase; import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.util.ThrowableRunnable; import com.intellij.util.ui.UIUtil; -import jetCheck.DataStructure; -import jetCheck.Generator; -import jetCheck.IntDistribution; +import org.jetbrains.jetCheck.DataStructure; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.IntDistribution; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/PsiIndexConsistencyTester.kt b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/PsiIndexConsistencyTester.kt index f5d7f4df713a..a1c7d2de86d9 100644 --- a/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/PsiIndexConsistencyTester.kt +++ b/platform/testFramework/testSrc/com/intellij/testFramework/propertyBased/PsiIndexConsistencyTester.kt @@ -29,7 +29,7 @@ import com.intellij.psi.impl.source.PsiFileImpl import com.intellij.testFramework.PlatformTestUtil import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.util.FileContentUtilCore -import jetCheck.Generator +import org.jetbrains.jetCheck.Generator /** * @author peter diff --git a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java index 62c76dd5ec86..dad07e1dc344 100644 --- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java +++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java @@ -8,8 +8,8 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.LineSeparator; import com.intellij.util.containers.ContainerUtil; import com.intellij.xml.util.XmlStringUtil; -import jetCheck.Generator; -import jetCheck.PropertyChecker; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.PropertyChecker; import org.jdom.Verifier; import org.jetbrains.annotations.NotNull; import org.junit.Test; diff --git a/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java b/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java index c69d5ea8f54b..f370a7073f08 100644 --- a/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java +++ b/python/testSrc/com/intellij/python/propertyBased/PythonCodeInsightSanityTest.java @@ -23,8 +23,8 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture; import com.intellij.testFramework.propertyBased.*; import com.jetbrains.env.PyEnvTestCase; import com.jetbrains.env.PyExecutionFixtureTestTask; -import jetCheck.Generator; -import jetCheck.PropertyChecker; +import org.jetbrains.jetCheck.Generator; +import org.jetbrains.jetCheck.PropertyChecker; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.junit.Test;