Merge pull request #76 from fraenkelc/bugfix/Fix-edits-of-previous-days

Bugfix/fix edits of previous days

Author: Bytekeeper

src/main/antlr/org/stt/grammar/EnglishCommands.g4

@@ -27,7 +27,7 @@ agoFormat returns [int amount] :
 
 date: (NUMBER|DOT|MINUS|SLASH)+;
 
-dateTimeInternal: (NUMBER|DOT|MINUS|SLASH|COLON)+;
+dateTimeInternal: (NUMBER|DOT|MINUS|SLASH|COLON|COMMA)+;
 
 dateTime returns [String text]: txt=dateTimeInternal { $text = $txt.text; };
 
@@ -84,6 +84,7 @@ reportStart returns [LocalDate from_date, LocalDate to_date]:
 // WHEN ADDING TOKENS: ADD THEM to anyToken above!!
 // SYMBOLS
 COLON: ':';
+COMMA: ',';
 DOT: '.';
 MINUS: '-';
 SLASH: '/';

src/main/kotlin/org/stt/command/CommandModule.kt

@@ -39,7 +39,7 @@ class CommandModule {
     @Named("dateTimeFormatter")
     fun provideDateTimeFormatter(): DateTimeFormatter {
         return DateTimeFormatterBuilder()
-                .appendLocalized(FormatStyle.MEDIUM, FormatStyle.MEDIUM)
+                .appendLocalized(FormatStyle.SHORT, FormatStyle.MEDIUM)
                 .toFormatter()
     }
 

src/test/kotlin/org/stt/command/CommandFormatterTest.kt

@@ -29,7 +29,6 @@ import java.time.temporal.ChronoField
 import java.time.temporal.ChronoUnit
 import java.util.*
 import javax.inject.Provider
-import kotlin.streams.toList
 
 @RunWith(Theories::class)
 class CommandFormatterTest {
@@ -359,6 +358,43 @@ class CommandFormatterTest {
         assertThat(timeTrackingItems[1]!!.start.toLocalDate()).isEqualTo(LocalDate.of(2014, 6, 22))
     }
 
+    @Theory
+    fun `text from asNewItemCommandText can be parsed and is equal in locale`(locale: Locale) {
+        // GIVEN
+
+        val start = LocalDateTime.of(2024, 1, 22, 12, 0, 0)
+        val stop = LocalDateTime.of(2024, 1, 22, 20, 0, 0)
+        val activity = "test activity"
+
+        // WHEN
+        val actual = executeWithLocale(locale) {
+            val module = CommandModule()
+            val sut = CommandFormatter(
+                module.provideCommandTextParser(), module.provideDateTimeFormatter(), module.provideTimeFormatter()
+            )
+            val commandText = sut.asNewItemCommandText(TimeTrackingItem(activity, start, stop))
+            sut.parse(commandText)
+        }
+
+        // THEN
+        assertThat(actual).isInstanceOf(NewActivity::class.java)
+        val item = (actual as NewActivity).newItem
+        assertThat(item.start).isEqualTo(start)
+        assertThat(item.end).isEqualTo(stop)
+        assertThat(item.activity).isEqualTo(activity)
+
+    }
+
+    private fun <T> executeWithLocale(locale: Locale, action: () -> T): T {
+        val defaultLocale = Locale.getDefault()
+        try {
+            Locale.setDefault(locale)
+            return action()
+        } finally {
+            Locale.setDefault(defaultLocale)
+        }
+    }
+
     private fun executeCommand(command: String): Optional<TimeTrackingItem> {
         val cmdToExec = sut.parse(command)
         val testCommandHandler = TestCommandHandler()
@@ -435,6 +471,15 @@ class CommandFormatterTest {
         @field:DataPoints
         var hourFormats = arrayOf(hours("test %sh ago"), hours("test %shr ago"), hours("test %s hrs ago"), hours("test\n%shour ago"), hours("test %s hours ago"), hours("left 3 hours ago %s hours ago"))
 
+        @JvmField
+        @field:DataPoints
+        var locales = arrayOf(
+            Locale.UK,
+            // currently not supported due to 12-hour date format with "PM" suffix
+            // Locale.US,
+            Locale.GERMAN
+        )
+
         fun min(command: String): Command {
             return Command(command, "mins")
         }

src/test/kotlin/org/stt/connector/jira/JiraClientTest.kt

@@ -1,5 +1,6 @@
 package org.stt.connector.jira
 
+import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.junit.Test
 import org.stt.config.JiraConfig
 
@@ -10,10 +11,9 @@ internal class JiraClientTest {
   fun testErrorHandlingOfIssueRequest() {
     val jiraConfig = JiraConfig()
     jiraConfig.jiraURI = "https://jira.atlassian.net"
-    try {
+    assertThatThrownBy {
       JiraClient("dummy", null, jiraConfig.jiraURI!!).getIssue("JRA-7")
-    } catch (e: Exception) {
-      assert(e.message.equals("Couldn't find issue JRA-7. Cause: {\"errorMessage\": \"Site temporarily unavailable\"}"))
-    }
+    }.isInstanceOf(IssueDoesNotExistException::class.java)
+      .hasMessageContainingAll("Couldn't find issue JRA-7", "\"errorMessage\": \"Site temporarily unavailable\"")
   }
 }