mirror of
https://github.com/Athou/commafeed.git
synced 2026-03-21 21:37:29 +00:00
replace homemade threadpool framework with rxjava
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.commafeed.backend.service;
|
||||
|
||||
import org.apache.http.HttpHeaders;
|
||||
import org.hibernate.SessionFactory;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -15,7 +16,6 @@ import org.mockserver.model.HttpResponse;
|
||||
import org.mockserver.model.MediaType;
|
||||
|
||||
import com.commafeed.CommaFeedConfiguration;
|
||||
import com.commafeed.backend.feed.FeedQueues;
|
||||
import com.commafeed.backend.model.Feed;
|
||||
|
||||
@ExtendWith(MockServerExtension.class)
|
||||
@@ -25,7 +25,10 @@ class PubSubServiceTest {
|
||||
private CommaFeedConfiguration config;
|
||||
|
||||
@Mock
|
||||
private FeedQueues queues;
|
||||
private FeedService feedService;
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private SessionFactory sessionFactory;
|
||||
|
||||
@Mock
|
||||
private Feed feed;
|
||||
@@ -40,7 +43,7 @@ class PubSubServiceTest {
|
||||
this.client = client;
|
||||
this.client.reset();
|
||||
|
||||
this.underTest = new PubSubService(config, queues);
|
||||
this.underTest = new PubSubService(config, feedService, sessionFactory);
|
||||
|
||||
Integer port = client.getPort();
|
||||
String hubUrl = String.format("http://localhost:%s/hub", port);
|
||||
@@ -69,7 +72,7 @@ class PubSubServiceTest {
|
||||
.withMethod("POST")
|
||||
.withPath("/hub"));
|
||||
Mockito.verify(feed, Mockito.never()).setPushTopic(Mockito.anyString());
|
||||
Mockito.verifyNoInteractions(queues);
|
||||
Mockito.verifyNoInteractions(feedService);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -83,7 +86,7 @@ class PubSubServiceTest {
|
||||
|
||||
// Assert
|
||||
Mockito.verify(feed).setPushTopic(Mockito.anyString());
|
||||
Mockito.verify(queues).giveBack(feed);
|
||||
Mockito.verify(feedService).save(feed);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -96,7 +99,7 @@ class PubSubServiceTest {
|
||||
|
||||
// Assert
|
||||
Mockito.verify(feed, Mockito.never()).setPushTopic(Mockito.anyString());
|
||||
Mockito.verifyNoInteractions(queues);
|
||||
Mockito.verifyNoInteractions(feedService);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user