Skip to content

Commit f3dcfe7

Browse files
CopilotbedaHovorka
andcommitted
Fix Detekt failures: remove unused imports and migrate to PhysicsConstants (#360)
* Initial plan * Fix Detekt issues: remove unused imports and update deprecated constants - Remove unused imports from test files (AnimationIntegrationTest, StatusBarTest, etc.) - Update deprecated constants to use domain.PhysicsConstants: * COMMON_MAX_SPEED in BaseContext.kt * MINIMAL_MAX_SPEED in AbstractPath.kt and SimpleTrack.kt * MIN_TRACK_LENGTH in SimpleTrack.kt - All Detekt checks now pass Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: bedaHovorka <5263405+bedaHovorka@users.noreply.github.com>
1 parent 2259440 commit f3dcfe7

12 files changed

Lines changed: 6 additions & 17 deletions

File tree

src/main/kotlin/cz/vutbr/fit/interlockSim/context/BaseContext.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
*/
1010
package cz.vutbr.fit.interlockSim.context
1111

12+
import cz.vutbr.fit.interlockSim.domain.COMMON_MAX_SPEED
1213
import cz.vutbr.fit.interlockSim.objects.cells.InOut
1314
import cz.vutbr.fit.interlockSim.objects.core.Cell
1415
import cz.vutbr.fit.interlockSim.objects.core.Cell.Segment
15-
import cz.vutbr.fit.interlockSim.objects.core.PathElement
1616
import cz.vutbr.fit.interlockSim.objects.core.StaticTrack
1717
import cz.vutbr.fit.interlockSim.objects.tracks.TrackBlock
1818
import cz.vutbr.fit.interlockSim.util.ExtendedUnorientedGraph
@@ -140,7 +140,7 @@ abstract class BaseContext<T : TrackBlock>(
140140
* Inherited from EditingContext interface.
141141
* Open to allow subclass override if needed.
142142
*/
143-
open var currentMaxSpeed: Double = cz.vutbr.fit.interlockSim.objects.core.PathElement.COMMON_MAX_SPEED
143+
open var currentMaxSpeed: Double = COMMON_MAX_SPEED
144144

145145
/**
146146
* Current track length for new track elements.

src/main/kotlin/cz/vutbr/fit/interlockSim/objects/paths/AbstractPath.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ package cz.vutbr.fit.interlockSim.objects.paths
1111

1212
import cz.vutbr.fit.interlockSim.context.SimulationContext
1313
import cz.vutbr.fit.interlockSim.context.SimulationContext.ReportType
14+
import cz.vutbr.fit.interlockSim.domain.MINIMAL_MAX_SPEED
1415
import cz.vutbr.fit.interlockSim.exceptions.PathSeparatorChangeException
1516
import cz.vutbr.fit.interlockSim.exceptions.TrackOperationException
1617
import cz.vutbr.fit.interlockSim.exceptions.requireSimulation
@@ -298,7 +299,7 @@ abstract class AbstractPath protected constructor(
298299
}
299300
}
300301
context.report("", this, ReportType.PATH_SETTING)
301-
requireSimulation(maxSpeed(sep) >= PathElement.MINIMAL_MAX_SPEED) {
302+
requireSimulation(maxSpeed(sep) >= MINIMAL_MAX_SPEED) {
302303
"Max speed must be at least MINIMAL_MAX_SPEED, got: ${maxSpeed(sep)}"
303304
}
304305
}

src/main/kotlin/cz/vutbr/fit/interlockSim/objects/tracks/SimpleTrack.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package cz.vutbr.fit.interlockSim.objects.tracks
1111

1212
import cz.vutbr.fit.interlockSim.domain.MINIMAL_MAX_SPEED
13+
import cz.vutbr.fit.interlockSim.domain.MIN_TRACK_LENGTH
1314
import cz.vutbr.fit.interlockSim.exceptions.requireSimulation
1415
import cz.vutbr.fit.interlockSim.objects.core.PathSeparator
1516
import cz.vutbr.fit.interlockSim.objects.core.StaticTrack
@@ -42,16 +43,13 @@ abstract class SimpleTrack(
4243
StaticTrack {
4344
companion object {
4445
private val logger = KotlinLogging.logger {}
45-
46-
// Track minimum length constant
47-
private const val MIN_LENGTH = StaticTrack.MIN_LENGTH
4846
}
4947

5048
private val speeds: IdentityHashMap<PathSeparator, Double> = IdentityHashMap()
5149
private val ends: Array<PathSeparator>
5250

5351
init {
54-
if (length < MIN_LENGTH || maxSpeed1 < MINIMAL_MAX_SPEED || maxSpeed2 < MINIMAL_MAX_SPEED) {
52+
if (length < MIN_TRACK_LENGTH || maxSpeed1 < MINIMAL_MAX_SPEED || maxSpeed2 < MINIMAL_MAX_SPEED) {
5553
throw IllegalArgumentException("length or maxspeed is very small")
5654
}
5755
ends = arrayOf(end1, end2)

src/test/kotlin/cz/vutbr/fit/interlockSim/context/BaseContextTest.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ package cz.vutbr.fit.interlockSim.context
1111

1212
import assertk.assertThat
1313
import assertk.assertions.isEqualTo
14-
import assertk.assertions.isGreaterThan
1514
import assertk.assertions.isInstanceOf
16-
import assertk.assertions.isNotNull
1715
import assertk.assertions.isSameInstanceAs
1816
import cz.vutbr.fit.interlockSim.objects.cells.InOut
1917
import cz.vutbr.fit.interlockSim.objects.core.Cell.SpatialType

src/test/kotlin/cz/vutbr/fit/interlockSim/context/SimulationProcessFactoryTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ package cz.vutbr.fit.interlockSim.context
1111

1212
import assertk.assertThat
1313
import assertk.assertions.isInstanceOf
14-
import assertk.assertions.isNotNull
1514
import cz.vutbr.fit.interlockSim.sim.DefaultSimulationProcessFactory
1615
import cz.vutbr.fit.interlockSim.sim.Generator
1716
import cz.vutbr.fit.interlockSim.sim.InOutWorker

src/test/kotlin/cz/vutbr/fit/interlockSim/context/navigation/PathReservationServiceTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import assertk.assertions.hasSize
1616
import assertk.assertions.isEmpty
1717
import assertk.assertions.isEqualTo
1818
import assertk.assertions.isFalse
19-
import assertk.assertions.isGreaterThan
2019
import assertk.assertions.isGreaterThanOrEqualTo
2120
import assertk.assertions.isInstanceOf
2221
import assertk.assertions.isLessThanOrEqualTo

src/test/kotlin/cz/vutbr/fit/interlockSim/di/KoinSingletonConsistencyTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package cz.vutbr.fit.interlockSim.di
1111

1212
import assertk.assertThat
13-
import assertk.assertions.isNotNull
1413
import assertk.assertions.isNotSameInstanceAs
1514
import assertk.assertions.isSameInstanceAs
1615
import cz.vutbr.fit.interlockSim.context.EditingContextFactory

src/test/kotlin/cz/vutbr/fit/interlockSim/di/NavigationModuleKoinTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import assertk.assertThat
1515
import assertk.assertions.isEmpty
1616
import assertk.assertions.isEqualTo
1717
import assertk.assertions.isInstanceOf
18-
import assertk.assertions.isNotNull
1918
import assertk.assertions.isNull
2019
import cz.vutbr.fit.interlockSim.context.navigation.PathReservationService
2120
import cz.vutbr.fit.interlockSim.context.navigation.TrainNavigationService

src/test/kotlin/cz/vutbr/fit/interlockSim/gui/MenuBarTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package cz.vutbr.fit.interlockSim.gui
1414
import assertk.assertThat
1515
import assertk.assertions.hasSize
1616
import assertk.assertions.isEqualTo
17-
import assertk.assertions.isNotNull
1817
import org.junit.jupiter.api.BeforeEach
1918
import org.junit.jupiter.api.DisplayName
2019
import org.junit.jupiter.api.Test

src/test/kotlin/cz/vutbr/fit/interlockSim/gui/StatusBarTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ package cz.vutbr.fit.interlockSim.gui
1414
import assertk.assertThat
1515
import assertk.assertions.contains
1616
import assertk.assertions.isEqualTo
17-
import assertk.assertions.isNotNull
1817
import cz.vutbr.fit.interlockSim.PROGRAM_NAME
1918
import cz.vutbr.fit.interlockSim.testutil.KoinTestBase
2019
import cz.vutbr.fit.interlockSim.testutil.testModuleFull

0 commit comments

Comments
 (0)