Skip to content

Commit c5937d8

Browse files
Revert "feature/Reduce test warnings"
This reverts commit 0fcf0b9.
1 parent 0fcf0b9 commit c5937d8

44 files changed

Lines changed: 26 additions & 338 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

obp-api/src/test/scala/RunMTLSWebApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object RunMTLSWebApp extends App with PropsProgrammatically {
8989
// RESET HEADER
9090
https.addCustomizer(customizer)
9191

92-
val sslContextFactory = new SslContextFactory.Server()
92+
val sslContextFactory = new SslContextFactory()
9393
sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
9494
sslContextFactory.setKeyStorePassword("123456")
9595

obp-api/src/test/scala/RunTLSWebApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object RunTLSWebApp extends App with PropsProgrammatically {
8989
// RESET HEADER
9090
https.addCustomizer(customizer)
9191

92-
val sslContextFactory = new SslContextFactory.Server()
92+
val sslContextFactory = new SslContextFactory()
9393
sslContextFactory.setKeyStorePath(this.getClass.getResource("/cert/server.jks").toExternalForm)
9494
sslContextFactory.setKeyStorePassword("123456")
9595

obp-api/src/test/scala/code/AppTest.scala

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,41 @@ TESOBE (http://www.tesobe.com/)
2727
package code
2828

2929
import java.io.File
30+
import junit.framework._
31+
import Assert._
3032
import scala.xml.XML
3133
import net.liftweb.util._
3234
import net.liftweb.common._
33-
import org.scalatest.{FlatSpec, Matchers}
3435

3536
object AppTest {
37+
def suite: Test = {
38+
val suite = new TestSuite(classOf[AppTest])
39+
suite
40+
}
41+
3642
def main(args : Array[String]) {
37-
// Use ScalaTest runner instead
38-
println("Use 'sbt test' or 'mvn test' to run tests")
43+
junit.textui.TestRunner.run(suite)
3944
}
4045
}
4146

4247
/**
4348
* Unit test for simple App.
4449
*/
45-
class AppTest extends FlatSpec with Matchers {
50+
class AppTest extends TestCase("app") {
4651

4752
/**
48-
* Basic functionality test
53+
* Rigourous Tests :-)
4954
*/
50-
"App" should "pass basic test" in {
51-
true should be(true)
52-
}
55+
def testOK() = assertTrue(true)
56+
// def testKO() = assertTrue(false);
5357

5458
/**
5559
* Tests to make sure the project's XML files are well-formed.
5660
*
5761
* Finds every *.html and *.xml file in src/main/webapp (and its
5862
* subdirectories) and tests to make sure they are well-formed.
5963
*/
60-
it should "have well-formed XML files" in {
64+
def testXml() = {
6165
var failed: List[File] = Nil
6266

6367
def handledXml(file: String) =

obp-api/src/test/scala/code/api/DirectLoginTest.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import code.setup.{APIResponse, ServerSetup, TestPasswordConfig}
1313
import code.userlocks.UserLocksProvider
1414
import com.github.dwickern.macros.NameOf.nameOf
1515
import com.openbankproject.commons.model.ErrorMessage
16-
import scala.language.reflectiveCalls
1716
import com.openbankproject.commons.util.ApiVersion
1817
import net.liftweb.json.JsonAST.{JArray, JField, JObject, JString}
1918
import net.liftweb.mapper.By

obp-api/src/test/scala/code/api/OBPRestHelperTest.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package code.api
22

33
import code.api.util.APIUtil.{ResourceDoc, EmptyBody}
4+
import code.api.OBPRestHelper
45
import com.openbankproject.commons.util.{ApiVersion, ScannedApiVersion}
56
import org.scalatest.{FlatSpec, Matchers, Tag}
67

obp-api/src/test/scala/code/api/ResourceDocs1_4_0/ResourceDocsTest.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import code.api.v1_4_0.JSONFactory1_4_0.ResourceDocsJson
99
import code.setup.{DefaultUsers, PropsReset}
1010
import com.github.dwickern.macros.NameOf.nameOf
1111
import com.openbankproject.commons.util.{ApiVersion, Functions}
12-
import scala.language.reflectiveCalls
1312
import net.liftweb.json
1413
import net.liftweb.json.JsonAST._
1514
import net.liftweb.json.{Formats, JString, Serializer, TypeInfo}

obp-api/src/test/scala/code/api/ResourceDocs1_4_0/SwaggerDocsTest.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import code.api.util.{ApiRole, CustomJsonFormats}
55
import code.setup.{DefaultUsers, PropsReset}
66
import com.github.dwickern.macros.NameOf.nameOf
77
import com.openbankproject.commons.util.{ApiVersion, Functions}
8-
import scala.language.reflectiveCalls
98
import io.swagger.parser.OpenAPIParser
109
import net.liftweb.json
1110
import net.liftweb.json.JsonAST._

obp-api/src/test/scala/code/api/util/JavaWebSignatureTest.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import com.github.dwickern.macros.NameOf.nameOf
1111
import net.liftweb.common.Full
1212
import net.liftweb.util.Helpers._
1313
import org.scalatest.Tag
14-
import scala.language.postfixOps
1514

1615
class JavaWebSignatureTest extends V400ServerSetup {
1716
/**

obp-api/src/test/scala/code/api/v1_4_0/BranchesTest.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
package code.api.v1_4_0
2-
// Note: This test intentionally uses deprecated model classes (LobbyStringT, DriveUpStringT)
3-
// to maintain backwards compatibility testing. These warnings are expected.
42

53
import code.api.util.APIUtil.OAuth._
64
import code.api.util.OBPQueryParam

obp-api/src/test/scala/code/api/v2_1_0/CreateTransactionTypeTest.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import code.setup.DefaultUsers
1010
import code.transaction_types.MappedTransactionType
1111
import com.github.dwickern.macros.NameOf.nameOf
1212
import com.openbankproject.commons.model.{AmountOfMoneyJsonV121, ErrorMessage, TransactionTypeId}
13-
import scala.language.reflectiveCalls
1413
import com.openbankproject.commons.util.ApiVersion
1514
import net.liftweb.json.Serialization._
1615
import org.scalatest.Tag

0 commit comments

Comments
 (0)