From f9c78c0ccc709509cdf7f83c45c898883d329db2 Mon Sep 17 00:00:00 2001 From: Paul Martin Date: Mon, 29 Sep 2014 22:10:20 +0100 Subject: Tickets - Priority, Severity options + Severity indicated via new character indicator and color of ticket icon on ticket list + Priority indicated via new priority icon and color on ticket list + Indexed as integers to provide sorting and maintain language neutral index + Colours and indicator text controlled through CSS classes priority- & severity- + UITicketTest created to generate tickets of all types to ease debugging --- .../java/com/gitblit/tests/TicketServiceTest.java | 44 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'src/test/java/com/gitblit/tests/TicketServiceTest.java') diff --git a/src/test/java/com/gitblit/tests/TicketServiceTest.java b/src/test/java/com/gitblit/tests/TicketServiceTest.java index 1676e341..c654383d 100644 --- a/src/test/java/com/gitblit/tests/TicketServiceTest.java +++ b/src/test/java/com/gitblit/tests/TicketServiceTest.java @@ -293,9 +293,47 @@ public abstract class TicketServiceTest extends GitblitUnitTest { assertTrue("failed to delete label " + label.name, service.deleteLabel(getRepository(), label.name, "lucifer")); } } - - - + + @Test + public void testPriorityAndSeverity() throws Exception { + // C1: create and insert a ticket + Change c1 = newChange("testPriorityAndSeverity() " + Long.toHexString(System.currentTimeMillis())); + TicketModel ticket = service.createTicket(getRepository(), c1); + assertTrue(ticket.number > 0); + assertEquals(TicketModel.Priority.Normal, ticket.priority); + assertEquals(TicketModel.Severity.Unrated, ticket.severity); + + TicketModel constructed = service.getTicket(getRepository(), ticket.number); + compare(ticket, constructed); + + // C2: Change Priority max + Change c2 = new Change("C2"); + c2.setField(Field.priority, TicketModel.Priority.Urgent); + constructed = service.updateTicket(getRepository(), ticket.number, c2); + assertNotNull(constructed); + assertEquals(2, constructed.changes.size()); + assertEquals(TicketModel.Priority.Urgent, constructed.priority); + assertEquals(TicketModel.Severity.Unrated, constructed.severity); + + // C3: Change Severity max + Change c3 = new Change("C3"); + c3.setField(Field.severity, TicketModel.Severity.Catastrophic); + constructed = service.updateTicket(getRepository(), ticket.number, c3); + assertNotNull(constructed); + assertEquals(3, constructed.changes.size()); + assertEquals(TicketModel.Priority.Urgent, constructed.priority); + assertEquals(TicketModel.Severity.Catastrophic, constructed.severity); + + // C4: Change Priority min + Change c4 = new Change("C3"); + c4.setField(Field.priority, TicketModel.Priority.Low); + constructed = service.updateTicket(getRepository(), ticket.number, c4); + assertNotNull(constructed); + assertEquals(4, constructed.changes.size()); + assertEquals(TicketModel.Priority.Low, constructed.priority); + assertEquals(TicketModel.Severity.Catastrophic, constructed.severity); + } + private Change newChange(String summary) { Change change = new Change("C1"); change.setField(Field.title, summary); -- cgit v1.2.3