From 3ee92da6f0fe46c7203de1676259ca4bbff0022f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 17:50:26 +0400 Subject: [PATCH] Added test with all types of constants. --- .../build/IncrementalJpsTestGenerated.java | 5 +++++ .../incremental/allConstants/build.log | 22 +++++++++++++++++++ .../incremental/allConstants/const.kt | 12 ++++++++++ .../incremental/allConstants/const.kt.new.1 | 12 ++++++++++ .../incremental/allConstants/const.kt.new.2 | 12 ++++++++++ .../incremental/allConstants/usage.kt | 4 ++++ 6 files changed, 67 insertions(+) create mode 100644 jps-plugin/testData/incremental/allConstants/build.log create mode 100644 jps-plugin/testData/incremental/allConstants/const.kt create mode 100644 jps-plugin/testData/incremental/allConstants/const.kt.new.1 create mode 100644 jps-plugin/testData/incremental/allConstants/const.kt.new.2 create mode 100644 jps-plugin/testData/incremental/allConstants/usage.kt diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8ac2e37fa69..d91f934ed53 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -32,6 +32,11 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { + @TestMetadata("allConstants") + public void testAllConstants() throws Exception { + doTest("jps-plugin/testData/incremental/allConstants/"); + } + public void testAllFilesPresentInIncremental() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); } diff --git a/jps-plugin/testData/incremental/allConstants/build.log b/jps-plugin/testData/incremental/allConstants/build.log new file mode 100644 index 00000000000..22f4d62f635 --- /dev/null +++ b/jps-plugin/testData/incremental/allConstants/build.log @@ -0,0 +1,22 @@ +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files + + +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps-plugin/testData/incremental/allConstants/const.kt b/jps-plugin/testData/incremental/allConstants/const.kt new file mode 100644 index 00000000000..d0d300c1312 --- /dev/null +++ b/jps-plugin/testData/incremental/allConstants/const.kt @@ -0,0 +1,12 @@ +package test + +val b: Byte = 100 +val s: Short = 20000 +val i: Int = 2000000 +val l: Long = 2000000000000L +val f: Float = 3.14f +val d: Double = 3.14 +val bb: Boolean = true +val c: Char = '\u03c0' // pi symbol + +val str: String = ":)" diff --git a/jps-plugin/testData/incremental/allConstants/const.kt.new.1 b/jps-plugin/testData/incremental/allConstants/const.kt.new.1 new file mode 100644 index 00000000000..26796869ddc --- /dev/null +++ b/jps-plugin/testData/incremental/allConstants/const.kt.new.1 @@ -0,0 +1,12 @@ +package test + +val b: Byte = 50 + 50 +val s: Short = 10000 + 10000 +val i: Int = 1000000 + 1000000 +val l: Long = 1000000000000L + 1000000000000L +val f: Float = 0.0f + 3.14f +val d: Double = 0.0 + 3.14 +val bb: Boolean = !false +val c: Char = '\u03c0' // pi symbol + +val str: String = ":)" diff --git a/jps-plugin/testData/incremental/allConstants/const.kt.new.2 b/jps-plugin/testData/incremental/allConstants/const.kt.new.2 new file mode 100644 index 00000000000..668b4009dce --- /dev/null +++ b/jps-plugin/testData/incremental/allConstants/const.kt.new.2 @@ -0,0 +1,12 @@ +package test + +val b: Byte = 0 +val s: Short = 0 +val i: Int = 0 +val l: Long = 0 +val f: Float = 0.0f +val d: Double = 0.0 +val bb: Boolean = false +val c: Char = 'x' + +val str: String = ":(" diff --git a/jps-plugin/testData/incremental/allConstants/usage.kt b/jps-plugin/testData/incremental/allConstants/usage.kt new file mode 100644 index 00000000000..a52256d1a83 --- /dev/null +++ b/jps-plugin/testData/incremental/allConstants/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated("$b $s $i $l $f $d $bb $c $str") +class Usage