Do not adjust the end date right if it is at 0:00

Fixes issue #2659

Author: dbarashev

biz.ganttproject.impex.msproject2/src/main/java/biz/ganttproject/impex/msproject2/ProjectFileImporter.java

@@ -614,7 +614,16 @@ public Pair<TimeDuration, TimeDuration> apply(Task t) {
           if (t.getMilestone()) {
             return Pair.create(getTaskManager().createLength(1), null);
           }
-          return getDurations(t.getStart(), myNativeProject.getTimeUnitStack().getDefaultTimeUnit().adjustRight(t.getFinish()));
+          var defaultTimeUnit = myNativeProject.getTimeUnitStack().getDefaultTimeUnit();
+          var finishDate = t.getFinish();
+          // If the finish time is at the midnight between the finish date and the next day then
+          // this if condition will evaluate to false. Otherwise, e.g. when the finish date is at 20:00, we
+          // will adjust it to the right properly.
+          // Without this hack we would add one day to such tasks.
+          if (defaultTimeUnit.adjustLeft(finishDate).before(finishDate)) {
+            finishDate = defaultTimeUnit.adjustRight(finishDate);
+          }
+          return getDurations(t.getStart(), finishDate);
         }
       };
 

ganttproject-tester/test/biz/ganttproject/impex/msproject2/ProjectCalendarTest.kt

@@ -26,6 +26,7 @@ import net.sf.mpxj.ProjectFile
 import net.sourceforge.ganttproject.GanttProjectImpl
 import net.sourceforge.ganttproject.TestSetupHelper
 import net.sourceforge.ganttproject.importer.ImporterFromGanttFile
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import java.awt.Color
 import java.io.File
@@ -54,6 +55,7 @@ fun initLocale() {
  * Tests project calendar export and import.
  */
 class ProjectCalendarTest: TestCase() {
+  @BeforeEach
   override fun setUp() {
     super.setUp()
     initLocale()
@@ -137,5 +139,17 @@ class ProjectCalendarTest: TestCase() {
       .build().get(Calendar.WEEK_OF_YEAR))
   }
 
+  @Test
+  fun `issue 2659`() {
+    val project = GanttProjectImpl()
+    val columns = ImporterFromGanttFile.VisibleFieldsImpl()
+    val fileUrl = ProjectCalendarTest::class.java.getResource("/issue2659.xml")
+    assertNotNull(fileUrl)
+    val importer = ProjectFileImporter(project, columns, File(fileUrl.toURI()))
+    importer.setPatchMspdi(false)
+    importer.run()
+
+    assertEquals(1, project.taskManager.tasks[0].duration.length)
+  }
 }