Skip to content

Commit 08e36c3

Browse files
committed
Made redis tests as ManualTest to avoid running in jenkins
1 parent 0de8f1e commit 08e36c3

File tree

97 files changed

+64
-65
lines changed

Some content is hidden

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

97 files changed

+64
-65
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -319,10 +319,10 @@ val scalazVersion = "7.3.8"
319319
val fs2Version = "3.9.4"
320320
val reactiveMongo = "1.1.0-RC12"
321321

322-
lazy val scala_libraries = (project in file("scala-libraries"))
322+
lazy val scala2_libraries = (project in file("scala2-libraries"))
323323
.configs(IntegrationTest)
324324
.settings(
325-
name := "scala-libraries",
325+
name := "scala2-libraries",
326326
scalaVersion := scalaV,
327327
libraryDependencies ++= scalaTestDeps.map(_.withConfigurations(Some("it,test"))),
328328
resolvers += "Kafka avro serializer" at "https://packages.confluent.io/maven",
@@ -377,10 +377,10 @@ val enumeratumDep = "com.beachape" %% "enumeratum" % "1.7.3"
377377
val circeDep = "io.circe" %% "circe-generic" % circeVersion
378378
val circeParserDep = "io.circe" %% "circe-parser" % circeVersion
379379

380-
lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
380+
lazy val scala_libraries = (project in file("scala-libraries"))
381381
.configs(IntegrationTest)
382382
.settings(
383-
name := "scala-libraries-2",
383+
name := "scala-libraries",
384384
scalaVersion := scala3Version,
385385
libraryDependencies ++= scalaTestDeps
386386
.map(_.withConfigurations(Some("it,test"))),

scala-libraries-2/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

scala-libraries-2/src/main/resources/application.conf

Lines changed: 0 additions & 11 deletions
This file was deleted.

scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/HelloRedisSpec.scala renamed to scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/HelloRedisManualTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.baeldung.redis
22

3-
import com.baeldung.redis.util.RedisSpec
3+
import com.baeldung.redis.util.RedisManualTest
44
import org.scalatest.flatspec.AnyFlatSpec
55

6-
class HelloRedisSpec extends AnyFlatSpec with RedisSpec {
6+
class HelloRedisManualTest extends AnyFlatSpec with RedisManualTest {
77

88
"The Hello Redis object" should "retrieve stored values" in {
99
getJedis().set("key1", "value1")

scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/cache/CacheThroughSpec.scala renamed to scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/cache/CacheThroughManualTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.baeldung.redis.cache
22

33
import com.baeldung.redis.db.{BooksDB, VirtualDatabase}
4-
import com.baeldung.redis.util.RedisSpec
4+
import com.baeldung.redis.util.RedisManualTest
55
import org.mockito.Mockito._
66
import org.scalatest.flatspec.AnyFlatSpec
77
import org.scalatestplus.mockito.MockitoSugar
88

9-
class CacheThroughSpec extends AnyFlatSpec with RedisSpec with MockitoSugar {
9+
class CacheThroughManualTest extends AnyFlatSpec with RedisManualTest with MockitoSugar {
1010

1111
"CacheThrough" should "fetch from DB only the first time" in {
1212
val mockDb = mock[VirtualDatabase]

scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/geospatial/GeospatialSpec.scala renamed to scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/geospatial/GeospatialManualTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import com.baeldung.redis.geospatial.GeoPoints.{
99
MethanaIndex,
1010
Vromolimni
1111
}
12-
import com.baeldung.redis.util.RedisSpec
12+
import com.baeldung.redis.util.RedisManualTest
1313
import org.scalatest.flatspec.AnyFlatSpec
1414

15-
class GeospatialSpec extends AnyFlatSpec with RedisSpec {
15+
class GeospatialManualTest extends AnyFlatSpec with RedisManualTest {
1616

1717
private def loadGeopoints(geoSpatial: Geospatial): Unit = {
1818
geoSpatial.add(MethanaIndex)(Methana.name)(Methana.latLon)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.baeldung.redis.leaderboard
22

33
import com.baeldung.redis.leaderboard.model.EmployDB
4-
import com.baeldung.redis.util.RedisSpec
4+
import com.baeldung.redis.util.RedisManualTest
55
import org.scalatest.flatspec.AnyFlatSpec
66

7-
class LeaderboardSpec extends AnyFlatSpec with RedisSpec {
7+
class LeaderboardManualTest extends AnyFlatSpec with RedisManualTest {
88

99
"Leaderboard#count" should "return correct counts for Employees after plus one calls" in {
1010
val commitLeaderboardKey = "commits"

scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/ratelimit/RateLimitSpec.scala renamed to scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/ratelimit/RateLimitManualTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.baeldung.redis.ratelimit
22

3-
import com.baeldung.redis.util.RedisSpec
3+
import com.baeldung.redis.util.RedisManualTest
44
import org.scalatest.flatspec.AnyFlatSpec
55

66
import scala.concurrent.duration._
77
import scala.language.postfixOps
88

9-
class RateLimitSpec extends AnyFlatSpec with RedisSpec {
9+
class RateLimitManualTest extends AnyFlatSpec with RedisManualTest {
1010

1111
"RateLimit" should "respond with not allowed for the given duration" in {
1212
val limitedKey = "limited-key"

scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/util/RedisSpec.scala renamed to scala-libraries-standalone/redis-intro/src/test/scala/com/baeldung/redis/util/RedisManualTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.baeldung.redis.util
33
import org.scalatest.{BeforeAndAfter, BeforeAndAfterEach, Suite}
44
import redis.clients.jedis.args.FlushMode
55

6-
trait RedisSpec extends WithRedis with BeforeAndAfter with BeforeAndAfterEach {
6+
trait RedisManualTest extends WithRedis with BeforeAndAfter with BeforeAndAfterEach {
77

88
this: Suite =>
99

scala-libraries/README.md

Lines changed: 9 additions & 12 deletions

0 commit comments

Comments
 (0)