From fb31fd910e9c4906149b2552a161fa88276ba1f6 Mon Sep 17 00:00:00 2001 From: shautvast Date: Mon, 30 Jun 2014 19:53:33 +0200 Subject: [PATCH] issues fixed --- .classpath | 1 - bin/nl/jssl/autounit/CoverageAnalyser.class | Bin 6273 -> 6164 bytes bin/nl/jssl/autounit/PrimtiveTypeTests.class | Bin 4091 -> 3719 bytes .../CoreTutorial$MemoryClassLoader.class | Bin 1339 -> 0 bytes .../examples/CoreTutorial$TestTarget.class | Bin 1064 -> 0 bytes bin/org/jacoco/examples/CoreTutorial.class | Bin 5641 -> 0 bytes src/nl/jssl/autounit/CoverageAnalyser.java | 4 ++-- tst/nl/jssl/autounit/PrimtiveTypeTests.java | 5 +---- 8 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 bin/org/jacoco/examples/CoreTutorial$MemoryClassLoader.class delete mode 100644 bin/org/jacoco/examples/CoreTutorial$TestTarget.class delete mode 100644 bin/org/jacoco/examples/CoreTutorial.class diff --git a/.classpath b/.classpath index 7f1f3f7..de71593 100644 --- a/.classpath +++ b/.classpath @@ -3,7 +3,6 @@ - diff --git a/bin/nl/jssl/autounit/CoverageAnalyser.class b/bin/nl/jssl/autounit/CoverageAnalyser.class index 7fd5a441ea1e5f89b365cbe1cc159eeb653a6e45..4f39d4b7d135d3360e8758ea64a1fa5080b778d9 100644 GIT binary patch delta 94 zcmZoPoMOOx>ff$?3=9m$i~{ToOp`xyicEH36xe8($;_xR*`Gz6$2T=Mzo^nVC$YFV iXY&c>os3LcK9~|4Sg-PIJ|{Gbm6MT?4`>_{BR>Fl^BgMx delta 229 zcmbPY&}hhY>ff$?3=9m$j3OJkCNS$6(G{rcQr(O=T9=SqNWOeqhEA0%0K?#wweXXfg!e}4Z1z<&Iqp-fh=jAxF^fr+dfkU1}>p+aE!m@#g|EyGU7dxpnk$`e@9YSR9wKzTGa zC{WSijK~PeQLUpAO9YlBOcVEIe~4-|3{J# zsPhQvwDfxYVarT)NpI8{;qJ)ED=C@vOvfhN6#|>`aJ!v;KQ$U!&RS_$DX=bY)Gt%M zYkCv21_EpPeA_cKa?s3~MB8TDj%NfBn2n_4rsHElzEqA98dh;f34=bFa@-N=YFHx> zD_K@tQkId+$y~hC_S)REpOLngi=YAPR2J8ha5R~R*`bURu|Z|9QO71U5=*)y8@16` zxXJfSE1on7u#z=bzp|y+h8-HV3)~U-oi)+16H%5iXI^EgSkul3n$WCa7h~kDY}H0bOBty_1)H!(tUGqi4=2Db!?(tFwGA8i9slDJZRl8fl(m+gd>1l@~2aFCG>% zag=&ksdC8N$+UE5@~7b-i(8WIHY!{dOS%ypK()HurQ>cKrj*^FP;7^JvRweE%g82{ zq7_Fq93jno0=b~$7>?7`B{|VA*&Zv3iojQiDzpoz&5ozw5>=YE{mFvNk7_cODq;{iNKc(%O4B-YJ%D40BKwuj~$T%jsD49n`1 zIp6Yf)p!KM8jPap)jvT6WOSr3LX|r{gVcu=HXSwlY>)MjMut%?3aknM2EoHJwfm;U zhK}F@Ms=7NW1-oA9nLsOr)3yfU>9)*J!7PtloRI^ka5E{tcje-Ru9^EW((6{!Pbxw z*ty6pIvix#zznQrYzGH7b1SfY;i#b*cum8r95R6l ziuIx6bp>9_D#=*362zN2-cpXMnXNvVbzEvob3-kv<1jCFHAkp%jtW+xa6yd;$}*E; zHRm}IOC(O?)5U%Z=jAk!(v!8+kD8@h3p^3XJf3DJZoA`H(y;Rr_fuA)Wa1W{Z*z9! zs_?nM;r|+j%-{eAKy)~a6U@Tqf+qrIe?Q{BnBf_g%25PaCS3NY~y@vnT z(_AgbvcReg%V|{?JhLHrS58e-&=0WgCK`rnS5IN>BsL`LuzA-FY!$e69WfQEJP371 zfUBO)S79wy2O%56?b9J^7&4AM4851T6rAwQK0XP4kS?M1TnK*?LItfyZsNeu6b{v{ zp2VF=#;07nnrqu`prZ`e(aASm0yl77sXfQq6W(9!&$43_)g&C#WDY+i1}x?llcxJ-AN`<@{W;56PfQK z^X6O3{ENjg|FVer*SC}T9x~rc=KF$*@8>7t5Dt?0p$x0Cr{GEb0s ZE14f*&5x4#F)}}Xi<$q#UMR!Q{{p(5y%_)i literal 4091 zcmcIn`CA)R6g>}Uho)0)V~Jf<=%xu!V(sEWZ41~c8d?NIsp}A4)1i}@I13i*zVCb8 z_kCZgf>^ho{VV)S{5)?akO|S+AKH)aOD6B#ckey-o_pr;=ifj724FM(&`>9^*0!?a zo@Zr^z;^=M^t1i0S@g{bIW$?4L(=m-4GjWI$BhXiYZ-PSyKi({=6!*M+fCZ<5U5XQ zh6NgWoH3a|Jr?O$fQ15Q=1g1e4T_`E9Wq8ODUi%LdBYkuTvPonFE;oGO;2Eb?*B9C z6j<&vr7NZ1AB^_{ACEs*xrn^j_xsvW)XE4Ygj4bD@G@K={x?(ga z^MPynlXC_FD+dDGH;Z!E^h{>kW!sK#gb`ScoZ}X<<6*s2jXE`)Es&`}ppwm7hUZBy z+iUw>ZXqa2+xHr=Qb3mz(%$D@XRB`wt68y1LOtr#BAkn64d)3gtL)H^EJ#;J3)Zme zLnHmWxu2^Tghx9QScP>u)?z!@RRxgDJ}-ohGq=AC30Y1o^ly^App==ks;QBf)#bvC$ z>WS;`zCAE3(q}=sw>LAa;%wJ(ITWXvnLtyzH(rT|`7G@=>{5=p1TKg}Ebqr^S6)%` zu`0GaucQJ?O4WQ`8X3yWL-mgzhX{5#&k#=Ae;%q3MAdH zsDjhuSZa!>P^`y6jB7ACAeDMl_H`VB#Y9ck-S8ckt*`RbTVAIh8zl`6g|*^mc2~#k z;L!$K9%gBm&w7X{I47AqwJ(5Z&U*~Y8jxOK`IMmv9M*70)mvb2lDsJDn8cl&7AK&q zrigf^quwF5&n`)$$S8LSoE;_@29KK89hg?A79Q@=aWC#;`#Eww&ICahWE5GTjd_P% zF!D~`$x>ou*02q0(le>3A>C$=upAHIAq@|5C{OZ;j)(CGRfU1oyQ+sTK-N}Z!-=Ct zW{me3p3v~Pz?u`pi;Q(Vsgz1Z>N6=lV_~cWp2o8po~bTusL48>!}9`KNTz+H)jTOG zD|Z4%@S;-Nm*&yAyq_6v#LJw7mSPyS#Ue~k9eP#AYj~Y(HA*FEj|psy55w%~n37br zjS_eSZ|ZmpZ?#|J8Tt)wVp*$H^~NXN&@v3hL{ z$dcodTbdhjQC%x4WLN4!j#EH5Z}AN!9;9V4&u;$9&7y|lG`_OhZ(K#oKx%I&wSJVs zu8VnMBLCuPPKUc4$C8F!(c$mdi5eY_UnAz7;8o&#fy@3&B3Z#93P5@^iW4eid+f(W z8FEj#@1FE!C5tJ6))QwDGiM4v@y1n7LFq7~Ug7YCCex#|i)5Met>Wyl9AoYtq~SP6 z{Dgt3>>24-fpcP!T#naR`hape8zwR61a4mLG1ZMTRdbu|Q0&1PkR7}R0}J`Y>ncAr z{>t)O@Owe)G#bC-Lmd)jBOr;zeAXiaelOuK&NL6#i4ohjZynLdG-^%IH&;r<+ zOeI$|{EAg0^~Z3|;1t&8j^q51WNI4eDYW%1XrDn=;3sTtYpeBvQ;1 zXkvgAny~^Iti%?q4wGsL(QGXzmBc#kbu+nU+VSSsP*W}t}uuq_`J$c;>u2-4e%$2;r3<~O_DDVfoy~hw7$B~hZQ@DEu z_p6OZ6`-f4@j~+G6keIa8&i0PRm#l`uo8n4j_0^o!*CFz6P7e9ERmhK>PUIP8 z+DasCMBYvu8;QJw$g`&y`41pW+LB0J$K5sM) z(aJ1aw%BMpmaTJRd`&bg`(WANtya-0&oR{Zr)|`eo#u-#wv@BzfoMc-xs1NUsG9~H1BXNGZ ziOY7!Nciv-=~DU|5lE$#^vNg8941rIBg`IBngUnRh%8wnWhMH*jwoJAGRae@4w-m| pOdRugNMyov=h9N}h;RnLez;FEO*fC}?85?{(AV{r;VE(m`~ojBIX3_R diff --git a/bin/org/jacoco/examples/CoreTutorial$TestTarget.class b/bin/org/jacoco/examples/CoreTutorial$TestTarget.class deleted file mode 100644 index 1417539bfd3b767b0e334de7133f3003d4124439..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1064 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 ZYO%gAQKEYTxvyalS;pARvhUItBl_6Ps~ diff --git a/src/nl/jssl/autounit/CoverageAnalyser.java b/src/nl/jssl/autounit/CoverageAnalyser.java index b3c5fc0..199eba3 100644 --- a/src/nl/jssl/autounit/CoverageAnalyser.java +++ b/src/nl/jssl/autounit/CoverageAnalyser.java @@ -4,6 +4,7 @@ import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import nl.jssl.autounit.utils.MemoryClassloader; import nl.jssl.autounit.utils.SilentObjectCreator; import org.jacoco.core.analysis.Analyzer; @@ -15,7 +16,6 @@ import org.jacoco.core.instr.Instrumenter; import org.jacoco.core.runtime.IRuntime; import org.jacoco.core.runtime.LoggerRuntime; import org.jacoco.core.runtime.RuntimeData; -import org.jacoco.examples.CoreTutorial.MemoryClassLoader; public class CoverageAnalyser { private IRuntime runtime; @@ -33,7 +33,7 @@ public class CoverageAnalyser { data = new RuntimeData(); runtime.startup(data); - MemoryClassLoader memoryClassLoader = new MemoryClassLoader(); + MemoryClassloader memoryClassLoader = new MemoryClassloader(); memoryClassLoader.addDefinition(targetName, instrumented); Class targetClass = (Class) memoryClassLoader.loadClass(targetName); diff --git a/tst/nl/jssl/autounit/PrimtiveTypeTests.java b/tst/nl/jssl/autounit/PrimtiveTypeTests.java index 2bac963..e0e89d0 100644 --- a/tst/nl/jssl/autounit/PrimtiveTypeTests.java +++ b/tst/nl/jssl/autounit/PrimtiveTypeTests.java @@ -1,6 +1,6 @@ package nl.jssl.autounit; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.lang.reflect.Method; @@ -18,12 +18,9 @@ import org.junit.Test; public class PrimtiveTypeTests { @Test public void testGetPublicMethods() throws NoSuchMethodException, SecurityException { - Method evenOrUneven = IntArguments.class.getMethod("evenOrUneven", int.class); List publicMethods = new Recorder(IntArguments.class).getPublicMethods(); assertEquals(2, publicMethods.size()); - assertEquals(evenOrUneven, publicMethods.get(0)); - } @Test