Skip to content

Commit 0ebb5ed

Browse files
SrTobibuilduser
authored andcommitted
[random-typing-test] fixed some problems with random typing tests
(cherry picked from commit 31bbfc0)
1 parent 08dfdba commit 0ebb5ed

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scala/scala-impl/src/org/jetbrains/plugins/scala/extensions/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1834,7 +1834,7 @@ package object extensions {
18341834
* OS resources.
18351835
*/
18361836
def allFiles(): Seq[Path] = {
1837-
val (files, directories) = children().partition(_.isRegularFile)
1837+
val (directories, files) = children().partition(_.isDirectory)
18381838
files ++ directories.flatMap(_.allFiles())
18391839
}
18401840

scala/scala-impl/test/org/jetbrains/plugins/scala/lang/randomTyping/RandomTypingTest.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.intellij.util.lang.CompoundRuntimeException
66
import com.intellij.util.ui.EDT
77
import org.jetbrains.plugins.scala.base.EditorActionTestBase
88
import org.jetbrains.plugins.scala.extensions._
9+
import org.jetbrains.plugins.scala.lang.parser.scala3.imported.Scala3ImportedParserTestConfig
910
import org.jetbrains.plugins.scala.lang.randomTyping.RandomTypingTest._
1011
import org.jetbrains.plugins.scala.util.TestUtils
1112
import org.jetbrains.plugins.scala.{RandomTypingTests, ScalaVersion}
@@ -30,8 +31,8 @@ class RandomTypingTest_in_Scala3 extends RandomTypingTestBase(TestUtils.getTestD
3031
}
3132

3233
@Category(Array(classOf[RandomTypingTests]))
33-
class RandomTypingTest_in_Scala3_ImportedData extends RandomTypingTestBase(TestUtils.getTestDataPath + "/parser/scala3Import/success") {
34-
override protected def supportedIn(version: ScalaVersion): Boolean = version >= ScalaVersion.Latest.Scala_3_0
34+
class RandomTypingTest_in_Scala3_ImportedData extends RandomTypingTestBase(TestUtils.getTestDataPath + "/" + Scala3ImportedParserTestConfig.Newest.successDataDirectory) {
35+
override protected def supportedIn(version: ScalaVersion): Boolean = version == Scala3ImportedParserTestConfig.Newest.scalaTargetVersion
3536

3637
//def test_specific(): Unit = {
3738
// typeRandomly(

0 commit comments

Comments
 (0)