Author: aching
Date: Tue Aug 7 00:48:29 2012
New Revision: 1370086
URL: http://svn.apache.org/viewvc?rev=1370086&view=rev
Log:
Reverting testClientChannelConfiguration only from GIRAPH-281.
Modified:
giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java
Modified: giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java
URL:
http://svn.apache.org/viewvc/giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java?rev=1370086&r1=1370085&r2=1370086&view=diff
==============================================================================
--- giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java
(original)
+++ giraph/trunk/src/test/java/org/apache/giraph/comm/ConnectionTest.java Tue
Aug 7 00:48:29 2012
@@ -152,50 +152,4 @@ public class ConnectionTest {
client3.stop();
server.stop();
}
-
-
- /**
- * Test that we can use Giraph configuration settings to
- * modify Netty client channel configuration.
- * TODO: add test for server-side channel configuration as well.
- *
- * @throws IOException
- */
- @Test
- public void testClientChannelConfiguration() throws IOException {
- Configuration conf = new Configuration();
- @SuppressWarnings("rawtypes")
- Context context = mock(Context.class);
- when(context.getConfiguration()).thenReturn(conf);
-
- ServerData<IntWritable, IntWritable, IntWritable, IntWritable> serverData =
- new ServerData<IntWritable, IntWritable, IntWritable, IntWritable>
- (SimpleMessageStore.newFactory(
- MockUtils.mockServiceGetVertexPartitionOwner(1), conf));
-
- NettyServer<IntWritable, IntWritable, IntWritable, IntWritable> server =
new NettyServer<IntWritable, IntWritable,
- IntWritable, IntWritable>(conf, serverData);
- server.start();
-
- final int giraphClientSendBufferSize =
context.getConfiguration().getInt(GiraphJob.CLIENT_SEND_BUFFER_SIZE,
- GiraphJob.DEFAULT_CLIENT_SEND_BUFFER_SIZE);
- final int giraphClientReceiveBufferSize =
context.getConfiguration().getInt(GiraphJob.CLIENT_RECEIVE_BUFFER_SIZE,
- GiraphJob.DEFAULT_CLIENT_RECEIVE_BUFFER_SIZE);
-
- NettyClient<IntWritable, IntWritable, IntWritable, IntWritable> client =
- new NettyClient<IntWritable, IntWritable, IntWritable,
- IntWritable>(context);
- client.connectAllAdddresses(Collections.singleton(server.getMyAddress()));
-
- DefaultSocketChannelConfig clientConfig =
(DefaultSocketChannelConfig)client.getChannelConfig();
- final int channelClientSendBufferSize = clientConfig.getSendBufferSize();
- final int channelClientReceiveBufferSize =
clientConfig.getReceiveBufferSize();
-
- assertEquals(giraphClientSendBufferSize,channelClientSendBufferSize);
- assertEquals(giraphClientReceiveBufferSize,channelClientReceiveBufferSize);
-
- client.stop();
- server.stop();
-
- }
}