From d10f2bb4803663aa3921e1dd50b11fd521df807f Mon Sep 17 00:00:00 2001 From: Bryan Duxbury Date: Fri, 26 Mar 2010 23:45:41 +0000 Subject: [PATCH] java: get rid of old OverloadNonblockingServer.java (since it's not actually a test), move Fixtures up to o.a.thrift git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@928103 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/thrift/{test => }/Fixtures.java | 2 +- .../org/apache/thrift/TestTDeserializer.java | 1 - .../thrift/protocol/ProtocolTestBase.java | 2 +- .../org/apache/thrift/test/DeepCopyTest.java | 1 + .../org/apache/thrift/test/IdentityTest.java | 1 + .../test/OverloadNonblockingServer.java | 48 ------------------- .../org/apache/thrift/test/ReadStruct.java | 1 + .../thrift/test/SerializationBenchmark.java | 1 + .../org/apache/thrift/test/WriteStruct.java | 1 + 9 files changed, 7 insertions(+), 51 deletions(-) rename lib/java/test/org/apache/thrift/{test => }/Fixtures.java (99%) delete mode 100644 lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java diff --git a/lib/java/test/org/apache/thrift/test/Fixtures.java b/lib/java/test/org/apache/thrift/Fixtures.java similarity index 99% rename from lib/java/test/org/apache/thrift/test/Fixtures.java rename to lib/java/test/org/apache/thrift/Fixtures.java index ea250dd9..75070d09 100644 --- a/lib/java/test/org/apache/thrift/test/Fixtures.java +++ b/lib/java/test/org/apache/thrift/Fixtures.java @@ -18,7 +18,7 @@ */ -package org.apache.thrift.test; +package org.apache.thrift; import java.util.*; import thrift.test.*; diff --git a/lib/java/test/org/apache/thrift/TestTDeserializer.java b/lib/java/test/org/apache/thrift/TestTDeserializer.java index 282b309a..4bb3fe2d 100644 --- a/lib/java/test/org/apache/thrift/TestTDeserializer.java +++ b/lib/java/test/org/apache/thrift/TestTDeserializer.java @@ -22,7 +22,6 @@ import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TJSONProtocol; import org.apache.thrift.protocol.TProtocolFactory; -import org.apache.thrift.test.Fixtures; import thrift.test.Backwards; import thrift.test.OneOfEach; diff --git a/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java b/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java index b69c47d1..3e4d0a61 100644 --- a/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java +++ b/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java @@ -23,11 +23,11 @@ import java.util.List; import junit.framework.TestCase; +import org.apache.thrift.Fixtures; import org.apache.thrift.TBase; import org.apache.thrift.TDeserializer; import org.apache.thrift.TException; import org.apache.thrift.TSerializer; -import org.apache.thrift.test.Fixtures; import org.apache.thrift.transport.TMemoryBuffer; import thrift.test.CompactProtoTestStruct; diff --git a/lib/java/test/org/apache/thrift/test/DeepCopyTest.java b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java index 9f7428cd..abf30674 100644 --- a/lib/java/test/org/apache/thrift/test/DeepCopyTest.java +++ b/lib/java/test/org/apache/thrift/test/DeepCopyTest.java @@ -20,6 +20,7 @@ package org.apache.thrift.test; +import org.apache.thrift.Fixtures; import org.apache.thrift.TDeserializer; import org.apache.thrift.TSerializer; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/lib/java/test/org/apache/thrift/test/IdentityTest.java b/lib/java/test/org/apache/thrift/test/IdentityTest.java index 48f08cc5..d163ec8b 100644 --- a/lib/java/test/org/apache/thrift/test/IdentityTest.java +++ b/lib/java/test/org/apache/thrift/test/IdentityTest.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; +import org.apache.thrift.Fixtures; import org.apache.thrift.TDeserializer; import org.apache.thrift.TSerializer; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java b/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java deleted file mode 100644 index 54d78e56..00000000 --- a/lib/java/test/org/apache/thrift/test/OverloadNonblockingServer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - - -package org.apache.thrift.test; - -import org.apache.thrift.protocol.TBinaryProtocol; -import org.apache.thrift.transport.TSocket; - - -public class OverloadNonblockingServer { - - public static void main(String[] args) throws Exception { - int msg_size_mb = Integer.parseInt(args[0]); - int msg_size = msg_size_mb * 1024 * 1024; - - TSocket socket = new TSocket("localhost", 9090); - TBinaryProtocol binprot = new TBinaryProtocol(socket); - socket.open(); - binprot.writeI32(msg_size); - binprot.writeI32(1); - socket.flush(); - - System.in.read(); - // Thread.sleep(30000); - for (int i = 0; i < msg_size_mb; i++) { - binprot.writeBinary(new byte[1024 * 1024]); - } - - socket.close(); - } -} diff --git a/lib/java/test/org/apache/thrift/test/ReadStruct.java b/lib/java/test/org/apache/thrift/test/ReadStruct.java index ef36f4d0..7e3b091d 100644 --- a/lib/java/test/org/apache/thrift/test/ReadStruct.java +++ b/lib/java/test/org/apache/thrift/test/ReadStruct.java @@ -22,6 +22,7 @@ package org.apache.thrift.test; import java.io.BufferedInputStream; import java.io.FileInputStream; +import org.apache.thrift.Fixtures; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.transport.TIOStreamTransport; diff --git a/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java b/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java index 9ba71029..2b0db313 100644 --- a/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java +++ b/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java @@ -20,6 +20,7 @@ package org.apache.thrift.test; +import org.apache.thrift.Fixtures; import org.apache.thrift.TBase; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; diff --git a/lib/java/test/org/apache/thrift/test/WriteStruct.java b/lib/java/test/org/apache/thrift/test/WriteStruct.java index 474c808e..a0013a93 100644 --- a/lib/java/test/org/apache/thrift/test/WriteStruct.java +++ b/lib/java/test/org/apache/thrift/test/WriteStruct.java @@ -22,6 +22,7 @@ package org.apache.thrift.test; import java.io.BufferedOutputStream; import java.io.FileOutputStream; +import org.apache.thrift.Fixtures; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.transport.TIOStreamTransport; -- 2.17.1