serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid test package name clash

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-09 15:09:32 +00:00
parent 40aebeecee
commit 0ff819702d
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime-rpc/pom.xml
View file

@ -111,13 +111,13 @@
<phase>generate-test-sources</phase> <phase>generate-test-sources</phase>
<configuration> <configuration>
<target> <target>
<mkdir dir="src/test/generated/org/capnproto"/> <mkdir dir="src/test/generated/org/capnproto/rpctest"/>
<exec executable="capnp" failonerror="true"> <exec executable="capnp" failonerror="true">
<arg value="compile"/> <arg value="compile"/>
<arg value="-I"/> <arg value="-I"/>
<arg value="../compiler/src/main/schema/"/> <arg value="../compiler/src/main/schema/"/>
<arg value="--src-prefix=src/test/schema/"/> <arg value="--src-prefix=src/test/schema/"/>
<arg value="-o../capnpc-java:src/test/generated/org/capnproto"/> <arg value="-o../capnpc-java:src/test/generated/org/capnproto/rpctest"/>
<arg value="src/test/schema/test.capnp"/> <arg value="src/test/schema/test.capnp"/>
</exec> </exec>
</target> </target>

4
runtime-rpc/src/test/java/org/capnproto/RpcTestUtil.java
View file

@ -1,8 +1,5 @@
package org.capnproto; package org.capnproto;
import org.capnproto.CallContext;
import org.capnproto.Capability;
import org.capnproto.Void;
import org.capnproto.rpctest.Test; import org.capnproto.rpctest.Test;
import org.junit.Assert; import org.junit.Assert;
@ -10,7 +7,6 @@ import java.util.concurrent.CompletableFuture;
class RpcTestUtil { class RpcTestUtil {
static void initTestMessage(Test.TestAllTypes.Builder builder) { static void initTestMessage(Test.TestAllTypes.Builder builder) {
builder.setVoidField(Void.VOID); builder.setVoidField(Void.VOID);
builder.setBoolField(true); builder.setBoolField(true);

2
runtime-rpc/src/test/schema/test.capnp
View file

@ -1,7 +1,7 @@
@0xb365fb00cc89383b; @0xb365fb00cc89383b;
using Java = import "/capnp/java.capnp"; using Java = import "/capnp/java.capnp";
$Java.package("org.capnproto.test"); $Java.package("org.capnproto.rpctest");
$Java.outerClassname("Test"); $Java.outerClassname("Test");
struct TestAllTypes { struct TestAllTypes {