Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

Refactor trailers

Browse Source 
Trailes are no persons, they have a person.
This commit is contained in:
René Pfeuffer
2020-06-02 16:41:59 +02:00
parent 76f2722ff4
commit ad864787a7
10 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package sonia.scm.api.v2.resources;
import com.google.inject.util.Providers;
@@ -64,6 +64,7 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -161,7 +162,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
assertEquals(404, response.getStatus());
MediaType contentType = (MediaType) response.getOutputHeaders().getFirst("Content-Type");
Assertions.assertThat(response.getContentAsString()).contains("branch", "master", "space/repo");
assertThat(response.getContentAsString()).contains("branch", "master", "space/repo");
}
@Test
@@ -201,10 +202,10 @@ public class BranchRootResourceTest extends RepositoryTestBase {
dispatcher.invoke(request, response);
assertEquals(200, response.getStatus());
log.info("Response :{}", response.getContentAsString());
assertTrue(response.getContentAsString().contains(String.format("\"id\":\"%s\"", REVISION)));
assertTrue(response.getContentAsString().contains(String.format("\"name\":\"%s\"", authorName)));
assertTrue(response.getContentAsString().contains(String.format("\"mail\":\"%s\"", authorEmail)));
assertTrue(response.getContentAsString().contains(String.format("\"description\":\"%s\"", commit)));
assertThat(response.getContentAsString()).contains(String.format("\"id\":\"%s\"", REVISION));
assertThat(response.getContentAsString()).contains(String.format("\"name\":\"%s\"", authorName));
assertThat(response.getContentAsString()).contains(String.format("\"mail\":\"%s\"", authorEmail));
assertThat(response.getContentAsString()).contains(String.format("\"description\":\"%s\"", commit));
}
@Test

16
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetDescriptionTrailersTest.java
View File

@@ -64,8 +64,8 @@ class ChangesetDescriptionTrailersTest {
Trailer first = Trailer.get(0);
assertThat(first.getTrailerType()).isEqualTo("Co-authored-by");
assertThat(first.getName()).isEqualTo(displayUser.getDisplayName());
assertThat(first.getMail()).isEqualTo(displayUser.getMail());
assertThat(first.getPerson().getName()).isEqualTo(displayUser.getDisplayName());
assertThat(first.getPerson().getMail()).isEqualTo(displayUser.getMail());
}
@Test
@@ -78,8 +78,8 @@ class ChangesetDescriptionTrailersTest {
Trailer Trailer = trailer.get(0);
assertThat(Trailer.getTrailerType()).isEqualTo("Reviewed-by");
assertThat(Trailer.getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getMail()).isEqualTo(displayUser.getMail());
assertThat(Trailer.getPerson().getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getPerson().getMail()).isEqualTo(displayUser.getMail());
}
@Test
@@ -92,8 +92,8 @@ class ChangesetDescriptionTrailersTest {
Trailer Trailer = trailer.get(0);
assertThat(Trailer.getTrailerType()).isEqualTo("Signed-off-by");
assertThat(Trailer.getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getMail()).isEqualTo(displayUser.getMail());
assertThat(Trailer.getPerson().getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getPerson().getMail()).isEqualTo(displayUser.getMail());
}
@Test
@@ -106,8 +106,8 @@ class ChangesetDescriptionTrailersTest {
Trailer Trailer = trailer.get(0);
assertThat(Trailer.getTrailerType()).isEqualTo("Committed-by");
assertThat(Trailer.getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getMail()).isEqualTo(displayUser.getMail());
assertThat(Trailer.getPerson().getName()).isEqualTo(displayUser.getDisplayName());
assertThat(Trailer.getPerson().getMail()).isEqualTo(displayUser.getMail());
}
private Changeset createChangeset(String commitMessage) {