add second test

klesarev · Feb 15, 2021 · e6c254b · e6c254b
1 parent 7cce0aa
commit e6c254b
Show file tree

Hide file tree

Showing 77 changed files with 53 additions and 20 deletions.
diff --git a/.gradle/6.7/executionHistory/executionHistory.bin b/.gradle/6.7/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7/executionHistory/executionHistory.lock b/.gradle/6.7/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7/fileHashes/fileHashes.bin b/.gradle/6.7/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7/fileHashes/fileHashes.lock b/.gradle/6.7/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/build.gradle b/build.gradle
@@ -30,4 +30,5 @@ dependencies {
     implementation 'org.apache.poi:poi:5.0.0'
     implementation 'org.apache.poi:poi-ooxml:5.0.0'
     implementation 'junit:junit:4.12'
+    implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
 }
diff --git a/build/classes/kotlin/main/ApplicationKt$$$main.class b/build/classes/kotlin/main/ApplicationKt$$$main.class
diff --git a/build/classes/kotlin/main/ApplicationKt.class b/build/classes/kotlin/main/ApplicationKt.class
diff --git a/build/classes/kotlin/main/DrawerKt$toRGBA$1.class b/build/classes/kotlin/main/DrawerKt$toRGBA$1.class
diff --git a/build/classes/kotlin/main/DrawerKt$writeImage$imgthread$1.class b/build/classes/kotlin/main/DrawerKt$writeImage$imgthread$1.class
diff --git a/build/classes/kotlin/main/DrawerKt.class b/build/classes/kotlin/main/DrawerKt.class
diff --git a/build/classes/kotlin/test/ImageTest$testExceptionFile$1$1.class b/build/classes/kotlin/test/ImageTest$testExceptionFile$1$1.class
diff --git a/build/classes/kotlin/test/ImageTest$testExceptionFile$1.class b/build/classes/kotlin/test/ImageTest$testExceptionFile$1.class
diff --git a/build/classes/kotlin/test/ImageTest.class b/build/classes/kotlin/test/ImageTest.class
diff --git a/build/kotlin/compileKotlin/build-history.bin b/build/kotlin/compileKotlin/build-history.bin
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/package-parts.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/counters.tab
@@ -1,2 +1,2 @@
-5
-1
+9
+5
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/file-to-id.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/id-to-file.tab_i
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileKotlin/last-build.bin b/build/kotlin/compileKotlin/last-build.bin
diff --git a/build/kotlin/compileTestKotlin/build-history.bin b/build/kotlin/compileTestKotlin/build-history.bin
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/inputs/source-to-output.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream
diff --git a/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len b/.../kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/proto.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.keystream.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.len
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab.values.at
diff --git a/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i b/build/kotlin/compileTestKotlin/caches-jvm/lookups/lookups.tab_i
diff --git a/build/kotlin/compileTestKotlin/last-build.bin b/build/kotlin/compileTestKotlin/last-build.bin
diff --git a/build/reports/tests/test/classes/ImageTest.html b/build/reports/tests/test/classes/ImageTest.html
@@ -23,7 +23,7 @@ <h1>Class ImageTest</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">1</div>
+<div class="counter">2</div>
 <p>tests</p>
 </div>
 </td>
@@ -41,7 +41,7 @@ <h1>Class ImageTest</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.014s</div>
+<div class="counter">0.104s</div>
 <p>duration</p>
 </div>
 </td>
@@ -75,6 +75,11 @@ <h2>Tests</h2>
 </tr>
 </thead>
 <tr>
+<td class="success">testExceptionFile</td>
+<td class="success">0.090s</td>
+<td class="success">passed</td>
+</tr>
+<tr>
 <td class="success">testHexToRgba</td>
 <td class="success">0.014s</td>
 <td class="success">passed</td>
@@ -89,7 +94,7 @@ <h2>Tests</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 6.7</a> at 15 февр. 2021 г., 23:39:44</p>
+<a href="http://www.gradle.org">Gradle 6.7</a> at 16 февр. 2021 г., 00:15:54</p>
 </div>
 </div>
 </body>

diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html
@@ -20,7 +20,7 @@ <h1>Test Summary</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">1</div>
+<div class="counter">2</div>
 <p>tests</p>
 </div>
 </td>
@@ -38,7 +38,7 @@ <h1>Test Summary</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.014s</div>
+<div class="counter">0.104s</div>
 <p>duration</p>
 </div>
 </td>
@@ -82,10 +82,10 @@ <h2>Packages</h2>
 <td class="success">
 <a href="packages/default-package.html">default-package</a>
 </td>
-<td>1</td>
+<td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.014s</td>
+<td>0.104s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -109,10 +109,10 @@ <h2>Classes</h2>
 <td class="success">
 <a href="classes/ImageTest.html">ImageTest</a>
 </td>
