kafka git commit: MINOR: Restore `SslConsumerTest` which was accidentally deleted in client-side assignment commit

[gu...@apache.org]

Repository: kafka
Updated Branches:
  refs/heads/trunk 2e25f899a -> bf292a6fa


MINOR: Restore `SslConsumerTest` which was accidentally deleted in client-side assignment commit

Probably happened while resolving conflicts, commit: 86eb74d9236c586af5889fe79f4b9e066c9c2af3

Author: Ismael Juma <is...@juma.me.uk>

Reviewers: Jason Gustafson

Closes #350 from ijuma/restore-ssl-consumer-test


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/bf292a6f
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/bf292a6f
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/bf292a6f

Branch: refs/heads/trunk
Commit: bf292a6fa5b52844edfe256e8f1dd42da432d0c9
Parents: 2e25f89
Author: Ismael Juma <is...@juma.me.uk>
Authored: Thu Oct 22 09:52:09 2015 -0700
Committer: Guozhang Wang <wa...@gmail.com>
Committed: Thu Oct 22 09:52:09 2015 -0700

----------------------------------------------------------------------
 .../integration/kafka/api/SslConsumerTest.scala | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/bf292a6f/core/src/test/scala/integration/kafka/api/SslConsumerTest.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/integration/kafka/api/SslConsumerTest.scala b/core/src/test/scala/integration/kafka/api/SslConsumerTest.scala
new file mode 100644
index 0000000..1d13d88
--- /dev/null
+++ b/core/src/test/scala/integration/kafka/api/SslConsumerTest.scala
@@ -0,0 +1,22 @@
+/**
+  * 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 kafka.api
+
+import java.io.File
+
+import org.apache.kafka.common.protocol.SecurityProtocol
+
+class SslConsumerTest extends BaseConsumerTest {
+  override protected def securityProtocol = SecurityProtocol.SSL
+  override protected lazy val trustStoreFile = Some(File.createTempFile("truststore", ".jks"))
+}