From b2a676764092b0762e61f5a3700452e7aa4fb71f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 10 Aug 2018 15:10:31 +0200 Subject: [PATCH] Cleanup (test data format) --- .../pkg/TestPrivateEmptyConstructor.class | Bin 420 -> 424 bytes .../pkg/TestSynchronizedUnprotected.class | Bin 532 -> 1154 bytes .../results/TestPrivateEmptyConstructor.dec | 20 ++++---- .../results/TestSynchronizedUnprotected.dec | 43 ++++++++++++------ .../src/pkg/TestPrivateEmptyConstructor.java | 8 ++-- .../src/pkg/TestSynchronizedUnprotected.kt | 3 +- 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/testData/classes/pkg/TestPrivateEmptyConstructor.class b/testData/classes/pkg/TestPrivateEmptyConstructor.class index cf452491f39304de763af86a8a2538f6d1e63ad1..a8aa7e0701ce62d7d56209a1db333a80fe86c004 100644 GIT binary patch delta 18 acmZ3&yn=bc3|9Gq>~#H!iP96dd;kDG2?tUD delta 14 WcmZ3%yo7ne3`XgRiP95yd;kC@y#?I> diff --git a/testData/classes/pkg/TestSynchronizedUnprotected.class b/testData/classes/pkg/TestSynchronizedUnprotected.class index 2346ca5f54ca7e18a1e9b6c92ef8d7039805dbea..e5cc393649a8c118ab6bfa14b438c8683de41fb0 100644 GIT binary patch literal 1154 zcmah{OHUI~6#nk?F=Z%H%EJOuid2ObC{ytP7!yE<)wU9+bi-=ePRgb2Ow+kVaK+ZO z|Gt;3ernFCX86F0&pfm>0%xsasx@9#2kgo)5N478; zGI}V=YE$fR)~&>?)OL%TLK7`RZ>$ELwML=~U_BvpQQ0 zVgO+UAq+C~)+|xyW@^XeM0J=UkjZO>wfx2=LtnPbNv&@q(t{Cv1)1cTIwU zWt^MtahqW(d&973o*n)!wE~UvonERNGA6H%MbK5MGNu^(&p2^>9>g^K3cQFj3|tb- z8A7kC=Q>uI2RR1y(ex-6|Vf+zB7*fEPxoUEMqshG}z)_B#5uZ3^BnirnT@cFi;` zp$l@^P$AK9oKK=P``{V>ClE^CRv^uxEqAH0^1uI17C6T;OcYCl4PX;sYKa0dAN@g&J bd9q@`(Neo$HWs1o!e=9DBW=TPJ9_#b&29xr literal 532 zcmaKoOHaZ;6otEy9%4L8E`jH7+!9p^5DL zNiNhwiLZ@KdT;04@7z1RukVjf0M?ODAcoX1(wK~6B!LXF5>pb>0ByHWK+-41-CYDU#p8}6lRLn1CQYhw=c5;+?SSQME1$0sn}cb1y2J}vE68*Cd<&gLM(m~*9sW4k%vlMksV2rUYk!4GpN(R;kF-syTF$y6u_C|=?W0A8z E0i;ZCmH+?% diff --git a/testData/results/TestPrivateEmptyConstructor.dec b/testData/results/TestPrivateEmptyConstructor.dec index c2a5aa4..3f866b1 100644 --- a/testData/results/TestPrivateEmptyConstructor.dec +++ b/testData/results/TestPrivateEmptyConstructor.dec @@ -1,3 +1,5 @@ +package pkg; + public final class TestPrivateEmptyConstructor { private TestPrivateEmptyConstructor() { }// 4 @@ -7,20 +9,20 @@ public final class TestPrivateEmptyConstructor { }// 8 } -class 'TestPrivateEmptyConstructor' { +class 'pkg/TestPrivateEmptyConstructor' { method ' ()V' { - 4 2 + 4 4 } method 'test ()V' { - 0 5 - 3 5 - 5 5 - 8 6 + 0 7 + 3 7 + 5 7 + 8 8 } } Lines mapping: -4 <-> 3 -7 <-> 6 -8 <-> 7 +4 <-> 5 +7 <-> 8 +8 <-> 9 diff --git a/testData/results/TestSynchronizedUnprotected.dec b/testData/results/TestSynchronizedUnprotected.dec index 8a789bd..d6405e8 100644 --- a/testData/results/TestSynchronizedUnprotected.dec +++ b/testData/results/TestSynchronizedUnprotected.dec @@ -1,25 +1,42 @@ +package pkg; + +import kotlin.Metadata; +import kotlin.Unit; + +@Metadata( + mv = {1, 1, 11}, + bv = {1, 0, 2}, + k = 1, + xi = 2, + d1 = {"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0010\u0000\n\u0002\b\u0002\n\u0002\u0010\u0002\u0018\u00002\u00020\u0001B\u0005ยข\u0006\u0002\u0010\u0002J\u0006\u0010\u0003\u001a\u00020\u0004"}, + d2 = {"Lpkg/TestSynchronizedUnprotected;", "", "()V", "test", ""} +) public final class TestSynchronizedUnprotected { public final void test() { - synchronized(this) {// 5 - System.out.println("test");// 6 + synchronized(this) { + String var2 = "Boom";// 6 + System.out.println(var2); + Unit var3 = Unit.INSTANCE;// 5 7 } - }// 7 + } } -class 'TestSynchronizedUnprotected' { +class 'pkg/TestSynchronizedUnprotected' { method 'test ()V' { - 3 2 - 4 3 - 7 3 - 9 3 - e 5 + 3 15 + 5 16 + 7 16 + 8 17 + c 17 + f 18 + 12 18 + 15 20 } } Lines mapping: -5 <-> 3 -6 <-> 4 -7 <-> 6 +5 <-> 19 +6 <-> 17 +7 <-> 19 Not mapped: 8 - diff --git a/testData/src/pkg/TestPrivateEmptyConstructor.java b/testData/src/pkg/TestPrivateEmptyConstructor.java index 3548536..3323c93 100644 --- a/testData/src/pkg/TestPrivateEmptyConstructor.java +++ b/testData/src/pkg/TestPrivateEmptyConstructor.java @@ -1,11 +1,9 @@ package pkg; -public final class PrivateEmptyConstructor { - - private PrivateEmptyConstructor() {} +public final class TestPrivateEmptyConstructor { + private TestPrivateEmptyConstructor() {} public final void test() { System.out.println("test"); } -} - +} \ No newline at end of file diff --git a/testData/src/pkg/TestSynchronizedUnprotected.kt b/testData/src/pkg/TestSynchronizedUnprotected.kt index a6c04e9..59d8c6b 100644 --- a/testData/src/pkg/TestSynchronizedUnprotected.kt +++ b/testData/src/pkg/TestSynchronizedUnprotected.kt @@ -1,5 +1,6 @@ +package pkg -object TestSynchronizedUnprotected { +class TestSynchronizedUnprotected { fun test() { synchronized(this) { println("Boom")