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

avoid TestUtil name clash

Browse source
This commit is contained in:
Vaci Koblizek 2020-11-09 16:18:17 +00:00
parent 8457c38623
commit 7b79ab8ab2
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
runtime-rpc/src/test/java/org/capnproto/CapabilityTest.java
View file

@ -25,7 +25,7 @@ import org.capnproto.AnyPointer;
import org.capnproto.CallContext; import org.capnproto.CallContext;
import org.capnproto.Capability; import org.capnproto.Capability;
import org.capnproto.RpcException; import org.capnproto.RpcException;
import org.capnproto.test.Test; import org.capnproto.rpctest.Test;
import org.junit.Assert; import org.junit.Assert;
@ -61,7 +61,7 @@ class TestExtendsImpl extends Test.TestExtends2.Server {
protected CompletableFuture<java.lang.Void> grault(CallContext<Test.TestExtends.GraultParams.Reader, Test.TestAllTypes.Builder> context) { protected CompletableFuture<java.lang.Void> grault(CallContext<Test.TestExtends.GraultParams.Reader, Test.TestAllTypes.Builder> context) {
counter.inc(); counter.inc();
context.releaseParams(); context.releaseParams();
TestUtil.initTestMessage(context.getResults()); RpcTestUtil.initTestMessage(context.getResults());
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);
} }
} }
@ -84,7 +84,7 @@ public class CapabilityTest {
public void testBasic() { public void testBasic() {
var callCount = new Counter(); var callCount = new Counter();
var client = new Test.TestInterface.Client( var client = new Test.TestInterface.Client(
new TestUtil.TestInterfaceImpl(callCount)); new RpcTestUtil.TestInterfaceImpl(callCount));
var request1 = client.fooRequest(); var request1 = client.fooRequest();
request1.getParams().setI(123); request1.getParams().setI(123);
@ -92,7 +92,7 @@ public class CapabilityTest {
var promise1 = request1.send(); var promise1 = request1.send();
var request2 = client.bazRequest(); var request2 = client.bazRequest();
TestUtil.initTestMessage(request2.getParams().initS()); RpcTestUtil.initTestMessage(request2.getParams().initS());
var promise2 = request2.send(); var promise2 = request2.send();
boolean barFailed = false; boolean barFailed = false;
@ -126,7 +126,7 @@ public class CapabilityTest {
//Assert.assertEquals(0, callCount.value()); //Assert.assertEquals(0, callCount.value());
var response2 = promise2.get(); var response2 = promise2.get();
TestUtil.checkTestMessage(response2); RpcTestUtil.checkTestMessage(response2);
var response1 = promise1.get(); var response1 = promise1.get();
Assert.assertEquals("bar", response1.getX().toString()); Assert.assertEquals("bar", response1.getX().toString());
@ -139,13 +139,13 @@ public class CapabilityTest {
var chainedCallCount = new Counter(); var chainedCallCount = new Counter();
var client = new Test.TestPipeline.Client( var client = new Test.TestPipeline.Client(
new TestUtil.TestPipelineImpl(callCount)); new RpcTestUtil.TestPipelineImpl(callCount));
var request = client.getCapRequest(); var request = client.getCapRequest();
var params = request.getParams(); var params = request.getParams();
params.setN(234); params.setN(234);
params.setInCap(new Test.TestInterface.Client( params.setInCap(new Test.TestInterface.Client(
new TestUtil.TestInterfaceImpl(chainedCallCount))); new RpcTestUtil.TestInterfaceImpl(chainedCallCount)));
var promise = request.send(); var promise = request.send();
var outbox = promise.getOutBox(); var outbox = promise.getOutBox();
@ -164,7 +164,7 @@ public class CapabilityTest {
var response = pipelinePromise.get(); var response = pipelinePromise.get();
Assert.assertEquals("bar", response.getX().toString()); Assert.assertEquals("bar", response.getX().toString());
var response2 = pipelinePromise2.get(); var response2 = pipelinePromise2.get();
TestUtil.checkTestMessage(response2); RpcTestUtil.checkTestMessage(response2);
Assert.assertEquals(3, callCount.value()); Assert.assertEquals(3, callCount.value());
Assert.assertEquals(1, chainedCallCount.value()); Assert.assertEquals(1, chainedCallCount.value());
} }

20
runtime-rpc/src/test/java/org/capnproto/RpcTest.java
View file

@ -21,7 +21,7 @@
package org.capnproto; package org.capnproto;
import org.capnproto.test.Test; import org.capnproto.rpctest.Test;
import org.junit.Assert; import org.junit.Assert;
@ -276,17 +276,17 @@ public class RpcTest {
var tag = objectId.getTag(); var tag = objectId.getTag();
switch (tag) { switch (tag) {
case TEST_INTERFACE: case TEST_INTERFACE:
return new Capability.Client(new TestUtil.TestInterfaceImpl(callCount)); return new Capability.Client(new RpcTestUtil.TestInterfaceImpl(callCount));
case TEST_EXTENDS: case TEST_EXTENDS:
return new Capability.Client(Capability.newBrokenCap("No TestExtends implemented.")); return new Capability.Client(Capability.newBrokenCap("No TestExtends implemented."));
case TEST_PIPELINE: case TEST_PIPELINE:
return new Capability.Client(new TestUtil.TestPipelineImpl(callCount)); return new Capability.Client(new RpcTestUtil.TestPipelineImpl(callCount));
case TEST_TAIL_CALLEE: case TEST_TAIL_CALLEE:
return new Capability.Client(new TestUtil.TestTailCalleeImpl(callCount)); return new Capability.Client(new RpcTestUtil.TestTailCalleeImpl(callCount));
case TEST_TAIL_CALLER: case TEST_TAIL_CALLER:
return new Capability.Client(new TestUtil.TestTailCallerImpl(callCount)); return new Capability.Client(new RpcTestUtil.TestTailCallerImpl(callCount));
case TEST_MORE_STUFF: case TEST_MORE_STUFF:
return new Capability.Client(new TestUtil.TestMoreStuffImpl(callCount, handleCount)); return new Capability.Client(new RpcTestUtil.TestMoreStuffImpl(callCount, handleCount));
default: default:
return new Capability.Client(); return new Capability.Client();
} }
@ -312,7 +312,7 @@ public class RpcTest {
}); });
var request2 = client.bazRequest(); var request2 = client.bazRequest();
TestUtil.initTestMessage(request2.getParams().initS()); RpcTestUtil.initTestMessage(request2.getParams().initS());
var promise2 = request2.send(); var promise2 = request2.send();
var response1 = promise1.join(); var response1 = promise1.join();
@ -333,7 +333,7 @@ public class RpcTest {
var request = client.getCapRequest(); var request = client.getCapRequest();
request.getParams().setN(234); request.getParams().setN(234);
request.getParams().setInCap(new TestUtil.TestInterfaceImpl(chainedCallCount)); request.getParams().setInCap(new RpcTestUtil.TestInterfaceImpl(chainedCallCount));
var promise = request.send(); var promise = request.send();
@ -353,7 +353,7 @@ public class RpcTest {
Assert.assertEquals("bar", response.getX().toString()); Assert.assertEquals("bar", response.getX().toString());
var response2 = pipelinePromise2.join(); var response2 = pipelinePromise2.join();
TestUtil.checkTestMessage(response2); RpcTestUtil.checkTestMessage(response2);
Assert.assertEquals(1, chainedCallCount.value()); Assert.assertEquals(1, chainedCallCount.value());
} }
@ -397,7 +397,7 @@ public class RpcTest {
//Assert.assertEquals(3, context.restorer.callCount); //Assert.assertEquals(3, context.restorer.callCount);
// OK, now fulfill the local promise. // OK, now fulfill the local promise.
paf.complete(new Test.TestInterface.Client(new TestUtil.TestInterfaceImpl(chainedCallCount))); paf.complete(new Test.TestInterface.Client(new RpcTestUtil.TestInterfaceImpl(chainedCallCount)));
// We should now be able to wait for getCap() to finish. // We should now be able to wait for getCap() to finish.
Assert.assertEquals("bar", promise.join().getS().toString()); Assert.assertEquals("bar", promise.join().getS().toString());

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

@ -3,12 +3,12 @@ package org.capnproto;
import org.capnproto.CallContext; import org.capnproto.CallContext;
import org.capnproto.Capability; import org.capnproto.Capability;
import org.capnproto.Void; import org.capnproto.Void;
import org.capnproto.test.Test; import org.capnproto.rpctest.Test;
import org.junit.Assert; import org.junit.Assert;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
class TestUtil { class RpcTestUtil {
static void initTestMessage(Test.TestAllTypes.Builder builder) { static void initTestMessage(Test.TestAllTypes.Builder builder) {