Skip to content

Commit c34dda7

Browse files
yufangongjenkins
authored and
jenkins
committed
scrooge: Remove warnings from scrooge-generator-test
Problem: We got some compiler warnings for scrooge-generator-test, most of them are unused import. Solution: Fix it. RB_ID=916144
1 parent df7bf94 commit c34dda7

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

scrooge-generator-tests/src/test/scala/BUILD

+1
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ junit_tests(
3939
'scrooge/scrooge-generator-tests/src/test/thrift:thrift',
4040
'util/util-core/src/main/scala:scala',
4141
],
42+
fatal_warnings=True,
4243
sources=rglobs('*.scala'),
4344
)

scrooge-generator-tests/src/test/scala/com/twitter/scrooge/android_generator/AndroidGeneratorSpec.scala

-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ import com.twitter.scrooge.mustache.ScalaObjectHandler
99
import com.google.common.base.Charsets
1010
import com.google.common.io.CharStreams
1111
import com.twitter.scrooge.ast._
12-
import com.twitter.scrooge.{integration_android => androidGen}
1312
import com.twitter.scrooge.frontend.{ResolvedDocument, TypeResolver}
1413
import com.twitter.scrooge.testutil.Spec
1514
import com.twitter.scrooge.testutil.Utils.verify
16-
import org.apache.thrift.protocol.TBinaryProtocol
17-
import org.apache.thrift.transport.TMemoryBuffer
1815
import org.mockito.Mockito._
1916
import thrift.complete.android.test1.{StructXA, StructXB, SimpleWithDefaults}
2017
import thrift.complete.android.test2.ComplexCollections

scrooge-generator-tests/src/test/scala/com/twitter/scrooge/backend/NamespaceSpec.scala

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import com.twitter.scrooge.testutil.Spec
44

55
class NamespaceSpec extends Spec {
66
"Scala Generator" should {
7-
import foo._
87
import bar._
98
import com.fake._
109
"import from another namespace" in {

scrooge-generator-tests/src/test/scala/com/twitter/scrooge/backend/ScalaGeneratorSpec.scala

+4-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.twitter.scrooge.backend
22

33
import com.twitter.conversions.time._
44
import com.twitter.finagle.{Service, SourcedException}
5-
import com.twitter.finagle.thrift.ThriftServiceIface
65
import com.twitter.scrooge.testutil.{EvalHelper, JMockSpec}
76
import com.twitter.scrooge.{ThriftStruct, ThriftException}
87
import com.twitter.util.{Await, Future}
@@ -11,13 +10,10 @@ import java.nio.ByteBuffer
1110
import org.apache.thrift.protocol._
1211
import org.apache.thrift.transport.TMemoryBuffer
1312
import org.jmock.Expectations
14-
import org.jmock.Expectations.{any, returnValue}
13+
import org.jmock.Expectations.returnValue
1514
import thrift.test._
1615
import thrift.test1._
1716
import thrift.test2._
18-
import thrift.`def`.default._
19-
import includes.a.thriftscala._
20-
import includes.b.thriftscala._
2117
import inheritance.aaa.{Aaa, Box}
2218
import inheritance.bbb.Bbb
2319
import inheritance.ccc.Ccc
@@ -506,7 +502,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
506502
"missing required value throws exception during deserialization" should {
507503
"with no default value" in { cycle => import cycle._
508504
val protocol = mock[TProtocol]
509-
expecting { e => import e._
505+
expecting { e =>
510506
emptyRead(e, protocol)
511507
}
512508

@@ -519,7 +515,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
519515

520516
"with default value" in { cycle => import cycle._
521517
val protocol = mock[TProtocol]
522-
expecting { e => import e._
518+
expecting { e =>
523519
emptyRead(e, protocol)
524520
}
525521

@@ -799,7 +795,7 @@ class ScalaGeneratorSpec extends JMockSpec with EvalHelper {
799795
"zero fields" should {
800796
"read" in { cycle => import cycle._
801797
val protocol = mock[TProtocol]
802-
expecting { e => import e._
798+
expecting { e =>
803799
emptyRead(e, protocol)
804800
}
805801

scrooge-generator-tests/src/test/scala/com/twitter/scrooge/backend/ServiceGeneratorSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.twitter.finagle.param.Stats
66
import com.twitter.finagle.service.{ResponseClass, ResponseClassifier, ReqRep}
77
import com.twitter.finagle.{Address, ListeningServer, Name, Thrift, Service, SimpleFilter, SourcedException}
88
import com.twitter.finagle.stats.InMemoryStatsReceiver
9-
import com.twitter.finagle.thrift.{ThriftClientRequest, ThriftServiceIface}
9+
import com.twitter.finagle.thrift.ThriftClientRequest
1010
import com.twitter.scrooge.ThriftException
1111
import com.twitter.scrooge.testutil.{EvalHelper, JMockSpec}
1212
import com.twitter.util.{Await, Future, Return}

scrooge-generator-tests/src/test/scala/com/twitter/scrooge/mustache/HandlebarSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class HandlebarSpec extends Spec {
3838
}
3939

4040
"optional blocks" in {
41-
val template = "You {{#money}}have ${{money}}{{/money}}{{^money}}are broke{{/money}}."
41+
val template = s"You {{#money}}have $${{money}}{{/money}}{{^money}}are broke{{/money}}."
4242
Handlebar.generate(template, Dictionary("money" -> v("5"))) must be("You have $5.")
4343
Handlebar.generate(template, Dictionary()) must be("You are broke.")
4444
Handlebar.generate(template, Dictionary("money" -> v(true))) must be("You have $true.")

0 commit comments

Comments
 (0)