azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests: "infix modifier required" and "operator modifier required" errors

Browse Source
This commit is contained in:
Yan Zhulanow
2015-11-26 15:56:56 +03:00
parent a3ff3ffc45
commit 9d1af5a17e
635 changed files with 1283 additions and 1617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/test/MathTest.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class MathTest {
assertEquals(BigInteger("0"), a / b)
assertEquals(BigInteger("-2"), -a)
assertEquals(BigInteger("1"), -a % b)
assertEquals(BigInteger("-2"), -a remainder b)
assertEquals(BigInteger("-2"), (-a).remainder(b))
}
@test fun testBigDecimal() {
libraries/stdlib/test/collections/MapJVMTest.kt
+1 -1
View File
@@ -26,7 +26,7 @@ class MapJVMTest {
@test fun toSortedMapWithComparator() {
val map = mapOf(Pair("c", 3), Pair("bc", 2), Pair("bd", 4), Pair("abc", 1))
val sorted = map.toSortedMap(compareBy<String> { it.length } thenBy { it })
val sorted = map.toSortedMap(compareBy<String> { it.length }.thenBy { it })
assertEquals(listOf("c", "bc", "bd", "abc"), sorted.keys.toList())
assertEquals(1, sorted["abc"])
assertEquals(2, sorted["bc"])
libraries/stdlib/test/concurrent/ThreadTest.kt
+1 -1
View File
@@ -13,7 +13,7 @@ class ThreadTest {
val pool = Executors.newFixedThreadPool(1)
val countDown = CountDownLatch(1)
pool execute {
pool.execute {
countDown.countDown()
}
assertTrue(countDown.await(2, SECONDS), "Count down is executed")
libraries/stdlib/test/numbers/CoercionTest.kt
+10 -10
View File
@@ -9,12 +9,12 @@ class CoercionTest {
fun usage() {
val n = 1
// infix usage
val n1 = n coerceAtLeast 2
val n1 = n.coerceAtLeast(2)
// function usage
val n2 = n.coerceAtLeast(2)
// infix with range
val n3 = n coerceIn 2..5
val n3 = n.coerceIn(2..5)
}
@Test
@@ -32,8 +32,8 @@ class CoercionTest {
expect(value.coerceAtLeast(min)) { value.coerceIn(min, null) }
expect(value.coerceAtMost(max)) { value.coerceIn(null, max) }
expect(value.coerceAtLeast(min).coerceAtMost(max)) { value.coerceIn(min, max) }
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value coerceIn range }
assertTrue((value coerceIn range) in range)
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value.coerceIn(range) }
assertTrue((value.coerceIn(range)) in range)
}
assertFails { 1.coerceIn(1, 0) }
@@ -55,8 +55,8 @@ class CoercionTest {
expect(value.coerceAtLeast(min)) { value.coerceIn(min, null) }
expect(value.coerceAtMost(max)) { value.coerceIn(null, max) }
expect(value.coerceAtLeast(min).coerceAtMost(max)) { value.coerceIn(min, max) }
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value coerceIn range }
assertTrue((value coerceIn range) in range)
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value.coerceIn(range) }
assertTrue((value.coerceIn(range)) in range)
}
assertFails { 1L.coerceIn(1L, 0L) }
@@ -80,8 +80,8 @@ class CoercionTest {
expect(value.coerceAtLeast(min)) { value.coerceIn(min, null) }
expect(value.coerceAtMost(max)) { value.coerceIn(null, max) }
expect(value.coerceAtLeast(min).coerceAtMost(max)) { value.coerceIn(min, max) }
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value coerceIn range }
assertTrue((value coerceIn range) in range)
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value.coerceIn(range) }
assertTrue((value.coerceIn(range)) in range)
}
assertFails { 1.0.coerceIn(1.0, 0.0) }
@@ -109,8 +109,8 @@ class CoercionTest {
expect(value.coerceAtLeast(min)) { value.coerceIn(min, null) }
expect(value.coerceAtMost(max)) { value.coerceIn(null, max) }
expect(value.coerceAtLeast(min).coerceAtMost(max)) { value.coerceIn(min, max) }
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value coerceIn range }
assertTrue((value coerceIn range) in range)
expect(value.coerceAtMost(max).coerceAtLeast(min)) { value.coerceIn(range) }
assertTrue((value.coerceIn(range)) in range)
}
assertFails { v[1].coerceIn(v[1], v[0]) }
libraries/tools/idl2k/src/main/kotlin/gen.kt
+13 -2
View File
@@ -182,8 +182,19 @@ fun generateUnions(ifaces: List<GenerateTraitOrClass>, typedefs: Iterable<Typede
val typedefsMarkersMap = typedefsToBeGenerated.groupBy { it.name }.mapValues { mapUnionType(it.value.first().value).copy(name = it.key) }
val typeNamesToUnions = anonymousUnionTypes.toList().flatMap { unionType -> unionType.memberTypes.filterIsInstance<SimpleType>().map { unionMember -> unionMember.type to unionType.name } }.toMultiMap() merge
typedefsToBeGenerated.flatMap { typedef -> typedef.value.memberTypes.filterIsInstance<SimpleType>().map { unionMember -> unionMember.type to typedef.name } }.toMultiMap()
val typeNamesToUnions = anonymousUnionTypes
.toList()
.flatMap { unionType ->
unionType.memberTypes
.filterIsInstance<SimpleType>()
.map { unionMember -> unionMember.type to unionType.name }
}.toMultiMap()
.merge(typedefsToBeGenerated
.flatMap { typedef ->
typedef.value.memberTypes
.filterIsInstance<SimpleType>()
.map { unionMember -> unionMember.type to typedef.name }
}.toMultiMap())
return GenerateUnionTypes(
typeNamesToUnionsMap = typeNamesToUnions,
libraries/tools/idl2k/src/main/kotlin/main.kt
+1 -1
View File
@@ -19,7 +19,7 @@ fun main(args: Array<String>) {
Repository(
interfaces = acc.interfaces.mergeReduce(fileRepository.interfaces, ::merge),
typeDefs = acc.typeDefs + fileRepository.typeDefs,
externals = acc.externals merge fileRepository.externals,
externals = acc.externals.merge(fileRepository.externals),
enums = acc.enums + fileRepository.enums
)
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+5 -5
View File
@@ -148,7 +148,7 @@ class Kotlin2JvmSourceSetProcessor(
val aptConfiguration = project.createAptConfiguration(sourceSet.getName(), kotlinAnnotationProcessingDep)
project afterEvaluate { project ->
project.afterEvaluate { project ->
if (project != null) {
for (dir in sourceSet.getJava().getSrcDirs()) {
kotlinDirSet?.srcDir(dir)
@@ -318,7 +318,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
project.createKaptExtension()
project afterEvaluate { project ->
project.afterEvaluate { project ->
if (project != null) {
val plugin = (project.getPlugins().findPlugin("android")
?: project.getPlugins().findPlugin("android-library")) as BasePlugin
@@ -405,7 +405,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
subpluginEnvironment.addSubpluginArguments(project, kotlinTask)
kotlinTask doFirst {
kotlinTask.doFirst {
val androidRT = project.files(AndroidGradleWrapper.getRuntimeJars(androidPlugin, androidExt))
val fullClasspath = (javaTask.getClasspath() + androidRT) - project.files(kotlinTask.property("kotlinDestinationDir"))
(it as AbstractCompile).setClasspath(fullClasspath)
@@ -431,7 +431,7 @@ open class KotlinAndroidPlugin @Inject constructor(val scriptHandler: ScriptHand
}
}
javaTask doFirst {
javaTask.doFirst {
javaTask.setClasspath(javaTask.getClasspath() + project.files(kotlinTask.property("kotlinDestinationDir")))
}
}
@@ -514,7 +514,7 @@ open class GradleUtils(val scriptHandler: ScriptHandler, val project: ProjectInt
val dependencyHandler: DependencyHandler = scriptHandler.getDependencies()
val configurationsContainer: ConfigurationContainer = scriptHandler.getConfigurations()
val deps = coordinates map { dependencyHandler.create(it) }
val deps = coordinates.map { dependencyHandler.create(it) }
val configuration = configurationsContainer.detachedConfiguration(*deps.toTypedArray())
return configuration.getResolvedConfiguration().getFiles { true }
libraries/tools/kotlin-js-tests-junit/src/main/kotlin/org/jetbrains/kotlin/js/qunit/SeleniumQUnit.kt
+1 -1
View File
@@ -82,7 +82,7 @@ public class SeleniumQUnit(val driver: WebDriver) {
}
}
private fun WebElement.get(id: String): String? = getAttribute(id)
private operator fun WebElement.get(id: String): String? = getAttribute(id)
private val WebElement.classAttribute: String?
get() = this["class"]
libraries/tools/kotlin-maven-plugin-test/src/it/test-reflection/src/main/kotlin/main/main.kt
+1 -1
View File
@@ -33,7 +33,7 @@ fun box(): String {
l()
val ext = Int::extProp
if (ext.get(42) != 42) return "Fail ext: ${ext[42]}"
if (ext.get(42) != 42) return "Fail ext: ${ext.get(42)}"
val a = A::class
if (a.memberProperties.size() != 1) return "Fail: ${a.memberProperties}"