Merge pull request #7 from paulorb/unittests

Fixed SQ issues

Author: paulorb

src/main/kotlin/EnvironmentVariables.kt

@@ -6,7 +6,7 @@ class EnvironmentVariables(
 {
 private var enviromentVars = mutableListOf<EnvParameter>()
 init {
-    var found = false
+    var found: Boolean
     configurationParser.getConfiguredDevice().parameters.parameters.forEach { jsonParameter ->
         found = false
         parameters.forEach { envParameter ->

src/main/kotlin/Main.kt

@@ -85,9 +85,6 @@ class Checksum : Callable<Int> {
             logger.info("environment parameters: ${environmentParameters.toString()}")
         }
 
-        //val fileContents = Files.readAllBytes(file.toPath())
-        //val digest = MessageDigest.getInstance(port).digest(fileContents)
-        //println(("%0" + digest.size * 2 + "x").format(BigInteger(1, digest)))
         if(simulationRandomValues) {
             modbusServer = ModbusServer(ModbusServerEventListenerReplyRandomNumbers())
         }else {

src/main/kotlin/PlcMemory.kt

@@ -1,5 +1,4 @@
 import org.slf4j.LoggerFactory
-import java.util.InvalidPropertiesFormatException
 import java.util.concurrent.ConcurrentHashMap
 
 

src/main/kotlin/PlcSimulation.kt

@@ -1,9 +1,9 @@
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import operations.*
 import org.slf4j.LoggerFactory
-import java.lang.Float
-import java.rmi.NotBoundException
-import java.util.*
 import java.util.concurrent.CancellationException
 
 class PlcSimulation(

src/main/kotlin/operations/AddOperation.kt

@@ -1,12 +1,12 @@
 package operations
 
-import Configuration
-import PlcMemory
 import Add
+import AddressType
+import Configuration
 import EnvironmentVariables
+import PlcMemory
 import org.slf4j.LoggerFactory
 import java.util.concurrent.CancellationException
-import toBooleanFromBinary
 
 class AddOperation(private val configuration: Configuration,private val memory: PlcMemory, environmentVariables: EnvironmentVariables
 ) : BaseOperation(environmentVariables, configuration) {

src/main/kotlin/operations/BaseOperation.kt

@@ -1,8 +1,6 @@
 package operations
 
 import Configuration
-import ConfigurationParser
-import EnvParameter
 import EnvironmentVariables
 import isNumeric
 import java.rmi.NotBoundException

src/main/kotlin/operations/DataUtils.kt

@@ -3,7 +3,9 @@ package operations
 import PlcMemory
 import Register
 import java.lang.Float
-import toBooleanFromBinary
+import kotlin.Int
+import kotlin.Pair
+import kotlin.Short
 
 fun setHoldingRegisterFloat32(floatValue: kotlin.Float, memory: PlcMemory, variable: Register) {
     val intValue = Float.floatToIntBits(floatValue)

src/main/kotlin/operations/SubOperation.kt

@@ -1,14 +1,13 @@
 package operations
 
 
+import AddressType
 import Configuration
 import EnvironmentVariables
-import IfEqual
 import PlcMemory
 import Sub
 import org.slf4j.LoggerFactory
 import java.util.concurrent.CancellationException
-import toBooleanFromBinary
 
 
 class SubOperation(private val configuration: Configuration,private val memory: PlcMemory, environmentVariables: EnvironmentVariables

src/test/kotlin/PlcMemoryTest.kt

@@ -48,4 +48,7 @@ class PlcMemoryTest {
         assertEquals(1, values.size)
         assertEquals( values[0], true)
     }
+
+
+
 }