Merge pull request #296 from lloydmeta/update/fix_deprecations

Update deprecated method calls
This commit is contained in:
Tony Tam 2014-10-07 21:42:13 -07:00
commit 643c211d72
8 changed files with 15 additions and 22 deletions

View File

@ -3,15 +3,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConverters._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class PetApiTest extends FlatSpec with ShouldMatchers {
class PetApiTest extends FlatSpec with Matchers {
behavior of "PetApi"
val api = new PetApi

View File

@ -4,15 +4,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class StoreApiTest extends FlatSpec with ShouldMatchers {
class StoreApiTest extends FlatSpec with Matchers {
behavior of "StoreApi"
val api = new StoreApi

View File

@ -3,15 +3,14 @@ import com.wordnik.petstore.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class UserApiTest extends FlatSpec with ShouldMatchers {
class UserApiTest extends FlatSpec with Matchers {
behavior of "UserApi"
val api = new UserApi
api.apiInvoker.defaultHeaders += "api_key" -> "special-key"

View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class AccountApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {
class AccountApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "AccountApi"
val api = new AccountApi

View File

@ -6,8 +6,7 @@ import com.wordnik.swagger.core.util.JsonUtil
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
@ -16,7 +15,7 @@ import scala.beans.BeanProperty
import scala.io.Source
@RunWith(classOf[JUnitRunner])
class WordApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {
class WordApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordApi"
val api = new WordApi

View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class WordListApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {
class WordListApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordListApi"
val api = new WordListApi

View File

@ -3,15 +3,14 @@ import com.wordnik.client.model._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.FlatSpec
import org.scalatest.matchers.ShouldMatchers
import org.scalatest._
import scala.collection.mutable.{ ListBuffer, HashMap }
import scala.collection.JavaConversions._
import scala.beans.BeanProperty
@RunWith(classOf[JUnitRunner])
class WordsApiTest extends FlatSpec with ShouldMatchers with BaseApiTest {
class WordsApiTest extends FlatSpec with Matchers with BaseApiTest {
behavior of "WordsApi"
val api = new WordsApi

View File

@ -19,7 +19,7 @@ trait RemoteUrl {
connection
}
else if(auth.passAs == "query") {
new URL(url + "?%s=%s".format(URLEncoder.encode(auth.keyName), URLEncoder.encode(auth.value))).openConnection()
new URL(url + "?%s=%s".format(URLEncoder.encode(auth.keyName, "UTF-8"), URLEncoder.encode(auth.value, "UTF-8"))).openConnection()
}
else {
new URL(url).openConnection()