imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 11:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert

Browse Source
This commit is contained in:
Andreas Krühlmann
2025-12-11 01:58:57 +01:00
parent d2ee45e6b9
commit 93a95d4a2d
7 changed files with 33 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/test/java/com/imgfloat/app/ChannelDirectoryServiceTest.java
View File

@@ -11,24 +11,19 @@ import com.imgfloat.app.service.ChannelDirectoryService;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import org.springframework.mock.web.MockMultipartFile;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ConcurrentHashMap;
import javax.imageio.ImageIO;
import org.jcodec.api.awt.AWTSequenceEncoder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -43,18 +38,14 @@ class ChannelDirectoryServiceTest {
private SimpMessagingTemplate messagingTemplate;
private ChannelRepository channelRepository;
private AssetRepository assetRepository;
private RecordingTaskExecutor taskExecutor;
private Map<String, Channel> channels;
private Map<String, Asset> assets;
@BeforeEach
void setup() {
messagingTemplate = mock(SimpMessagingTemplate.class);
channelRepository = mock(ChannelRepository.class);
assetRepository = mock(AssetRepository.class);
taskExecutor = new RecordingTaskExecutor();
setupInMemoryPersistence();
service = new ChannelDirectoryService(channelRepository, assetRepository, messagingTemplate, taskExecutor);
service = new ChannelDirectoryService(channelRepository, assetRepository, messagingTemplate);
}
@Test
@@ -67,41 +58,6 @@ class ChannelDirectoryServiceTest {
verify(messagingTemplate).convertAndSend(org.mockito.ArgumentMatchers.contains("/topic/channel/caster"), captor.capture());
}
@Test
void asyncGifOptimizationSwitchesToVideo() throws Exception {
MockMultipartFile file = new MockMultipartFile("file", "image.gif", "image/gif", largeGif());
long start = System.currentTimeMillis();
AssetView created = service.createAsset("caster", file).orElseThrow();
long duration = System.currentTimeMillis() - start;
assertThat(duration).isLessThan(750L);
Asset placeholder = assets.get(created.id());
assertThat(placeholder.getMediaType()).isEqualTo("image/gif");
assertThat(placeholder.getPreview()).isNull();
taskExecutor.runAll();
Asset optimized = assets.get(created.id());
assertThat(optimized.getMediaType()).isEqualTo("video/mp4");
assertThat(optimized.getPreview()).isNotBlank();
}
@Test
void videoPreviewGeneratedInBackground() throws Exception {
MockMultipartFile file = new MockMultipartFile("file", "clip.mp4", "video/mp4", sampleVideo());
AssetView created = service.createAsset("caster", file).orElseThrow();
Asset placeholder = assets.get(created.id());
assertThat(placeholder.getPreview()).isNull();
taskExecutor.runAll();
Asset optimized = assets.get(created.id());
assertThat(optimized.getPreview()).isNotBlank();
assertThat(optimized.getMediaType()).isEqualTo("video/mp4");
}
@Test
void updatesTransformAndVisibility() throws Exception {
MockMultipartFile file = new MockMultipartFile("file", "image.png", "image/png", samplePng());
@@ -129,33 +85,9 @@ class ChannelDirectoryServiceTest {
return out.toByteArray();
}
private byte[] largeGif() throws IOException {
BufferedImage image = new BufferedImage(256, 256, BufferedImage.TYPE_INT_ARGB);
try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
ImageIO.write(image, "gif", out);
return out.toByteArray();
}
}
private byte[] sampleVideo() throws IOException {
File temp = File.createTempFile("sample", ".mp4");
temp.deleteOnExit();
try {
AWTSequenceEncoder encoder = AWTSequenceEncoder.createSequenceEncoder(temp, 10);
for (int i = 0; i < 15; i++) {
BufferedImage frame = new BufferedImage(64, 64, BufferedImage.TYPE_INT_RGB);
encoder.encodeImage(frame);
}
encoder.finish();
return java.nio.file.Files.readAllBytes(temp.toPath());
} finally {
temp.delete();
}
}
private void setupInMemoryPersistence() {
channels = new ConcurrentHashMap<>();
assets = new ConcurrentHashMap<>();
Map<String, Channel> channels = new ConcurrentHashMap<>();
Map<String, Asset> assets = new ConcurrentHashMap<>();
when(channelRepository.findById(anyString()))
.thenAnswer(invocation -> Optional.ofNullable(channels.get(invocation.getArgument(0))));
@@ -190,18 +122,4 @@ class ChannelDirectoryServiceTest {
.filter(asset -> !onlyVisible || !asset.isHidden())
.toList();
}
private static class RecordingTaskExecutor implements TaskExecutor {
private final List<Runnable> queued = new CopyOnWriteArrayList<>();
@Override
public void execute(Runnable task) {
queued.add(task);
}
void runAll() {
new ArrayList<>(queued).forEach(Runnable::run);
queued.clear();
}
}
}

66
src/test/java/com/imgfloat/app/service/ChannelDirectoryServiceIntegrationTest.java
View File

@@ -1,66 +0,0 @@
package com.imgfloat.app.service;
import com.imgfloat.app.model.Channel;
import com.imgfloat.app.repository.ChannelRepository;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.messaging.simp.SimpMessagingTemplate;
import com.imgfloat.app.repository.AssetRepository;
import java.util.List;
import static org.assertj.core.api.Assertions.assertThat;
@ExtendWith(SpringExtension.class)
@DataJpaTest
@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
class ChannelDirectoryServiceIntegrationTest {
@Autowired
private ChannelRepository channelRepository;
private ChannelDirectoryService channelDirectoryService;
@BeforeEach
void setUp() {
channelDirectoryService = new ChannelDirectoryService(
channelRepository,
Mockito.mock(AssetRepository.class),
Mockito.mock(SimpMessagingTemplate.class));
}
@Test
void searchBroadcastersFindsPartialMatchesCaseInsensitive() {
Channel alpha = new Channel("Alpha");
Channel alphabeta = new Channel("AlphaBeta");
Channel bravo = new Channel("Bravo");
channelRepository.saveAll(List.of(alpha, alphabeta, bravo));
List<String> results = channelDirectoryService.searchBroadcasters("lPh");
assertThat(results).containsExactly("alpha", "alphabeta");
}
@Test
void adminChannelsForFindsNormalizedAdminEntries() {
Channel alpha = new Channel("Alpha");
alpha.addAdmin("ModOne");
Channel bravo = new Channel("Bravo");
bravo.addAdmin("modone");
Channel charlie = new Channel("Charlie");
charlie.addAdmin("other");
channelRepository.saveAll(List.of(alpha, bravo, charlie));
List<String> adminChannels = channelDirectoryService.adminChannelsFor("MODONE").stream().sorted().toList();
assertThat(adminChannels).containsExactly("alpha", "bravo");
}
}