Skip to content

Commit be1bb4d

Browse files
ZacSweerstschuchortdev
ZacSweers
authored and
tschuchortdev
committed
Use new factories in tests
1 parent 62ad5e8 commit be1bb4d

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

‎src/test/kotlin/com/tschuchort/compiletesting/KotlinCompilationTests.kt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.tschuchort.compiletesting
22

3-
import org.assertj.core.api.Assertions.assertThat
43
import com.tschuchort.compiletesting.KotlinCompilation.ExitCode
4+
import org.assertj.core.api.Assertions.assertThat
55
import org.assertj.core.api.Assertions.fail
66
import org.junit.Rule
77
import org.junit.Test
@@ -20,7 +20,7 @@ class KotlinCompilationTests {
2020
@Test
2121
fun `runs with only kotlin sources`() {
2222
val result = defaultCompilerConfig().apply {
23-
sources = listOf(SourceFile.new("kSource.kt", "class KSource"))
23+
sources = listOf(SourceFile.kotlin("kSource.kt", "class KSource"))
2424
}.compile()
2525

2626
assertThat(result.exitCode).isEqualTo(ExitCode.OK)
@@ -30,7 +30,7 @@ class KotlinCompilationTests {
3030
@Test
3131
fun `runs with only java sources`() {
3232
val result = defaultCompilerConfig().apply {
33-
sources = listOf(SourceFile.new("JSource.java", "class JSource {}"))
33+
sources = listOf(SourceFile.java("JSource.java", "class JSource {}"))
3434
}.compile()
3535

3636
assertThat(result.exitCode).isEqualTo(ExitCode.OK)
@@ -85,7 +85,7 @@ class KotlinCompilationTests {
8585

8686
@Test
8787
fun `Kotlin can access JDK`() {
88-
val source = SourceFile.new("kSource.kt", """
88+
val source = SourceFile.kotlin("kSource.kt", """
8989
|import javax.lang.model.SourceVersion
9090
|import java.io.File
9191
|
@@ -104,7 +104,7 @@ class KotlinCompilationTests {
104104

105105
@Test
106106
fun `Kotlin can not access JDK`() {
107-
val source = SourceFile.new("kSource.kt", """
107+
val source = SourceFile.kotlin("kSource.kt", """
108108
|import javax.lang.model.SourceVersion
109109
|import java.io.File
110110
|
@@ -125,7 +125,7 @@ class KotlinCompilationTests {
125125

126126
@Test
127127
fun `can compile Kotlin without JDK`() {
128-
val source = SourceFile.new("kSource.kt", "class KClass")
128+
val source = SourceFile.kotlin("kSource.kt", "class KClass")
129129

130130
val result = defaultCompilerConfig().apply {
131131
sources = listOf(source)
@@ -138,7 +138,7 @@ class KotlinCompilationTests {
138138

139139
@Test
140140
fun `Java can access JDK`() {
141-
val source = SourceFile.new("JSource.java", """
141+
val source = SourceFile.java("JSource.java", """
142142
|import javax.lang.model.SourceVersion;
143143
|import java.io.File;
144144
|
@@ -159,7 +159,7 @@ class KotlinCompilationTests {
159159

160160
@Test
161161
fun `Java can not access JDK`() {
162-
val source = SourceFile.new("JSource.java", """
162+
val source = SourceFile.java("JSource.java", """
163163
|import javax.lang.model.SourceVersion;
164164
|import java.io.File;
165165
|
@@ -181,7 +181,7 @@ class KotlinCompilationTests {
181181

182182
@Test
183183
fun `Java inherits classpath`() {
184-
val source = SourceFile.new("JSource.java", """
184+
val source = SourceFile.java("JSource.java", """
185185
package com.tschuchort.compiletesting;
186186
187187
class JSource {
@@ -202,7 +202,7 @@ class KotlinCompilationTests {
202202

203203
@Test
204204
fun `Java doesn't inherit classpath`() {
205-
val source = SourceFile.new("JSource.java", """
205+
val source = SourceFile.java("JSource.java", """
206206
package com.tschuchort.compiletesting;
207207
208208
class JSource {
@@ -223,7 +223,7 @@ class KotlinCompilationTests {
223223

224224
@Test
225225
fun `Kotlin inherits classpath`() {
226-
val source = SourceFile.new("KSource.kt", """
226+
val source = SourceFile.kotlin("KSource.kt", """
227227
package com.tschuchort.compiletesting
228228
229229
class KSource {
@@ -245,7 +245,7 @@ class KotlinCompilationTests {
245245

246246
@Test
247247
fun `Kotlin doesn't inherit classpath`() {
248-
val source = SourceFile.new("KSource.kt", """
248+
val source = SourceFile.kotlin("KSource.kt", """
249249
package com.tschuchort.compiletesting
250250
251251
class KSource {
@@ -267,7 +267,7 @@ class KotlinCompilationTests {
267267

268268
@Test
269269
fun `Compiled Kotlin class can be loaded`() {
270-
val source = SourceFile.new("Source.kt", """
270+
val source = SourceFile.kotlin("Source.kt", """
271271
package com.tschuchort.compiletesting
272272
273273
class Source {
@@ -301,7 +301,7 @@ class KotlinCompilationTests {
301301

302302
@Test
303303
fun `Compiled Java class can be loaded`() {
304-
val source = SourceFile.new("Source.java", """
304+
val source = SourceFile.java("Source.java", """
305305
package com.tschuchort.compiletesting;
306306
307307
public class Source {
@@ -330,15 +330,15 @@ class KotlinCompilationTests {
330330

331331
@Test
332332
fun `Kotlin can access Java class`() {
333-
val jSource = SourceFile.new("JSource.java", """
333+
val jSource = SourceFile.java("JSource.java", """
334334
package com.tschuchort.compiletesting;
335335
336336
class JSource {
337337
void foo() {}
338338
}
339339
""".trimIndent())
340340

341-
val kSource = SourceFile.new("KSource.kt", """
341+
val kSource = SourceFile.kotlin("KSource.kt", """
342342
package com.tschuchort.compiletesting
343343
344344
class KSource {
@@ -359,7 +359,7 @@ class KotlinCompilationTests {
359359

360360
@Test
361361
fun `Java can access Kotlin class`() {
362-
val jSource = SourceFile.new("JSource.java", """
362+
val jSource = SourceFile.java("JSource.java", """
363363
package com.tschuchort.compiletesting;
364364
365365
class JSource {
@@ -369,7 +369,7 @@ class KotlinCompilationTests {
369369
}
370370
""".trimIndent())
371371

372-
val kSource = SourceFile.new("KSource.kt", """
372+
val kSource = SourceFile.kotlin("KSource.kt", """
373373
package com.tschuchort.compiletesting
374374
375375
class KSource {
@@ -388,7 +388,7 @@ class KotlinCompilationTests {
388388

389389
@Test
390390
fun `Java AP sees Kotlin class`() {
391-
val kSource = SourceFile.new(
391+
val kSource = SourceFile.kotlin(
392392
"KSource.kt", """
393393
package com.tschuchort.compiletesting
394394
@@ -413,7 +413,7 @@ class KotlinCompilationTests {
413413

414414
@Test
415415
fun `Java AP sees Java class`() {
416-
val jSource = SourceFile.new(
416+
val jSource = SourceFile.java(
417417
"JSource.java", """
418418
package com.tschuchort.compiletesting;
419419
@@ -438,7 +438,7 @@ class KotlinCompilationTests {
438438

439439
@Test
440440
fun `Kotlin AP sees Kotlin class`() {
441-
val kSource = SourceFile.new(
441+
val kSource = SourceFile.kotlin(
442442
"KSource.kt", """
443443
package com.tschuchort.compiletesting
444444
@@ -465,7 +465,7 @@ class KotlinCompilationTests {
465465

466466
@Test
467467
fun `Kotlin AP sees Java class`() {
468-
val jSource = SourceFile.new(
468+
val jSource = SourceFile.java(
469469
"JSource.kt", """
470470
package com.tschuchort.compiletesting;
471471
@@ -491,7 +491,7 @@ class KotlinCompilationTests {
491491

492492
@Test
493493
fun `Given only Java sources, Kotlin sources are generated and compiled`() {
494-
val jSource = SourceFile.new(
494+
val jSource = SourceFile.java(
495495
"JSource.java", """
496496
package com.tschuchort.compiletesting;
497497
@@ -517,7 +517,7 @@ class KotlinCompilationTests {
517517

518518
@Test
519519
fun `Java can access generated Kotlin class`() {
520-
val jSource = SourceFile.new(
520+
val jSource = SourceFile.java(
521521
"JSource.java", """
522522
package com.tschuchort.compiletesting;
523523
import ${KotlinTestProcessor.GENERATED_PACKAGE}.${KotlinTestProcessor.GENERATED_KOTLIN_CLASS_NAME};
@@ -544,7 +544,7 @@ class KotlinCompilationTests {
544544

545545
@Test
546546
fun `Java can access generated Java class`() {
547-
val jSource = SourceFile.new(
547+
val jSource = SourceFile.java(
548548
"JSource.java", """
549549
package com.tschuchort.compiletesting;
550550
import ${KotlinTestProcessor.GENERATED_PACKAGE}.${KotlinTestProcessor.GENERATED_JAVA_CLASS_NAME};
@@ -571,7 +571,7 @@ class KotlinCompilationTests {
571571

572572
@Test
573573
fun `Kotlin can access generated Kotlin class`() {
574-
val kSource = SourceFile.new(
574+
val kSource = SourceFile.kotlin(
575575
"KSource.kt", """
576576
package com.tschuchort.compiletesting
577577
import ${KotlinTestProcessor.GENERATED_PACKAGE}.${KotlinTestProcessor.GENERATED_KOTLIN_CLASS_NAME}
@@ -598,7 +598,7 @@ class KotlinCompilationTests {
598598

599599
@Test
600600
fun `Kotlin can access generated Java class`() {
601-
val kSource = SourceFile.new(
601+
val kSource = SourceFile.kotlin(
602602
"KSource.kt", """
603603
package com.tschuchort.compiletesting
604604
import ${KotlinTestProcessor.GENERATED_PACKAGE}.${KotlinTestProcessor.GENERATED_JAVA_CLASS_NAME}
@@ -647,4 +647,4 @@ class KotlinCompilationTests {
647647
}
648648

649649
class InheritedClass {}
650-
}
650+
}

0 commit comments

Comments
 (0)