Version 1.1.1 - bug fixes

Author: koca2000

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cz.koca2000</groupId>
     <artifactId>NBS4j</artifactId>
-    <version>1.1</version>
+    <version>1.1.1</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/cz/koca2000/nbs4j/Song.java

@@ -341,11 +341,11 @@ public int getSongLength() {
      * @return tick number if there is any note or tempo change left; otherwise, -1
      */
     public int getNextNonEmptyTick(int fromTick){
-        NavigableSet<Integer> subset = nonEmptyTicks.tailSet(fromTick, false);
-        if (subset.size() == 0)
+        Integer tick = nonEmptyTicks.higher(fromTick);
+        if (tick == null)
             return -1;
 
-        return subset.first();
+        return tick;
     }
 
     /**
@@ -356,7 +356,7 @@ public int getNextNonEmptyTick(int fromTick){
     public float getTempo(int tick){
         if (tempoChanges.size() == 0)
             return 10;
-        return tempoChanges.floorKey(tick);
+        return tempoChanges.floorEntry(tick).getValue();
     }
 
     /**

src/test/java/cz/koca2000/nbs4j/test/SaveLoadTests.java

@@ -40,7 +40,8 @@ static void prepareSong(){
                         .setName("Custom Instrument 1")
                         .setFileName("file/name")
                         .setKey(10)
-                        .setShouldPressKey(true));
+                        .setShouldPressKey(true))
+                .setTempoChange(-1, 8.0f);
         originalSong.freezeSong();
     }
 
@@ -164,6 +165,14 @@ void customInstrumentPressKey(NBSVersion nbsVersion){
         }
     }
 
+    @ParameterizedTest
+    @EnumSource
+    void tempo(NBSVersion nbsVersion){
+        Song savedSong = saveAndLoad(originalSong, nbsVersion);
+
+        assertEquals(originalSong.getTempo(0), savedSong.getTempo(0));
+    }
+
     private static Song saveAndLoad(Song song, NBSVersion nbsVersion){
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         song.save(nbsVersion, outputStream);

src/test/java/cz/koca2000/nbs4j/test/SongTests.java

@@ -0,0 +1,29 @@
+package cz.koca2000.nbs4j.test;
+
+import cz.koca2000.nbs4j.Note;
+import cz.koca2000.nbs4j.Song;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SongTests {
+
+    @Test
+    void songTempo(){
+        Song song = new Song()
+                .setTempoChange(-1, 5);
+
+        assertEquals(5, song.getTempo(-1));
+        assertEquals(5, song.getTempo(0));
+    }
+
+    @Test
+    void songNextTick(){
+        Song song = new Song()
+                .setLayersCount(1)
+                .setNote(5, 0, new Note());
+
+        assertEquals(5, song.getNextNonEmptyTick(0));
+    }
+}