From d7b48e910a674d6acc6e231226036ce4f6e61fe1 Mon Sep 17 00:00:00 2001 From: Joe Ferner Date: Wed, 21 May 2025 23:00:22 +0000 Subject: [PATCH] move src directories --- .devcontainer/Dockerfile | 2 +- .vscode/settings.json | 1 + README.md | 19 +++-------------- binding.gyp | 18 ++++++++-------- compile-java.sh | 13 ------------ index.js | 2 +- jarjar.rule | 1 - package.json | 7 +++--- scripts/compile-java.sh | 17 +++++++++++++++ findJavaHome.js => scripts/findJavaHome.js | 0 .../find_java_libdir.sh | 6 ++++-- postInstall.js => scripts/postInstall.js | 2 +- testRunner.js => scripts/testRunner.js | 7 +++--- scripts/update-commons-lang.sh | 20 ++++++++++++++++++ {src => src-cpp}/java.cpp | 0 {src => src-cpp}/java.h | 0 {src => src-cpp}/javaObject.cpp | 0 {src => src-cpp}/javaObject.h | 0 {src => src-cpp}/javaScope.cpp | 0 {src => src-cpp}/javaScope.h | 0 {src => src-cpp}/methodCallBaton.cpp | 0 {src => src-cpp}/methodCallBaton.h | 0 {src => src-cpp}/nodeJavaBridge.cpp | 0 {src => src-cpp}/node_NodeDynamicProxyClass.h | 0 {src => src-cpp}/utils.cpp | 0 {src => src-cpp}/utils.h | 0 .../commons-lang.jarjar.rules | 0 .../commons-lang3-node-java.jar | Bin jarjar-1.4.jar => src-java/jarjar-1.4.jar | Bin src-java/node/CastingUtils.class | Bin 1377 -> 1377 bytes src-java/node/MethodCallBaton.class | Bin 1867 -> 1867 bytes src-java/node/NodeDynamicProxyClass.class | Bin 2231 -> 2231 bytes src-java/node/NodeJsException.class | Bin 242 -> 242 bytes src-java/node/VarArgs.class | Bin 1365 -> 1365 bytes {lib => src-node}/nodeJavaBridge.js | 2 +- test/ListenerInterface.class | Bin 265 -> 265 bytes test/ListenerTester.class | Bin 756 -> 756 bytes test/RunInterface$1.class | Bin 921 -> 941 bytes test/RunInterface$Interface0Arg.class | Bin 204 -> 204 bytes test/RunInterface$Interface1Arg.class | Bin 222 -> 222 bytes test/RunInterface$InterfaceWithReturn.class | Bin 217 -> 217 bytes test/RunInterface.class | Bin 2065 -> 2065 bytes test/Test$Enum.class | Bin 966 -> 1025 bytes test/Test$StaticEnum.class | Bin 866 -> 925 bytes test/Test$SubClass.class | Bin 318 -> 318 bytes test/Test$SuperClass.class | Bin 302 -> 302 bytes test/Test.class | Bin 6565 -> 6565 bytes test/TestExceptions.class | Bin 278 -> 278 bytes test/TestLambda$IntegerMath.class | Bin 195 -> 195 bytes test/TestLambda.class | Bin 1195 -> 1195 bytes testAsyncOptions/allThreeSuffix.test.js | 4 ++-- .../asyncSuffixSyncDefault.test.js | 4 ++-- testAsyncOptions/defacto.test.js | 4 ++-- testAsyncOptions/defactoPlusPromise.test.js | 4 ++-- testAsyncOptions/default.test.js | 4 ++-- testAsyncOptions/noAsync.test.js | 4 ++-- .../syncDefaultPlusPromise.test.js | 4 ++-- testHelpers.js | 1 - update-commons-lang.sh | 15 ------------- 59 files changed, 80 insertions(+), 81 deletions(-) delete mode 100755 compile-java.sh delete mode 100644 jarjar.rule create mode 100755 scripts/compile-java.sh rename findJavaHome.js => scripts/findJavaHome.js (100%) rename find_java_libdir.sh => scripts/find_java_libdir.sh (96%) rename postInstall.js => scripts/postInstall.js (95%) rename testRunner.js => scripts/testRunner.js (84%) create mode 100755 scripts/update-commons-lang.sh rename {src => src-cpp}/java.cpp (100%) rename {src => src-cpp}/java.h (100%) rename {src => src-cpp}/javaObject.cpp (100%) rename {src => src-cpp}/javaObject.h (100%) rename {src => src-cpp}/javaScope.cpp (100%) rename {src => src-cpp}/javaScope.h (100%) rename {src => src-cpp}/methodCallBaton.cpp (100%) rename {src => src-cpp}/methodCallBaton.h (100%) rename {src => src-cpp}/nodeJavaBridge.cpp (100%) rename {src => src-cpp}/node_NodeDynamicProxyClass.h (100%) rename {src => src-cpp}/utils.cpp (100%) rename {src => src-cpp}/utils.h (100%) rename commons-lang.jarjar.rules => src-java/commons-lang.jarjar.rules (100%) rename commons-lang3-node-java.jar => src-java/commons-lang3-node-java.jar (100%) rename jarjar-1.4.jar => src-java/jarjar-1.4.jar (100%) rename {lib => src-node}/nodeJavaBridge.js (99%) delete mode 100755 update-commons-lang.sh diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index af983c75..fcca0a88 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ FROM mcr.microsoft.com/devcontainers/javascript-node:22 RUN apt-get update -RUN apt-get install -y openjdk-17-jdk gdb clang-format +RUN apt-get install -y openjdk-17-jdk maven gdb clang-format diff --git a/.vscode/settings.json b/.vscode/settings.json index 4f164947..8b4e243e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,6 +4,7 @@ "clazzclazz", "Ferner", "jarray", + "javac", "jboolean", "jbyte", "jchar", diff --git a/README.md b/README.md index 4be0944a..6dde09c1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Notes: * node-gyp requires python 2.x not python 3.x. See https://github.com/TooTallNate/node-gyp/issues/155 for more details. * If you see an error such as "Call to 'node findJavaHome.js' returned exit status 1" - Try running `node findJavaHome.js` in the node-java directory to see the full failure message. + Try running `node ./scripts/findJavaHome.js` in the node-java directory to see the full failure message. * If you are having problems finding 'jni.h'. Make sure you have the JDK installed not just the JRE. If you are using OpenJDK you want the openjdk-7-jdk package, not openjdk-7-jre. _Mavericks users see [Issue #86](https://github.com/nearinfinity/node-java/issues/86) if you run into this._ @@ -62,7 +62,7 @@ GYP_DEFINES="armv7=0" CCFLAGS='-march=armv6' CXXFLAGS='-march=armv6' npm install ## Manual compile (Using node-gyp) ```bash -./compile-java-code.sh +./scripts/compile-java.sh node-gyp configure build npm test ``` @@ -104,19 +104,6 @@ Then run node test.js ``` -### Java 1.8 support - -Manual compilation for Java 1.8 support requires additional steps: - -```bash -./compile-java-code.sh -./compile-java8-code.sh -node-gyp configure build -npm test -``` - -Java 1.8 language features can be used in Java classes only if a Java 1.8 JRE is available. The script compile-java8-code.sh is used only to compile java classes used in the 'test8' unit tests, but these classes are checked into the test8/ directory. Note that unit tests in the test8/ directory will pass (by design) if run against a Java 1.7 JRE, provided that a java.lang.UnsupportedClassVersionError is caught with the message 'Unsupported major.minor version 52.0' (the expected behavior when Java 1.8 language features are used in an older JRE). - ## Installation node-webkit ```bash @@ -898,7 +885,7 @@ var value = Test.NestedEnum.name_alt; // OK ## Error: Cannot find module '../build/jvm_dll_path.json' -Either `postInstall.js` didn't run or there was a problem detecting java. Try running `postInstall.js` manually. +Either `./scripts/postInstall.js` didn't run or there was a problem detecting java. Try running `./scripts/postInstall.js` manually. ## Debugging diff --git a/binding.gyp b/binding.gyp index 5629c01f..25fa488c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -13,13 +13,13 @@ 'target_arch': 's390' }], ['OS=="win"', { - 'javahome%': '&2 exit 1 @@ -12,7 +14,7 @@ main () { local os=$2 local java_home full_java_version java_version - java_home=$(node findJavaHome.js) + java_home=$(node ./scripts/findJavaHome.js) full_java_version=$(${java_home}/bin/java -version 2>&1 | grep version | sed -e 's/.*version "\(.*\)"\(.*\)/\1/; 1q') if [[ "${full_java_version}" = "1."* ]] diff --git a/postInstall.js b/scripts/postInstall.js similarity index 95% rename from postInstall.js rename to scripts/postInstall.js index 7a61dec3..50d3ec95 100644 --- a/postInstall.js +++ b/scripts/postInstall.js @@ -17,7 +17,7 @@ require("find-java-home")((err, home) => { const binary = dll ?? dylib ?? so; fs.writeFileSync( - path.resolve(__dirname, "./build/jvm_dll_path.json"), + path.resolve(__dirname, "../build/jvm_dll_path.json"), binary ? JSON.stringify(path.delimiter + path.dirname(path.resolve(home, binary))) : '""' ); } diff --git a/testRunner.js b/scripts/testRunner.js similarity index 84% rename from testRunner.js rename to scripts/testRunner.js index 92031fe7..0f1c0261 100644 --- a/testRunner.js +++ b/scripts/testRunner.js @@ -10,7 +10,7 @@ const glob = require("glob"); const path = require("node:path"); const tests = glob - .sync(path.join("testAsyncOptions", "*.test.js")) + .sync("*.test.js", { cwd: path.join(__dirname, "..", "testAsyncOptions") }) .sort((a, b) => a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase())); tests.unshift("test"); // Arrange to run the primary tests first, in a single process @@ -19,7 +19,7 @@ function runTest(testArgs, done) { const vitest = path.join("node_modules", ".bin", "vitest"); const cmd = testArgs === "test" ? `vitest --dir test` : `${vitest} ${testArgs}`; console.log(`running "${cmd}"...`); - childProcess.exec(cmd, function (error, stdout, stderr) { + childProcess.exec(cmd, (error, stdout, stderr) => { const errText = stderr.toString(); if (errText !== "") { console.error(chalk.bold.red(errText)); @@ -30,7 +30,8 @@ function runTest(testArgs, done) { }); } -async.eachSeries(tests, runTest, function (err) { +console.log('test to run', tests); +async.eachSeries(tests, runTest, (err) => { if (err) { console.error(chalk.bold.red(err)); process.exit(1); diff --git a/scripts/update-commons-lang.sh b/scripts/update-commons-lang.sh new file mode 100755 index 00000000..d3e2d92e --- /dev/null +++ b/scripts/update-commons-lang.sh @@ -0,0 +1,20 @@ +#!/bin/sh +set -eu + +SCRIPT_DIR=$(dirname "$0") +cd "${SCRIPT_DIR}/.." + +if [ -d build/commons-lang ]; then + cd build/commons-lang + git pull +else + mkdir -p build + cd build + git clone --depth 1 git@github.com:apache/commons-lang.git + cd commons-lang +fi + +mvn clean compile package -DskipTests +java -jar ../../src-java/jarjar-1.4.jar process ../../src-java/commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../src-java/commons-lang3-node-java.jar + +echo "complete!" diff --git a/src/java.cpp b/src-cpp/java.cpp similarity index 100% rename from src/java.cpp rename to src-cpp/java.cpp diff --git a/src/java.h b/src-cpp/java.h similarity index 100% rename from src/java.h rename to src-cpp/java.h diff --git a/src/javaObject.cpp b/src-cpp/javaObject.cpp similarity index 100% rename from src/javaObject.cpp rename to src-cpp/javaObject.cpp diff --git a/src/javaObject.h b/src-cpp/javaObject.h similarity index 100% rename from src/javaObject.h rename to src-cpp/javaObject.h diff --git a/src/javaScope.cpp b/src-cpp/javaScope.cpp similarity index 100% rename from src/javaScope.cpp rename to src-cpp/javaScope.cpp diff --git a/src/javaScope.h b/src-cpp/javaScope.h similarity index 100% rename from src/javaScope.h rename to src-cpp/javaScope.h diff --git a/src/methodCallBaton.cpp b/src-cpp/methodCallBaton.cpp similarity index 100% rename from src/methodCallBaton.cpp rename to src-cpp/methodCallBaton.cpp diff --git a/src/methodCallBaton.h b/src-cpp/methodCallBaton.h similarity index 100% rename from src/methodCallBaton.h rename to src-cpp/methodCallBaton.h diff --git a/src/nodeJavaBridge.cpp b/src-cpp/nodeJavaBridge.cpp similarity index 100% rename from src/nodeJavaBridge.cpp rename to src-cpp/nodeJavaBridge.cpp diff --git a/src/node_NodeDynamicProxyClass.h b/src-cpp/node_NodeDynamicProxyClass.h similarity index 100% rename from src/node_NodeDynamicProxyClass.h rename to src-cpp/node_NodeDynamicProxyClass.h diff --git a/src/utils.cpp b/src-cpp/utils.cpp similarity index 100% rename from src/utils.cpp rename to src-cpp/utils.cpp diff --git a/src/utils.h b/src-cpp/utils.h similarity index 100% rename from src/utils.h rename to src-cpp/utils.h diff --git a/commons-lang.jarjar.rules b/src-java/commons-lang.jarjar.rules similarity index 100% rename from commons-lang.jarjar.rules rename to src-java/commons-lang.jarjar.rules diff --git a/commons-lang3-node-java.jar b/src-java/commons-lang3-node-java.jar similarity index 100% rename from commons-lang3-node-java.jar rename to src-java/commons-lang3-node-java.jar diff --git a/jarjar-1.4.jar b/src-java/jarjar-1.4.jar similarity index 100% rename from jarjar-1.4.jar rename to src-java/jarjar-1.4.jar diff --git a/src-java/node/CastingUtils.class b/src-java/node/CastingUtils.class index de5359827ef7482064d3d099fa941ae1bd905e43..a449276b6a83e59ec832ed8e84bad7c24fb06951 100644 GIT binary patch literal 1377 zcmZ`(O;Zy=5Pd@e8^ZDxAb=1Ih??)j_yH0`BmqSUSOro=d0LVoEGC=OW`lV57kKe# zl?S-uB~V%wy;wG6q`O!2tc8ght-W)fc zD!NkO2G=)Um3Wz<-{*h6(!7$)E9G)RLKj0{)4O<(;Uz;YY7%-F2AhF(LszxjLPgDI zx$Z1nY=iMbA|VTr<3RuH}qfZ$T{=6eF`6@h%>eh#B4WidzFR+!&a1)}$uqbhfVbr($|3n8y86@vcv7%*7;4vAO;bm|b#X5>9$ORxm z=){ER#}$Twe{rKOT*WmB*Jb$NC#kh!mPeCHS$yL&L(P-a_6!{vrmXkt9Zgse>m9Iu zLnB9wMNmcvVd6`jG!v;!K5Oou{zZvGvrWsI!E;=faO2!KrHYm9Ja;03n=%dFZHA7l z>DpBC6>d&f%83}JWK82ODYq~DYdb=NlohpJh*XLpA!8Qzh@q+(%`(dZw9p_F8)#5xE$rk!YbO4cNfM zTc-5^ojkNN+FJuBU?0d}SfEve$%%HFpd?)ssc-0Pr#&60LQ02f!P-0cKcRE$6S}uf z(Cczl(I2W+G2|K{D=4fgJSQ0cY@73hYVR=+^aMTekSBhM$@SMZcJ%AJfNU`##~_g{ z5r_ja0mtbVGDFr9?JMX)ilX$U&k&cecm~FPU=R<`B6(;~)Tq1?6yM@AFO7z1Rn#iW(*`zV6&4B>A9sI&7mrqX z&}+PqlvbfPtNbhe11qI|vx~A=UV3`Er~CW5duG1<{MZ3-3M(q2m{M^R#}ph_kWk^r zR1itIrld#*k&)}P3Lj=v>_t|_oKSF5K~BXGPN@jvv=nFL_N;<)3eF1zE}52TUlH&n zk`Dy@bG4Eo5MDMdW2IGHGaC2wwF)i%qTaLxP9&Be>reG;MYqb?hOu5TigvbO*c-J{ z{*lLZXYDaPd6{zes;w8F6!f~2Nx=mHb>Vr@sM}`EYAU!WaL${x8|q0mSJ9ize9~j- zo>7ozvejCvQ8X4!NppCPG)=2~-!?1F8A(;cD8>|A(r_6pbEHTAFA0IMo^{o3Fn+dW zR!T-gAng_x*Bj+l)v)Y%#jwiuM!ae^tGZp>n29euud`If#5G*SH7TwODDm}L%PP?} zi#f?*Uc)|cyMRT~?BOk0wo#TydwRC{T8mBBa053rEa8@h+gO%bfuR;Bl=YU`7wUFK zAmW{d+rYl!?`#sN(Cc-> zDhW(`$LsdDZ<>8A=R_wHOWtAs>kisA*W@63Zbdh>K=glryoy1R@0K`{@Iw4)P^jc| z{()X;@iOsA%yW`YX5I+96D6rp p?#3v`No@jC?9(*099w#xysqJ}LpcP0UQUMXDfT*Ae#)BBcQdTG_TS6E0hW`S2 zH&4ckSGiQ;fy4_Ya`68!@$SJ8=aoZ=hd1+Pelx$BdGk)9C(+p-r(cf%4B>$V4Y~;~ z5Q4$bu<5>bvqjfm&puw=^zs3NF<$Ts!32Yz?0aS*j5-sRKs|(9(R)O_@4cD#%Yp0X zJ^4;|A{L^!V4^{w5lymR@3JFhFPO^by>hv*TJ#ur^0{J)qD3HvR{2ezv6R^+5J$T- zcyHD06zD=iI^5~Ca0%TedIT<`m!ZWkt$Eo6FW4xp<=kR%+6_v+JY-wdysHA&kd#k( zchz(RQb@~Po}$*SBWt2x;06Zd2ktJI7-DFy4L$QV?`;Q#lCMHX1a2b15Lx$vrQL0B zCtq~SWrf@p7)AOFnfC*4=aoz2?Z50`v-`j7gHMgD)5I)8)AFMlcTQ!GF}z61ZLM9d zuqL^zE$#7c8cw5afL6fN8c2?j)kT^quk!`$fG!NdW$WlkFk*^@+)-uD#$EmR7qJh;_2aPz3&*J_HT{yI6oQ*=_5wWh=o4Fj`Nr? zFlsufxJhyHz=($iiGE!EH0Fj?{RF~)VVj6f(#e?^)FY>8G%>?i=O60#?B(X@74K8D GhWUTz&xwct delta 785 zcmYjP&rcIU6#iy+x?8qWN@kCe?7@h>4i^XLvI4=)n-*6eDCa-@Nzcd*6HWX7}3n+8=z~-`)W*jO!L6 z=(lhhXDp;Kpdh0ltH80)4p&(@1$hf+F=*nP+RrN(GBIpoguxhJt}Qnv81zhbK^FC% zNT}vNE7$4`uU7FHX5||mm*4cz$8|l*4xtkgxgkivk^pnz$ek2RWBe6d1#} zz-3GbTtP`7iIl)3t_n<`1ShoVwF1PnS0rV%^x$e!20Dw z=E$tpC+}*me4%+84B;ieacBLBzgAId2Y$KM@Yf!Bq`~`Wa1oj?5CBuRBkUwENjpW!Qlb$;ae(V{TN{Pa*gRX%p!Zttk^BJ-n}e Wt`m&){-*mL%&L#(c9Pf{PW=Umk9sKp diff --git a/src-java/node/NodeDynamicProxyClass.class b/src-java/node/NodeDynamicProxyClass.class index 9eed5b236611e57d4dc9d5cfbfdc59e03abdefbc..95373a4b6129810511dfeab1b924c0a5a2c0392b 100644 GIT binary patch delta 1187 zcmYjQ-*XdH6#nk+-P~lkq1^;3DPVt>{Ay#Vg0!?2O0m;IgBGhrQMc{3X$eV4Qb0wE zI{pF7b(nz%ePD*Zma5y1@?&`Q(ecGc-~1nR)N@nE^yS`j&z|pm=X~evmb2xY{rT@7 zp8^=dmo^NT0$jpEfT3~4z3yi6Zeb~tom=tds|P73M9JDxyY=rf>-RuwS4_;sqQ~Y2HVH4w@wn;*h$`+ru_qM2kSHL>ocZ zcq>6V&?(R*(TyW2XSPJlQnk#$CT#kWkVqnR=eMbpKo7&gdZAOr>DBq%d9Ru)E{v7S z#j;M6k$4GxcfRQ+qJF$A@QTDS99Q4+!|8x`ZPm?J81~1{)zj?sJD9j+;{*l-1|?2n zNd3Z(x9EhgNsOS6Avk_&dVDl{X3VAzPfLvAj0#yPY2z$j7Z}$l)o=A431X7LS}l~l zMP0&qi76an5KCTl%Dw8@xS-2=Lp?X6q)k7jB`)GEb;U~6o^MOMgIRUg>Ly{{#d`vm zCEmve>amp`(t@}WlL%;QURw(cJU)?_3F4T*5<^41v(da;sn}S=vcw9ms6VW%6U0^O zCFfRhqs0YJpr~SIJ5BGJ8Z_f^8zofqO3?fd>=x-_u3Ws~&gH$q#Eigo^_3a#w8w7F zd!_1fu}~5Ch#^{M{y$u0*=hAPbJd@$e~l*IL2Jjb3KPwGPPB{7T3)&xJ$n=^k*O8wAdnSE|Ai(xN0{lf)fFNL?Zkhzc99-BMW|M* zkGV(mV7Nu6{_8<&9>l;da1gf%yd!3*W&xRq5%KsFEY6w{V{zI??mP67FK?2s_8MMC zc=9KdW=Zz)Gc7HR0G%l4s>yDqOqwxDg11pWosj547`@b)7G1zt5GaHQ_&GfdeDN<* C?bT5L delta 1198 zcmY+D-BX)I6vls>_f0l=dHD#GmVhmUQW_E{LhT1oYgdG^_}8_|vE@^63tx&@r% zD~}kx9(|m%=4H+K2(NI#!{wsKCHf=8x$KD<&|I<3s~&^A<}t)o>t6FD|8eoYqYGOp)=KW=2snpT3*!%%*cQozFXKW_{+E_xXsd z=C)6c8J|{;`y^;nG?*>-&~iS%koP%Ci)O*+28)_IK6wg0$7t~>vZT3dBlmpnllA$S zPkcV*f#x%x&sp|q=d?8)imE*#BNOwP$)a2)b7v`?EhsAY&ib?If&e_^i!zaEHeHzQ zUzp06CvLO(!%YP36~8nY)o8kdt;hFW?)q$g;a++ooB1EoXfZ#Rn_0Qiv+{N0%I{q! zqMFTF)#NDZ%!*rAr>IR_+XLSv*4K8^d>c4po&{1S=5%-pJ(DR8r*CJ>H%`iIJFVtV zr`_CgN0z0}{`%)6`r5{1AmTECie?<@t&B33^;S7qqgHHLLn>eum#n0CuB<7Eh+g|6 zvOhtm*cTSoY+?O~dc^2cTAXtovWb$Xi?HwCLdfk}2W--dzOZbnd>2SJJ zKcd}LTxXN=wRI|XPs)T;c)W2Q(7#J8#78JZ8CZB2SQ*$R_RCHbRg_|9;9z7B$;(ek)%ODu zUd65z$*Bb;nfZAW&1~Hm6dBlonm~XN2!YywBqxxk1QZ2{vuSB>XJFh2mgfSJAS)Pv N>L4n)fovuQ9smy%6K?U)W2Q(7#J9g8F;xEm>Ia(8MxUQcqW=CPRzHJ;bCB5U}abxC~R#YrY6{UCH@7b znG+}d2aM%{4T&4ip1kmf_zxK0EIoM8-DKW--#72`-kWoIE+75)eHH_l$GQZEBj74{ zNHL5ZG~YGrubZ8A{ps#OYp=_YTHWvLch?x4nd+8A8kYp5!euD4#B0(j8HG`dnTYGE zgpaI1P9cv1gX+AATJ^2w;l^S6ErV>gy2HSfStBiR&EksY1D_bRLB`H=Ltz|c^MzN4 z&M~1-!7cNXS4JdmV@hCJ;SOfZFaDU609qhas8LD7nIff*djj_rW-(`Woo6Y51%_*L~7?Qt49zKtk9jqu)mc%SR+RV1B||`3LXn1+Vl!o=?0i(Q?Eq zVEJ!cfg0QKKGV=CvQZH0_!CM&5WCUrDXwcBzev2B$Fyc&$KSv=11EGeT^L}J@=3b- z#8yV`&Z1k(y93<)j`hwXWf)qvR%wQD|6%ayr`C-$3q) zjnTa(WrK~06W4AHzr~&LyF+7K=-kZrIN!bJJLgoKithJcUm^f=SQSX&qQDr&b+{yu z#)Lpww`JX?FsZ|3jw=FFxGHcB(*hN^93F?ykXUZEnw=E}bGov_VBLRJ4;hBno2_v3 z&C6QYejL>H2oa62vlFz}+Kqkn(fDxqV@W+UUu;PXBf~KxaUE5O8@MTv#R$i&Bz^M| zx3IvF*$v(X)xDtAsBYDE!{;52+Y)zhmt#?43G*Dw68Es84vb<(wn#&Du#BOoj*X(j zkZSJ#!AR`W!vjwh*o1n(%IY=!@7TKf$);4r*zS`1H2Kz_1+s$-#q-pSQD&5F_cPcr z6$}o=L<}bBNftS(_0=^PFe&HU6BtKGQ!+O^zYnYD^$0iOmkuoe1UQBu={U4F-zCTd zb7H>2Klto3zQq6d9OBCoTaNe&$p1|@LW{M$Pb4})x$Z_@^d2SGjja0Y3ApD)PvR7M^~<{TY{8nzTYboHIJaoKdOB*G8WH|k^T;3gRY`lU SG*B~+B5gM?O7==|b>TO^SQuM^>5cc1_lNb25xo+CPoH9pUmQt)V$Op&%Bb1RCWdyMh1bb#Ii*F woW#6zegCAa)Z~(h0&CRR7#SEDn1PxZ7#M+SSQ*%We0Cs@iGc&i;smp}06&KlivR!s delta 102 zcmeBV>SPi)^>5cc1_lOW25xo+PId;aiRNp385sn9GK))6^HPgE^GZ^S(h`$X85sn! x63Y_xa}x8?_5G8wQj<&A7#SEDn1GrY7#LX?8JHPZfP7XUkBNZ|$YKYxH~>7U6R`jQ diff --git a/test/ListenerTester.class b/test/ListenerTester.class index f47674d6d0489de1058e3a29480f71bc5e79a93c..0fe29fa5509380cdfc32a83910cd5bc8c9d68b6e 100644 GIT binary patch delta 425 zcmYLFO;5s55S<uatsV{8mu#187wac+nV*S3}~(NaR*c)nWxxtI?DG1=3$aqN0*` zHSzawHtwrNFFUil^Cq)zAP?mF=hxdifHkbDh(O|qYLF3QNH?t;tKwR%)5_ja(?0eY zVw+CO@wXVHQu!bb1#u2lLjoE@s^(nzcFXqmZ9=cJQK)jH7&4*FwePr<9nZ7wgiJ*e zl7e9d`OJ3Rw&*h&Mlc#QST3(%oFRJRwJ#J*65FL9DyA{Rk=2mHY;eoglL_Qe;F#C2 zfW@H8YMt|kdzvY92EeFNE@BdKI*95Lby-42C>uSnZYV5L6>IT`p@cG3AuW)Fu!R||3I|cNAj?Tp_-|upP|=Hee4G&1PGD&f~i-`Nf7Q4 T6oY=GsGGzov_dhK!|}>D=XO9_ delta 437 zcmYLEO;5s55S-UiT1r7IqN1XLA7HBz!%1T_UQH7(Cd6ZvswEXnMHAzJ#D75eB_t{; z#;b{c#VcpyzGtGBo!y<;$?Q-WDqEl5ukQdVSl3}78$%pZDyDVF$ZDA3nA0$;VNS<9 z@^KWfpkh(QQm0x-FhsZghTqy@kW1Y=cHcHIf|P*-k__p(d*ha`TYga93q$wT@vmA8 z%DEQ=O#{m)GDJ?p<^{n%DOHpVtiV!X8(75}Ly}*34KF%|#Cq}vD40W? diff --git a/test/RunInterface$1.class b/test/RunInterface$1.class index 968bfc7824897c89c86e86d3920afbf5fc541c93..12eae8377033b6019ae8ff633369b6dd908aab6c 100644 GIT binary patch delta 535 zcmYjNu}&L75PiFMc=35L7lXkzm;`Kx^8q#lr-+0SDO6V>fs_c_? z?deE`NB*H|Zp4qZPI_ZpA`gqf8u>vpRD)pCcc9XGm6( zyPWncJ`ye`PrQ6C+_f7N+^TtlN%sy@zo^gPP|OhmEwm|eR4A)wahdWjFtcve{S9GI zDA=8QR5^C&Jb8=vZ!|?1^uQtG+w|O}%*_Z_uu51rv4$=_(Xm8R(%+@4M%B$+{snq2 BS_=RG delta 483 zcmYk3%Sszj7{`BSW|A@S7^5-PByGK9qRDuV?V|Ly=xRU^Tx8=a%7}q5N+uC^B0fPF z5M22LE(D{ri#~u);gg8p1Q#AS|NnQtoO5em+l{A}fB%6kwo;5RAHzZnNim@}WFfs^aC6*=X=OpH(>-#5Vr6!k56wr-l zWZ?14%S$bC&PgmTPAz6<;0B5WmF9Wom82G>B_^jbGVsFL298DPY>W(y49q~&85kIW chO#oS0a;88>|m0EffGn`0aY*pNgg&%083&Vh5!Hn delta 143 zcmX@Zc!p8n)W2Q(7#J9g8F<+lIM^AuCpzddvor8a`7!$iU9P$;Jr)AQ>Ej diff --git a/test/RunInterface$Interface1Arg.class b/test/RunInterface$Interface1Arg.class index 5be2e13d6287e6819ba536d30eb7ca8ce279b2ec..2008751cbfa674fa98d0238979c3a27affde33e4 100644 GIT binary patch delta 168 zcmcb|c#qNH)W2Q(7#J8#73zPf=cr|^GZ^S(h`$XRp2Z`$D(w01{OvJfvm)` zME#t^ymWp4q^#8Bl8FNL@r(>So_TqxMb0^i#l@+`>N44gok3#ft-Nb<080szArCCvZ; delta 143 zcmcb|c#l!w)W2Q(7#J9g8F<+lIM^AuCpy?Ovor8a`7!$iU9P$;Jr)Jmeg? diff --git a/test/RunInterface$InterfaceWithReturn.class b/test/RunInterface$InterfaceWithReturn.class index ae8a20a89abd31335e2b33c1a225a3ba15e25e7e..6257cc8189da7bbb66b4af52213fcefc5a217e7c 100644 GIT binary patch delta 134 zcmcb~c$1O$)W2Q(7#J8#7-#5Vr6!k56wp&) zWZ?14%S$bC&PgmTPAz6<;0B5WmF9Wom82G>B_^jbG6+u$6xL&7WME`q1{%u1zz8&p bm4OY&Vq#zilN=13K$;7vf)PmauyFzatTn*Y{7#N=+^Sst790gKK4DWME`q l0@}gAz{tYLz|6n`WHB+Yf=M<8E+EYXRKdu=&cMmW2>_h)ABO+{ diff --git a/test/RunInterface.class b/test/RunInterface.class index c0d30e952d09de60b02c8c5d680c954b92296201..1404e1a23f93d8c036eee43c756be934bc6b23e6 100644 GIT binary patch literal 2065 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 literal 966 zcmZuv?@!ZE6g^$Lw(H6U0|%Q!M5k^;nG^BX76KuVkSy|{NV52;n`J5Kx}tW~b>taeXm}|>KI!)*D0_a?lVBeBz7y6QhBFSSdA6?K8XT*?zZbg@NmL>*ZfGmW1qoqzC0= zifg%D-wvaIoaGX)=#7qdwQG68pU>KuFyEqs8&*FGI?le!xe`2*bq-|WHc!7`;uT(N zcyrYg<1(>|x{3QJnwUq{#3Gj^E;%lFWN8@J#~P16-tqcAePf|io``hVK6N@F=N=PViN9BRYh+^`ctkZo$S9Ssh+jgvsgLob5EK3@km&`q%39$9 z>gOBg4`?NZhtTne>NwO#3dv9RJCs&NlP{p3BO!>P2$B@Uj0-X&NJl^w#Q*>R diff --git a/test/Test$StaticEnum.class b/test/Test$StaticEnum.class index d63e7f54f42eb99f3241b6dab7aa19fc73e73aad..a474b9f7f6a60fe8564ab52f84ae3f611710d2ef 100644 GIT binary patch literal 925 zcmZuv?@!ZU5PsgZTen*F%L#6x2phN#Wsc~lE@XsYLbAYz;u7Mgu9l^wbV=LsXCaP6 zh(^O_|0v_VuazyZbYQvaVUgQsORaynv`*)9?h#B)9AOZnVR&IA1D89_WKC(kf}JWs&1{Rl^$UT&v&^3I$2E zRQK<@yf^+xLJNJ@cMd1#Lnk=4h8{)M|I<)U%#9&ux+C9;CIMljraqt@bZswYU7wT7 zwRIB(b_@p998Ut{!^z=zaW2y!WDT88}y$MZ@%$R5{JHXCaP6 zj7Gy}f0XguPT6$3P43Bgd(Ly7+n>L_{s8b2&kb;FnAk*F!=i@ACIp_y%hEA#QqqzY z6&(d>s~WZ$vK=Q#yd4J9j-A+d_rv6jK^%mk7wrYkVBifH3hiTW5SPaljlYdA7_@Td zb^GnU%}{(dtL|J5Adn@iGAqyb`tLo4g|;7hhsjyji;kUcKoKo%Jo><}WwlS8bEh6S zVXtn-kstONm06>je(1-$40mTV98@|ChVA!4Cr%>5S1lRQn{M!@Yja|Xl%Y8_Vwd(d z?S2xu-Wy+XG^8#yNlu_BHD45Xif0;Xw9$W>2`r;7u!8#n^T-PnkY~t^HycTxaf5zH z&?MIcpQG-n=f*UiOH_telN+Y*)R?Hg)#zXFMr()OUC_^>wn~x%K$d6#`4!2ZG8_h$ za0etJc^hQqF^6EEq1-^dB#+@9-PtsELG{Zh-PS8<)GYGq7i4b0r|T6d0hAPf4Jv(r zR^48`M)uPb_$oydJb;debdN|K5=nV#-@s3bntBcW3P$RfJay(W-zlXI>Ag?*5Oekw k*cdyPj{HahToRQF@Br5S%@ZdmJ8uU}a)KVxbmPl!k`HgoM}}p?`-j=FD-J`|wxUP?1>p1N>2j zS-FB&%BM|gguB`6j`ok6T%$B7fcuMoMnh9F>4{L*t zpx1bk#^KL*ua41Wn!A^Jo48_SlZ>6<%~flg{YMvqZoI3DjeAa23w6lk-F{j@w8-;j zpDPWn1iq@8I6I^h*Qbpb!|-Z-9z^dZhWy=s?MSYN|jAA%#hi##U^EfDqCs_IqXt7tT}e!(U~SN=T6(kRKH? zdk8|dn3*>-`*=UUU*7;GxQXB*R_H181;I2cvU(^k0;0{g+LL5)=Y^VghX4tCEKc_j{kZa WE{$x0D_oNYR1UgG_}3*55dHzXk2R10 diff --git a/test/Test$SuperClass.class b/test/Test$SuperClass.class index 35b83864c2753ec9ec8706c099db5459716ecb87..f3004fafd2720294f1be4913b28f8f2405a102a8 100644 GIT binary patch literal 302 zcmYjLJxc>o5S+av_q_8oQ9Hpxuuu!rSc*+R2!vQ9q*UI;C0saP*i$EK4~>7eO(K>qs@a-m=r;$?PIRh+~*}b@k*P8FMrHqK|0&C)lzQ?(-Moh zu!Vwb9Kvs!)((4&G}Rn`Yj6z5Ywbl4yO)^ocSII)@B9t&%7Qkc$-o_P8yV3?56RYz Y;uqroxqF80n1WsO$thKb0rru60|osvO#lD@ literal 302 zcmZ8bJxc>Y6r8=}_Pp~nQ9HpxurMi1VJm3@fk4nAA*HexAK}8ek^Ash*;ok{`2qP+ z;=EuXZZWfOX5R32-(On*w>V4CLK@*X!ij;s%Y9xC4O-W|g+Y6?c@~4tH1~4fykt_& zT~<)BE2$T**ykn&$!yb?1@M91W?OuE&9v~)a^qj2G Xz`p;>J+U-V2Z!jA6XpUOp@aAbtXDHY diff --git a/test/Test.class b/test/Test.class index 1559c37a2cab5aaf54322ad3da5e8146a4d5c81a..87fd03f1b963f4d25f75694bd258cd2341114fc4 100644 GIT binary patch literal 6565 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 delta 150 zcmbQnG>u8_)W2Q(7#J9g83ef)m>GE38F<+l_!t@3Y%=pQOYA24Iy3T5T&}Fi!@$BI zz{tQCl3HBiT9KSuP?DLSSIo#Dkd;`LsGpOVm#*)hl$DxXGI64W6tjkA7=t1M6VN~q nU<5)I238=SZQ=uQd3K->8&HS=D9r&RS%7R#Am#$HnHabMu4Eb) diff --git a/test/TestLambda$IntegerMath.class b/test/TestLambda$IntegerMath.class index 715fed7d71aaefde932b115caa3b44a1f304c353..44893917a7b9b599619861df712b1f11cdb17842 100644 GIT binary patch delta 139 zcmX@ic$ks*)W2Q(7#J8#7-#5Vr6!k56wrxg zWZ?14%S$bC&PgmTPAz6<;AUjt3P~+4@kz{0N=am7;P%WbNli~J@=YwsU}IolWMBrG g45WbuvN8Y#7?>E?!6XL*Cy?d>ssNh6z{AD?0EsCY`~Uy| delta 139 zcmX@ic$iV()W2Q(7#J8#7Tn*Y{7#N=+_dWZ()(EiUm%%uPy3WMg1pWMBfC h45V2Y8JHPZfGj2kRxruNzy+kafGQXn*cmw4H~?mO8ukDH diff --git a/test/TestLambda.class b/test/TestLambda.class index a56ab0ac164057d024e0175a3a7d7e94e4adfeef..60c082beabcf637e0e3c0e88cb371871d0ceb1cf 100644 GIT binary patch literal 1195 zcmbVLU2oD*7=8{giltgs1>M+iPNsBU44oed#zdDaHevGuvTG0Y$hwu5w1*}8Pu_T= zaTopo<8Ly)T~Vr#nRszN-jC;bKhAl-{kZrFU>DC-q>xsS(J+TBL*ay<@w&^se*JCt zMD!#>_J!j)@+CvMW*!-Y%4xU;l_BL185V11t0O|$;)AZutClB4UjzqS9ye8JxUS%a z1|0>4`3d#diy`ND@`$@5amjAwVc@2MTTy@_LuocK!(7d>Ov?ZfD7eF*P8=CBd%jJ4 zddu;|;b_nmL5Fu;(irl0p08}%k&f>%n6=haUd5r40tc*sJLB$XYbIW09CnYpZrhQfSwNAxvZ>-Wwlv(mlX;y9{en4V={r1y30&SG&@{#EruW#ZS?^fJTe{EV8sOkhDxEi?r*X!9LQ3rik{) z45Vo6Y`t1zFCtN3Zp`b?n z8b@Cu+K4!_Shgp@;yiWoq&`o3zWdu#r5aXvHJx_QHiI=8r%2y20YVC+2)^ZHNknWhaIGl|7!tL?C zMVhP>p6u{Z-{7we!<43DGt{b`6Mn|)7Pp7>sh8#gRjtjC4+*-HzI6E@;HX%ar24{Z zy}=N#w%a~IX%6^15Pg?H?K%^8Aofi^*mUnI*d0GW4Jl|0nKzCjJ#sxh5c1eDymSJ3 z202>RH9W*41yv0-Z1@LXyGgtu6%mBlzU!Zefn+Fz_xenoRcv8fMFKkv5ogR$tkyb< zp-qORkax<#kTh+1#H|UXL#=81Ty+Jz8XDNsa2q)dS>zbjLR-^5b52D)=n|#KKTwe! z_nbyx6rL13qqcV(=X64G{g`dxlpv_iTW%Yc@bmyV+t#jhO?x=2`NObxJ{JFX8MwUO zwl*_gQ@1T{SzS|#rh?}T>vIKJln+DYdK^}%;tIViAWjd828iTMI<3&keC@^;uursM zxJ5E?sf?0LBSX@MHV{RO*8Bw`z~T1hXGFK?`-)f;AFoVR{}z6SQ)IZb$UOc}^E8=f zGO9lmQ}1P>^@(G}k`X!!;!G2gW@sMy{%@p8Ipm2Yf&zsI;*ZczCV?A?Bp%}_o?sbw SNnarSGGU7-(HHDiQTzqhJQr91 diff --git a/testAsyncOptions/allThreeSuffix.test.js b/testAsyncOptions/allThreeSuffix.test.js index f9f7cafc..d39c74a9 100644 --- a/testAsyncOptions/allThreeSuffix.test.js +++ b/testAsyncOptions/allThreeSuffix.test.js @@ -26,7 +26,7 @@ describe("allThreeSuffix", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -54,7 +54,7 @@ describe("allThreeSuffix", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/asyncSuffixSyncDefault.test.js b/testAsyncOptions/asyncSuffixSyncDefault.test.js index dfd93544..96187991 100644 --- a/testAsyncOptions/asyncSuffixSyncDefault.test.js +++ b/testAsyncOptions/asyncSuffixSyncDefault.test.js @@ -47,7 +47,7 @@ describe("asyncSuffixSyncDefault", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -75,7 +75,7 @@ describe("asyncSuffixSyncDefault", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.format("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/defacto.test.js b/testAsyncOptions/defacto.test.js index 5bcebd4d..ec4cd660 100644 --- a/testAsyncOptions/defacto.test.js +++ b/testAsyncOptions/defacto.test.js @@ -54,7 +54,7 @@ describe("defacto", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -82,7 +82,7 @@ describe("defacto", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/defactoPlusPromise.test.js b/testAsyncOptions/defactoPlusPromise.test.js index 346dd9e4..07b0cbcf 100644 --- a/testAsyncOptions/defactoPlusPromise.test.js +++ b/testAsyncOptions/defactoPlusPromise.test.js @@ -49,7 +49,7 @@ describe("defactoPlusPromise", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -77,7 +77,7 @@ describe("defactoPlusPromise", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/default.test.js b/testAsyncOptions/default.test.js index 581ee824..b322e444 100644 --- a/testAsyncOptions/default.test.js +++ b/testAsyncOptions/default.test.js @@ -19,7 +19,7 @@ describe("default", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -47,7 +47,7 @@ describe("default", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/noAsync.test.js b/testAsyncOptions/noAsync.test.js index 569d69fc..2af3f847 100644 --- a/testAsyncOptions/noAsync.test.js +++ b/testAsyncOptions/noAsync.test.js @@ -58,7 +58,7 @@ describe("noAsync", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); const arrayList = new ArrayList(); @@ -86,7 +86,7 @@ describe("noAsync", () => { }); test("sStaticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.formatSync("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testAsyncOptions/syncDefaultPlusPromise.test.js b/testAsyncOptions/syncDefaultPlusPromise.test.js index 8b0d9f81..7fe9403d 100644 --- a/testAsyncOptions/syncDefaultPlusPromise.test.js +++ b/testAsyncOptions/syncDefaultPlusPromise.test.js @@ -23,7 +23,7 @@ describe("syncDefaultPlusPromise", () => { }); test("importClass", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // This test verifies the import runs without error. const ArrayList = java.import("java.util.ArrayList"); expect(ArrayList).toBeTruthy(); @@ -52,7 +52,7 @@ describe("syncDefaultPlusPromise", () => { }); test("staticSyncCalls", () => { - // Note: java.import executes javascript code in lib/nodeJavaBridge that makes sync calls to java classes. + // Note: java.import executes javascript code in src-node/nodeJavaBridge that makes sync calls to java classes. // Among other things, java.import creates Sync functions for static methods. const String = java.import("java.lang.String"); expect(String.format("%s--%s", "hello", "world")).toBe("hello--world"); diff --git a/testHelpers.js b/testHelpers.js index 93e8fa0b..6bf05615 100644 --- a/testHelpers.js +++ b/testHelpers.js @@ -4,7 +4,6 @@ java.options.push("-Djava.awt.headless=true"); java.classpath.push("test/"); java.classpath.push("test/commons-lang3-3.1.jar"); -java.classpath.push("test8/"); export function getJava(asyncOptions) { java.asyncOptions = asyncOptions ?? { diff --git a/update-commons-lang.sh b/update-commons-lang.sh deleted file mode 100755 index 29250f57..00000000 --- a/update-commons-lang.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -ex - -if [ -d build/commons-lang ]; then - cd build/commons-lang - git pull -else - mkdir -p build - cd build - git clone --depth 1 git@github.com:apache/commons-lang.git - cd commons-lang -fi - -mvn clean compile package -DskipTests -java -jar ../../jarjar-1.4.jar process ../../commons-lang.jarjar.rules target/commons-lang3*-SNAPSHOT.jar ../../commons-lang3-node-java.jar -