diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-29 07:18:00 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-07-29 07:18:00 -0700 |
commit | bb5388273724d79b70373f73300a82d54bfe50b6 (patch) | |
tree | 8371f484f00d6231bd7154d80e96aa9b69c916c3 /test/files | |
parent | ce9e98177e7a36327cf4a2d33772b626e9e2e753 (diff) | |
parent | 6c734305a9bad126b38c1235c0ef629c3137769b (diff) | |
download | scala-bb5388273724d79b70373f73300a82d54bfe50b6.tar.gz scala-bb5388273724d79b70373f73300a82d54bfe50b6.tar.bz2 scala-bb5388273724d79b70373f73300a82d54bfe50b6.zip |
Merge pull request #996 from gkossakowski/instrumentation-fixes
Partest instrumentation fixes
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/instrumented/InstrumentationTest.check | 4 | ||||
-rw-r--r-- | test/files/instrumented/InstrumentationTest.scala | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/test/files/instrumented/InstrumentationTest.check b/test/files/instrumented/InstrumentationTest.check index 3652df270a..f0f447560a 100644 --- a/test/files/instrumented/InstrumentationTest.check +++ b/test/files/instrumented/InstrumentationTest.check @@ -1,4 +1,8 @@ true Method call statistics: + 1 Foo1.<init>()V + 1 Foo1.someMethod()I + 1 instrumented/Foo2.<init>()V + 1 instrumented/Foo2.someMethod()I 1 scala/Predef$.println(Ljava/lang/Object;)V 1 scala/runtime/BoxesRunTime.boxToBoolean(Z)Ljava/lang/Boolean; diff --git a/test/files/instrumented/InstrumentationTest.scala b/test/files/instrumented/InstrumentationTest.scala index ec5314c624..0e53f80857 100644 --- a/test/files/instrumented/InstrumentationTest.scala +++ b/test/files/instrumented/InstrumentationTest.scala @@ -1,11 +1,27 @@ import scala.tools.partest.instrumented.Instrumentation._ +/** We check if classes put in empty package are properly instrumented */ +class Foo1 { + def someMethod = 0 +} + +/** We check if classes put in `instrumented` package are properly instrumented */ +package instrumented { + class Foo2 { + def someMethod = 0 + } +} + /** Tests if instrumentation itself works correctly */ object Test { def main(args: Array[String]) { // force predef initialization before profiling Predef startProfiling() + val foo1 = new Foo1 + foo1.someMethod + val foo2 = new instrumented.Foo2 + foo2.someMethod // should box the boolean println(true) stopProfiling() |