-<td>1</td>
+<td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.014s</td>
+<td>0.104s</td>
 <td class="success">100%</td>
 </tr>
 </tbody>
@@ -126,7 +126,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 6.7</a> at 15 февр. 2021 г., 23:39:44</p>
+<a href="http://www.gradle.org">Gradle 6.7</a> at 16 февр. 2021 г., 00:15:54</p>
 </div>
 </div>
 </body>

diff --git a/build/reports/tests/test/packages/default-package.html b/build/reports/tests/test/packages/default-package.html
@@ -22,7 +22,7 @@ <h1>Default package</h1>
 <tr>
 <td>
 <div class="infoBox" id="tests">
-<div class="counter">1</div>
+<div class="counter">2</div>
 <p>tests</p>
 </div>
 </td>
@@ -40,7 +40,7 @@ <h1>Default package</h1>
 </td>
 <td>
 <div class="infoBox" id="duration">
-<div class="counter">0.014s</div>
+<div class="counter">0.104s</div>
 <p>duration</p>
 </div>
 </td>
@@ -80,10 +80,10 @@ <h2>Classes</h2>
 <td class="success">
 <a href="../classes/ImageTest.html">ImageTest</a>
 </td>
-<td>1</td>
+<td>2</td>
 <td>0</td>
 <td>0</td>
-<td>0.014s</td>
+<td>0.104s</td>
 <td class="success">100%</td>
 </tr>
 </table>
@@ -96,7 +96,7 @@ <h2>Classes</h2>
 <input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
 </label>
 </div>Generated by 
-<a href="http://www.gradle.org">Gradle 6.7</a> at 15 февр. 2021 г., 23:39:44</p>
+<a href="http://www.gradle.org">Gradle 6.7</a> at 16 февр. 2021 г., 00:15:54</p>
 </div>
 </div>
 </body>

diff --git a/build/test-results/test/TEST-ImageTest.xml b/build/test-results/test/TEST-ImageTest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="ImageTest" tests="1" skipped="0" failures="0" errors="0" timestamp="2021-02-15T20:39:44" hostname="DESKTOP-UE975S3" time="0.014">
+<testsuite name="ImageTest" tests="2" skipped="0" failures="0" errors="0" timestamp="2021-02-15T21:15:54" hostname="DESKTOP-UE975S3" time="0.104">
   <properties/>
+  <testcase name="testExceptionFile" classname="ImageTest" time="0.09"/>
   <testcase name="testHexToRgba" classname="ImageTest" time="0.014"/>
   <system-out><![CDATA[]]></system-out>
   <system-err><![CDATA[]]></system-err>

diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin
diff --git a/src/main/kotlin/Application.kt b/src/main/kotlin/Application.kt
@@ -7,7 +7,7 @@ import java.awt.image.BufferedImage.TYPE_INT_RGB
 * Created by MrFox
 */
 
-fun main() {
+suspend fun main() {
 
 
     // получаем массив из xlsx файла - лист "editor"

diff --git a/src/main/kotlin/Drawer.kt b/src/main/kotlin/Drawer.kt
@@ -6,6 +6,7 @@ import java.awt.Color
 import java.awt.image.BufferedImage
 import java.io.File
 import java.io.FileInputStream
+import java.io.FileNotFoundException
 import java.lang.Exception
 import java.util.ArrayList
 import javax.imageio.ImageIO
@@ -96,8 +97,8 @@ fun writeImage(img: BufferedImage, file: String) {
     try {
         imgthread.start()
     } catch (ex: Exception) {
-        ex.printStackTrace()
         imgthread.interrupt()
+        throw FileNotFoundException(ex.message)
     }
 }
 

diff --git a/src/test/kotlin/ImageTest.kt b/src/test/kotlin/ImageTest.kt
@@ -1,14 +1,39 @@
+import kotlinx.coroutines.runBlocking
 import org.junit.Assert
 import org.junit.Test
 import java.awt.Color
+import java.awt.image.BufferedImage
+import java.awt.image.BufferedImage.TYPE_INT_ARGB
+import java.io.FileNotFoundException
+import org.junit.jupiter.api.Assertions.assertAll
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Assertions.assertTimeout
+import org.junit.jupiter.api.Assertions.assertTimeoutPreemptively
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.assertThrows
+import java.awt.image.BufferedImage.TYPE_INT_RGB
+import java.io.File
+import javax.imageio.ImageIO
 
 
 class ImageTest {
 
+
     @Test
     fun testHexToRgba() {
         Assert.assertEquals("HextoRGBA", Color(204,18,223), toRGBA("FFCC12DF"))
         Assert.assertEquals("HextoRGBA", Color(16,201,38), toRGBA("FF10C926"))
     }
 
+    @Test
+    fun testExceptionFile() {
+        assertThrows(Exception::class.java) {
+           runBlocking {
+               FileDataHelper().getContentAsync("D:/bubub.txt")
+           }
+        }
+    }
+
 }