Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 17:26:22 +01:00
Code Issues Packages Projects Releases Activity

improve hash calculation and use nio file apis

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-08-21 07:44:50 +02:00
parent 7e44245008
commit e0fa09fd04
5 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/test/java/sonia/scm/plugin/PendingPluginInstallationTest.java
View File

@@ -28,7 +28,7 @@ class PendingPluginInstallationTest {
when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file.toFile());
PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file);
installation.cancel();
assertThat(file).doesNotExist();
@@ -39,7 +39,7 @@ class PendingPluginInstallationTest {
Path file = directory.resolve("file");
when(plugin.getDescriptor().getInformation().getName()).thenReturn("scm-awesome-plugin");
PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file.toFile());
PendingPluginInstallation installation = new PendingPluginInstallation(plugin, file);
assertThrows(PluginFailedToCancelInstallationException.class, installation::cancel);
}

7
scm-webapp/src/test/java/sonia/scm/plugin/PluginInstallerTest.java
View File

@@ -20,6 +20,8 @@ import java.util.Collections;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.in;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
@ExtendWith({MockitoExtension.class, TempDirectory.class})
@@ -39,7 +41,10 @@ class PluginInstallerTest {
@BeforeEach
void setUpContext(@TempDirectory.TempDir Path directory) {
this.directory = directory;
when(context.getBaseDirectory()).thenReturn(directory.toFile());
lenient().when(context.resolve(any())).then(ic -> {
Path arg = ic.getArgument(0);
return directory.resolve(arg);
});
}
@Test