kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nehanarkh...@apache.org
Subject svn commit: r1198866 - in /incubator/kafka/branches/0.7: ./ config/server.properties core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala
Date Mon, 07 Nov 2011 18:44:42 GMT
Author: nehanarkhede
Date: Mon Nov  7 18:44:42 2011
New Revision: 1198866

URL: http://svn.apache.org/viewvc?rev=1198866&view=rev
Log:
Merging svn commits r1198536, r1198047 from trunk

Modified:
    incubator/kafka/branches/0.7/   (props changed)
    incubator/kafka/branches/0.7/config/server.properties
    incubator/kafka/branches/0.7/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala

Propchange: incubator/kafka/branches/0.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 18:44:42 2011
@@ -1 +1 @@
-/incubator/kafka/trunk:1190521-1195253
+/incubator/kafka/trunk:1190521-1195253,1195282-1198536

Modified: incubator/kafka/branches/0.7/config/server.properties
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.7/config/server.properties?rev=1198866&r1=1198865&r2=1198866&view=diff
==============================================================================
--- incubator/kafka/branches/0.7/config/server.properties (original)
+++ incubator/kafka/branches/0.7/config/server.properties Mon Nov  7 18:44:42 2011
@@ -28,7 +28,7 @@ brokerid=0
 ############################# Socket Server Settings #############################
 
 # The port the socket server listens on
-port=9093
+port=9092
 
 # The number of processor threads the socket server uses for receiving and answering requests.

 # Defaults to the number of cores on the machine

Modified: incubator/kafka/branches/0.7/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala
URL: http://svn.apache.org/viewvc/incubator/kafka/branches/0.7/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala?rev=1198866&r1=1198865&r2=1198866&view=diff
==============================================================================
--- incubator/kafka/branches/0.7/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala
(original)
+++ incubator/kafka/branches/0.7/core/src/test/scala/unit/kafka/message/CompressionUtilsTest.scala
Mon Nov  7 18:44:42 2011
@@ -17,13 +17,14 @@
 
 package kafka.message
 
-import junit.framework.TestCase
 import kafka.utils.TestUtils
+import org.scalatest.junit.JUnitSuite
+import org.junit.Test
 
-class CompressionUtilTest extends TestCase {
+class CompressionUtilTest extends JUnitSuite {
 
   
-
+  @Test
   def testSimpleCompressDecompress() {
 
     val messages = List[Message](new Message("hi there".getBytes), new Message("I am fine".getBytes),
new Message("I am not so well today".getBytes))
@@ -34,9 +35,10 @@ class CompressionUtilTest extends TestCa
 
     TestUtils.checkLength(decompressedMessages.iterator,3)
 
-    TestUtils.checkEquals(messages.iterator, decompressedMessages.iterator)
+    TestUtils.checkEquals(messages.iterator, TestUtils.getMessageIterator(decompressedMessages.iterator))
   }
 
+  @Test
   def testComplexCompressDecompress() {
 
     val messages = List[Message](new Message("hi there".getBytes), new Message("I am fine".getBytes),
new Message("I am not so well today".getBytes))
@@ -49,10 +51,8 @@ class CompressionUtilTest extends TestCa
 
     val decompressedMessages = CompressionUtils.decompress(complexMessage)
 
-    TestUtils.checkLength(decompressedMessages.iterator,2)
-
-    TestUtils.checkLength(decompressedMessages.iterator,3)
+    TestUtils.checkLength(TestUtils.getMessageIterator(decompressedMessages.iterator),3)
 
-    TestUtils.checkEquals(messages.iterator, decompressedMessages.iterator)
+    TestUtils.checkEquals(messages.iterator, TestUtils.getMessageIterator(decompressedMessages.iterator))
   }
 }



Mime
View raw message