File tree Expand file tree Collapse file tree
audio-api/src/test/scala/no/ndla/audioapi/service/search
scalatestsuite/src/main/scala/no/ndla/scalatestsuite
search-api/src/test/scala/no/ndla/searchapi/service/search Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -52,15 +52,11 @@ class SeriesSearchServiceTest extends ElasticsearchIntegrationSuite with UnitSui
5252 )
5353
5454 override def beforeEach (): Unit = {
55- {
56- seriesIndexService.createIndexAndAlias()
57- }
55+ seriesIndexService.createIndexAndAlias()
5856 }
5957
6058 override def afterEach (): Unit = {
61- {
62- seriesIndexService.deleteIndexAndAlias()
63- }
59+ seriesIndexService.deleteIndexAndAlias()
6460 }
6561
6662 def indexAndWait (series : Seq [domain.Series ]): Unit = {
Original file line number Diff line number Diff line change @@ -62,19 +62,6 @@ object SharedContainer {
6262 }
6363 }
6464
65- def release (name : String ): Unit = {
66- getNameLock(name).synchronized {
67- val cached = localCaches.get(name)
68- if (cached == null ) return
69-
70- val remaining = cached.refCount.decrementAndGet()
71- if (remaining <= 0 ) {
72- localCaches.remove(name)
73- decrementGlobalRefCount(name, cached.info.containerId)
74- }
75- }
76- }
77-
7865 private def acquireAcrossJvms (
7966 name : String ,
8067 startContainer : () => SharedContainerInfo ,
Original file line number Diff line number Diff line change @@ -55,21 +55,17 @@ class MultiDraftSearchServiceAtomicTest extends ElasticsearchIntegrationSuite wi
5555 }
5656
5757 override def beforeEach (): Unit = {
58- {
59- draftConceptIndexService.createIndexAndAlias().get
60- articleIndexService.createIndexAndAlias().get
61- draftIndexService.createIndexAndAlias().get
62- learningPathIndexService.createIndexAndAlias().get
63- }
58+ draftConceptIndexService.createIndexAndAlias().get
59+ articleIndexService.createIndexAndAlias().get
60+ draftIndexService.createIndexAndAlias().get
61+ learningPathIndexService.createIndexAndAlias().get
6462 }
6563
6664 override def afterEach (): Unit = {
67- {
68- articleIndexService.deleteIndexAndAlias()
69- draftIndexService.deleteIndexAndAlias()
70- learningPathIndexService.deleteIndexAndAlias()
71- draftConceptIndexService.deleteIndexAndAlias()
72- }
65+ articleIndexService.deleteIndexAndAlias()
66+ draftIndexService.deleteIndexAndAlias()
67+ learningPathIndexService.deleteIndexAndAlias()
68+ draftConceptIndexService.deleteIndexAndAlias()
7369 }
7470
7571 val indexingBundle : IndexingBundle = IndexingBundle (
You can’t perform that action at this time.
0 commit comments