tests fix

build.gradle

@@ -9,7 +9,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+    id 'org.jetbrains.kotlin.jvm' version '1.3.61'
     id 'com.bmuschko.nexus' version "2.3.1"
     id 'io.codearte.nexus-staging' version '0.11.0'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Mar 03 15:49:41 CET 2019
+#Wed Jan 22 00:14:14 CET 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/test/kotlin/MergeTest.kt

@@ -154,7 +154,9 @@ class MergeTest {
             properties = container.properties!!.copy(
                 dateLocal = actual.container.properties?.dateLocal,
                 dateUtc = actual.container.properties?.dateUtc,
-                segmentUid = actual.container.properties?.segmentUid
+                segmentUid = actual.container.properties?.segmentUid,
+                muxingApplication = actual.container.properties?.muxingApplication,
+                writingApplication = actual.container.properties?.writingApplication
             )
         )
     )

src/test/kotlin/TestUtils.kt

@@ -10,6 +10,7 @@ import kotlin.test.assertTrue
 
 /** The test file used to do the testing */
 internal val TEST_FILE = File("src/test/resources/test.mkv")
+
 /** The expected identification information given by the test file */
 internal val EXPECTED_IDENTIFICATION by lazy {
     MkvToolnixFileIdentification(
@@ -45,7 +46,7 @@ internal val EXPECTED_IDENTIFICATION by lazy {
         fileName = TEST_FILE.absoluteFile,
         tracks = listOf(
             MkvToolnixTrack(
-                codec = "MPEG-H/HEVC/h.265",
+                codec = "MPEG-H/HEVC/H.265",
                 id = 0,
                 type = MkvToolnixTrackType.video,
                 properties = MkvToolnixTrack.Properties(
@@ -183,4 +184,5 @@ internal fun <R> createDummyAttachment(f: (File) -> R): R {
         it.writeText("hello")
         f(it)
     }
-}
+}
+