From c303cd5db5a811bfba8feef4eb9cb6876919a423 Mon Sep 17 00:00:00 2001 From: avasseur Date: Wed, 20 Apr 2005 12:46:46 +0000 Subject: [PATCH] refactored to avoid clash and duplicate class with modules/testing. Package for modules/testing-util is now org.aspectj.testingutil --- .../testing/util/TestCompareClassFile$1.class | Bin 463 -> 0 bytes .../testing/util/TestCompareClassFile.class | Bin 4094 -> 0 bytes .../testingutil/TestCompareClassFile$1.class | Bin 0 -> 611 bytes .../testingutil/TestCompareClassFile.class | Bin 0 -> 4067 bytes testing-util/testsrc/TestingUtilModuleTests.java | 5 ++--- .../TestCompareClassFile.java | 3 +-- .../util => testingutil}/TestUtilTest.java | 7 ++++--- .../{testing/util => testingutil}/UtilTests.java | 6 ++---- 8 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class delete mode 100644 testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class create mode 100644 testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile$1.class create mode 100644 testing-util/testdata/testCompareClassFiles/org/aspectj/testingutil/TestCompareClassFile.class rename testing-util/testsrc/org/aspectj/{testing/util => testingutil}/TestCompareClassFile.java (97%) rename testing-util/testsrc/org/aspectj/{testing/util => testingutil}/TestUtilTest.java (95%) rename testing-util/testsrc/org/aspectj/{testing/util => testingutil}/UtilTests.java (92%) diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile$1.class deleted file mode 100644 index c5db4e907bc0871394784737e8941612fe167c2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 463 zcmb7AyH3ME5S+E07>prcXy_?;2uwr?B84R+Bnu>n(x1&KoaLOOJDdNaLZaXU_$b8M zM7W`$x!u{D*_*k~ulEnQIK>_zuFO0Zb}93^h-+zUrRQ-|t1_N4NUFtB7@3s9+8b5M zgRu`HY!~81#HC>BeO9p4hf9e1=|iKn$V%yBKp0*rt?Fxndw4V>cuDmnL-<$=;2|K4 zQl;fxv&f{Gwj$n?R=Fr=!l)LnhF<-wEMc7f)A1!gY#L1n9;?RWvdux*|0~{En}87B zYAsC{T3VdLVV@iW;0~>EM(f;Na3!vT<2P))cGn@FK}VZ(qD{u(4+&csG2-9*U2xK2 cp7r8kN1mV;(n{!Hhv^O?>~am5*SZ0sZ^$rVApigX diff --git a/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class b/testing-util/testdata/testCompareClassFiles/org/aspectj/testing/util/TestCompareClassFile.class deleted file mode 100644 index 52c60e6eedb52f8f3589ae96703cd32f074c7bba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4094 zcmb7H`+M8u6@Fzqk>jd2Q@4b)EbACe94Dc`GDf&GqzSmQ6I#1TFN0QblthUwd$OE1 zEtgWtfN{TVYoWk^5!i)MwmL1@x^821u4t9Ip`Z<$LI@zHU>TGK_|PGt^Gk8&y3I0f2w}7Eu^cOekDCaTH6f7gOnfO{ zY_6YWN(j|T<3p_|^37WgAICK-p%<;VkyHy3ZfbETVKbbPZVy9T{|s|Zr9!`QgA1>EW;h>sc^^kCA`b%Wn*jpdrVWEaSr-I=tqp93MGcR zWsy)NJA(B05vtmx+lMmt5g=jD&6qdDo|q|U3RGdSA0rah)htYHEX%>_ zw0kOJlv~Zv4#e$Mm*K20V2=|!?oG!{Siu;^L(njB$qI1KWlVDVRY4pFis&L#iC@l@ zc)WE;K^8f&)i_i2#eB&Wc}d(Lt3CQoYE&?_B6kM?(6aid)@O`zeTxmoL0<2T=`8lU zN@HW1+07{2#WhsChcc$=Hme!q7K`JWjVm~anGg=(kc2fgHZaPRHtNj910g&p2+>$O zc6_GuQ<|Y4(o7i-O9)zdM@&Zxy6i~V=0|W;M0!+$FSI;}$0TgJyb3R^T}uI58y*kg z2%aGFhIY`hLo4{c@OT7Iu@-fd{f>D3RXDjv!83SP6!9Ea%Y<4?=1t9ZKpcqy&tJfc z!p}<*WO6N`im_Z+M3oz_;0MCh580JVF_v+h%hA+w`Dsn~Q1Ggw{2KdJ1FvVKXqjq; zl+Fse>Ul%P>x`@y`*HX-dLhjwx&JN>iz)rp{$atH{_YEc#`~<-Uyn}Z` zI3cUWb?Fdju?hN1d?>nfiigeoYw76dXb$36 zmw>yVHK&C^naolP1J2EH5v2cGNDy-+8^9d3(c}|^ts-zdIQ21ck z_IR>vnf=(8=o=v3R^C#x6=Xvxd(y=l9ecXii(ZGI2Y)@|hM}4E{A)#gl|S79&_7=u z8zCde`v!p05I=lB;C)#9#`AjxPgY_THCFR!yKM<9JA-v+uwhI1D+8x&!)9C6&ufeh z+v%u-VSr|apgK0kZBv!54%WvjaO^{B`OwVk zTGa76NEGiSN4FEZ9h9f-NDlEfB7r1z=obUzG6#rSgVgttc-yIerRZrl`VgZJe?jzJ z^thYR_t5WNM!)a>h`x)_8)>!2jXusgMC}`*W!zszCeao>cLw@-OeLfKm_Npcyr*o3 zKoguEontzQCQNyPZa{%D@HB$&!eodrQ!G;Eqs&6d2`ary0tTt~dGu3+82IoB1WwK4 zLDu_Favn!^Q+6!;y*WHNFbgHtUdGd9JU`6umyaWKOuE=~^5TD_0e@HBEY`=$_|bWs zxHZrixPbaugpbupl${*r<*nlv{}rh_iC|OUE!_VRX3Kc5tKQ!w&*GYh9I2A+#^{aaE&_ivZX~Bb_cqs@%QLv@=ZCu(d>85NpfxzQsDC7mm>O*=&} zOmiIzD~_T5m*&o#Kl2biY9Y$-Xl3hctkGkrScWL!Y8pLE=Co+i_zOMeN?D;eqd#&< z;0E2QeTw`h{UPAc^$}3MMbQQ2771GKV6FBWoY$fzBwMB$;1b(p!y*o_gFVVDXKlsM ZE^@;DYh5F5qYVwQepJR+ zWjq!~CmKTR@i>m)i8!9bQ!?%qTAz-i4@YG@6US;aWIQX@&qeWk96k7&7``rsZ;0&| z#PCfqd`rf+#r&NZzKie0u^vao^7~?VQD}Hc#>--EMDYVLzaoZXQT$NGt1^Bh4j&xeGg>H0=*ms0GwPtBniGQs+tSU6?GoCDt7hF+O?#heG_)wLmC#nR^cmIG za#eFeg0!2G9%Ywqs>YtNDXnBLR_D^FE>ux&w)z(WAf+=BSh3D?x*2apm zHm)`d+eczhRhyA$Wgjteqi*W<&2-eB)Tw+RSG6Vv)q0JLQ-iivx0$wvts8?yJ`Yzb zHPzCF4Ygk1r5hR(5TrK};w=xjXxU~>{8qV~(CnOEx3gwmtx4FLa?|EmAZ5ERi(ZcV zd>lej*sKWIPTz(QC4E|(Wh4fc_J@(bG%E4|V+=78DBKOKlzTAej!teT;hwGp$-VhNq=Yb!NoiWb8lPqN z7q;P9mD|^Wgh@$lRc3oY?>a=F+hv^sNal$AQK?Nrt0%8(+ zmO|cuINCCPtl%}gF5?XaC-4*c>hAzay`C(2r(MDA*r{L$pCiUE2jUyHNC0u0HBHTO z60g;TvNsiM!}T)WQt&q3ks5d z@H4z8exu;GV);8Q8_!|qHbl^gApM=ci)MJrn?g?QtZCPh;Gu;mBk6^ZLYZa!r)UYhgw2OL0 z%jvLCxEV_A7Q0(gm)91>32Sc^!D)3tHXjKa{l{{?C-@H7 z!kG`&8f2gEPL5;V-o@Nri}W+`Y|@^CSK=+@=a}yvovoyKd@Fo>X(S4L6DcWYq6EjpXC)Y zfa~~UJLPki=!Bd*5W@}FPL3P7x|91M&TVHPok8H%uHfiNE(5rUV+Yj%S3|}|#IXrC zbCq;xZMX%uawSuE2i3Dz@OK*x2dRD-J3aM1ooVH_jNv-Km2UCXm= zhJw#8&o;=o_=53#8>R2Ul{M+p2&EbSDTLE=h#cTrK80v24_!`*uH!hw8}>F{cCUAG zp}6wMVz(3C9SgeqowXOYn@l(En|y+jCm29(dBIzj5Crne3+`A#Foe@Iyr~c z40=s|4m}4*`&3u&X{;UH+{BeHVs-F{^l|TTbY{4|s)%={Y_*N;U+eB4e*KHa@^lKY!=osKojk# zvH{(PZhro5K%K3{X2)u<@yxL0%o4wc37!WDjfYs4hncoVn5ajg;W13&aY`K_#}nLn zl21?ZgY{{=jH5V)XLt*JmUq18cwu`U|G*1QA@(w{MXX|Zwlc|w35ya-6rp^9I?HTz wOgqLg!C5>_lExbq=AdJWW!gZE(=Z5&ozz<4ZkSY)ya7fs%UQI@h!6(;2Uc;zWB>pF literal 0 HcmV?d00001 diff --git a/testing-util/testsrc/TestingUtilModuleTests.java b/testing-util/testsrc/TestingUtilModuleTests.java index 32084c1a2..a81847cb2 100644 --- a/testing-util/testsrc/TestingUtilModuleTests.java +++ b/testing-util/testsrc/TestingUtilModuleTests.java @@ -14,17 +14,16 @@ // default package -import org.aspectj.testing.util.UtilTests; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.aspectj.testingutil.UtilTests; public class TestingUtilModuleTests extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(TestingUtilModuleTests.class.getName()); - suite.addTest(UtilTests.suite()); + suite.addTest(UtilTests.suite()); return suite; } diff --git a/testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java b/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java similarity index 97% rename from testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java rename to testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java index e4dcf8050..61e88e97a 100644 --- a/testing-util/testsrc/org/aspectj/testing/util/TestCompareClassFile.java +++ b/testing-util/testsrc/org/aspectj/testingutil/TestCompareClassFile.java @@ -11,7 +11,7 @@ * Xerox/PARC initial implementation * ******************************************************************/ -package org.aspectj.testing.util; +package org.aspectj.testingutil; import org.aspectj.util.LangUtil; @@ -103,7 +103,6 @@ public class TestCompareClassFile implements Runnable { * Trim ending lines from a StringBuffer, * clipping to maxLines and further removing any number of * trailing lines accepted by checker. - * @param checker returns true if trailing line should be elided. * @param stack StringBuffer with lines to elide * @param maxLines int for maximum number of resulting lines */ diff --git a/testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java b/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java similarity index 95% rename from testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java rename to testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java index 41abff3c9..00fb0f385 100644 --- a/testing-util/testsrc/org/aspectj/testing/util/TestUtilTest.java +++ b/testing-util/testsrc/org/aspectj/testingutil/TestUtilTest.java @@ -11,7 +11,7 @@ * Xerox/PARC initial implementation * ******************************************************************/ -package org.aspectj.testing.util; +package org.aspectj.testingutil; import java.io.File; import java.io.IOException; @@ -21,6 +21,7 @@ import junit.framework.TestCase; import org.aspectj.bridge.MessageHandler; import org.aspectj.bridge.MessageUtil; import org.aspectj.util.FileUtil; +import org.aspectj.testing.util.TestUtil; /** * @@ -33,7 +34,7 @@ public class TestUtilTest extends TestCase { public void testFileCompareNonClass() throws IOException { MessageHandler holder = new MessageHandler(); - File thisFile = new File(UtilTests.TESTING_UTIL_PATH + "/testsrc/org/aspectj/testing/util/TestUtilTest.java"); + File thisFile = new File(UtilTests.TESTING_UTIL_PATH + "/testsrc/org/aspectj/testingutil/TestUtilTest.java"); //File thisFile = new File("src/testing-util.lst"); assertTrue(TestUtil.sameFiles(holder, thisFile, thisFile)); @@ -99,7 +100,7 @@ public class TestUtilTest extends TestCase { } MessageHandler holder = new MessageHandler(); File classBase = new File(UtilTests.TESTING_UTIL_PATH + "/testdata/testCompareClassFiles"); - String path = "org/aspectj/testing/util/TestCompareClassFile.class"; + String path = "org/aspectj/testingutil/TestCompareClassFile.class"; File classFile = new File(classBase, path); try { diff --git a/testing-util/testsrc/org/aspectj/testing/util/UtilTests.java b/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java similarity index 92% rename from testing-util/testsrc/org/aspectj/testing/util/UtilTests.java rename to testing-util/testsrc/org/aspectj/testingutil/UtilTests.java index cd36e8b60..f23834fa7 100644 --- a/testing-util/testsrc/org/aspectj/testing/util/UtilTests.java +++ b/testing-util/testsrc/org/aspectj/testingutil/UtilTests.java @@ -10,9 +10,7 @@ * Contributors: * Xerox/PARC initial implementation * ******************************************************************/ - - -package org.aspectj.testing.util; +package org.aspectj.testingutil; import junit.framework.*; @@ -23,7 +21,7 @@ public class UtilTests extends TestCase { TestSuite suite = new TestSuite(UtilTests.class.getName()); // for now, do not include SuiteTest because it would take 15 minutes //$JUnit-BEGIN$ - suite.addTestSuite(TestUtilTest.class); + suite.addTestSuite(TestUtilTest.class); //$JUnit-END$ return suite; } -- 2.39.5