Skip to content

Commit

Permalink
Lint: Organize imports (#3684)
Browse files Browse the repository at this point in the history
  • Loading branch information
@FloEdelmann
FloEdelmann authored Jan 27, 2022
1 parent b6de6c7 commit 9c6d3e2
Show file tree
Hide file tree
Showing 469 changed files with 2,418 additions and 975 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import java.util.Properties
import java.io.FileInputStream
import java.io.FileWriter
import java.util.Properties

plugins {
id("com.android.application")
Expand Down
10 changes: 5 additions & 5 deletions ...roidTest/java/de/westnordost/streetcomplete/data/download/tiles/DownloadedTilesDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package de.westnordost.streetcomplete.data.download.tiles

import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.util.TilePos
import de.westnordost.streetcomplete.util.TilesRect

import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

class DownloadedTilesDaoTest : ApplicationDbTestCase() {
private lateinit var dao: DownloadedTilesDao
Expand Down
3 changes: 2 additions & 1 deletion ...st/java/de/westnordost/streetcomplete/data/osm/created_elements/CreatedElementsDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ package de.westnordost.streetcomplete.data.osm.created_elements
import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.ElementKey
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
19 changes: 16 additions & 3 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,29 @@ import de.westnordost.streetcomplete.data.osm.edits.delete.RevertDeletePoiNodeAc
import de.westnordost.streetcomplete.data.osm.edits.split_way.SplitAtLinePosition
import de.westnordost.streetcomplete.data.osm.edits.split_way.SplitAtPoint
import de.westnordost.streetcomplete.data.osm.edits.split_way.SplitWayAction
import de.westnordost.streetcomplete.data.osm.edits.update_tags.*
import de.westnordost.streetcomplete.data.osm.edits.update_tags.RevertUpdateElementTagsAction
import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapChanges
import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryAdd
import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryDelete
import de.westnordost.streetcomplete.data.osm.edits.update_tags.StringMapEntryModify
import de.westnordost.streetcomplete.data.osm.edits.update_tags.UpdateElementTagsAction
import de.westnordost.streetcomplete.data.osm.geometry.ElementGeometry
import de.westnordost.streetcomplete.data.osm.geometry.ElementPointGeometry
import de.westnordost.streetcomplete.data.osm.geometry.ElementPolylinesGeometry
import de.westnordost.streetcomplete.data.osm.mapdata.*
import de.westnordost.streetcomplete.data.osm.mapdata.Element
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import de.westnordost.streetcomplete.data.osm.mapdata.Node
import de.westnordost.streetcomplete.data.osm.mapdata.Way
import de.westnordost.streetcomplete.data.osm.osmquests.TestQuestType
import de.westnordost.streetcomplete.data.osm.osmquests.TestQuestType2
import de.westnordost.streetcomplete.data.quest.QuestType
import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
4 changes: 3 additions & 1 deletion ...androidTest/java/de/westnordost/streetcomplete/data/osm/edits/ElementIdProviderDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package de.westnordost.streetcomplete.data.osm.edits

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.Before
import org.junit.Test

Expand Down
9 changes: 5 additions & 4 deletions ...a/de/westnordost/streetcomplete/data/osm/edits/upload/changesets/OpenChangesetsDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package de.westnordost.streetcomplete.data.osm.edits.upload.changesets

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase

import org.junit.Assert.*

class OpenChangesetsDaoTest : ApplicationDbTestCase() {
private lateinit var dao: OpenChangesetsDao

Expand Down
16 changes: 10 additions & 6 deletions ...ndroidTest/java/de/westnordost/streetcomplete/data/osm/geometry/ElementGeometryDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
package de.westnordost.streetcomplete.data.osm.geometry

import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.*
import de.westnordost.streetcomplete.data.osm.mapdata.BoundingBox
import de.westnordost.streetcomplete.data.osm.mapdata.ElementKey
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder

import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

class ElementGeometryDaoTest : ApplicationDbTestCase() {
private lateinit var dao: ElementGeometryDao
Expand Down
11 changes: 7 additions & 4 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/mapdata/NodeDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package de.westnordost.streetcomplete.data.osm.mapdata

import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import java.lang.System.currentTimeMillis

class NodeDaoTest : ApplicationDbTestCase() {
Expand Down
14 changes: 10 additions & 4 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/mapdata/RelationDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
package de.westnordost.streetcomplete.data.osm.mapdata

import org.junit.Before
import org.junit.Test
import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.NODE
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.RELATION
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.WAY
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import org.junit.Assert.*
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

class RelationDaoTest : ApplicationDbTestCase() {
private lateinit var dao: RelationDao
Expand Down
11 changes: 7 additions & 4 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/mapdata/WayDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package de.westnordost.streetcomplete.data.osm.mapdata

import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

class WayDaoTest : ApplicationDbTestCase() {
private lateinit var dao: WayDao
Expand Down
5 changes: 4 additions & 1 deletion app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmQuestDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ import de.westnordost.streetcomplete.data.osm.mapdata.ElementKey
import de.westnordost.streetcomplete.data.osm.mapdata.ElementType
import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
4 changes: 3 additions & 1 deletion ...droidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/OsmQuestsHiddenDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import de.westnordost.streetcomplete.data.quest.OsmQuestKey
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
3 changes: 1 addition & 2 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/osmquests/TestQuestType.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package de.westnordost.streetcomplete.data.osm.osmquests

import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry
import de.westnordost.streetcomplete.data.osm.osmquests.Tags
import de.westnordost.streetcomplete.data.osm.mapdata.Element
import de.westnordost.streetcomplete.data.osm.mapdata.MapDataWithGeometry
import de.westnordost.streetcomplete.data.user.achievements.QuestTypeAchievement
import de.westnordost.streetcomplete.quests.AbstractQuestAnswerFragment

Expand Down
12 changes: 7 additions & 5 deletions app/src/androidTest/java/de/westnordost/streetcomplete/data/osmnotes/NoteDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package de.westnordost.streetcomplete.data.osmnotes

import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.BoundingBox
import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import de.westnordost.streetcomplete.data.user.User
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder

import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

class NoteDaoTest : ApplicationDbTestCase() {
private lateinit var dao: NoteDao
Expand Down
6 changes: 5 additions & 1 deletion ...rc/androidTest/java/de/westnordost/streetcomplete/data/osmnotes/edits/NoteEditsDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ package de.westnordost.streetcomplete.data.osmnotes.edits
import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.BoundingBox
import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNotNull
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
4 changes: 3 additions & 1 deletion ...st/java/de/westnordost/streetcomplete/data/osmnotes/notequests/NoteQuestsHiddenDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.ktx.containsExactlyInAnyOrder
import kotlinx.coroutines.delay
import kotlinx.coroutines.runBlocking
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
2 changes: 1 addition & 1 deletion ...Test/java/de/westnordost/streetcomplete/data/user/achievements/UserAchievementsDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.westnordost.streetcomplete.data.user.achievements

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test

Expand Down
2 changes: 1 addition & 1 deletion ...androidTest/java/de/westnordost/streetcomplete/data/user/achievements/UserLinksDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.westnordost.streetcomplete.data.user.achievements

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test

Expand Down
2 changes: 1 addition & 1 deletion ...dTest/java/de/westnordost/streetcomplete/data/user/statistics/CountryStatisticsDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package de.westnordost.streetcomplete.data.user.statistics

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test

Expand Down
6 changes: 2 additions & 4 deletions ...est/java/de/westnordost/streetcomplete/data/user/statistics/QuestTypeStatisticsDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package de.westnordost.streetcomplete.data.user.statistics

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.assertEquals
import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase

import org.junit.Assert.*

class QuestTypeStatisticsDaoTest : ApplicationDbTestCase() {
private lateinit var daoType: QuestTypeStatisticsDao

Expand Down
4 changes: 3 additions & 1 deletion ...c/androidTest/java/de/westnordost/streetcomplete/data/visiblequests/QuestPresetDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package de.westnordost.streetcomplete.data.visiblequests

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
3 changes: 2 additions & 1 deletion ...ndroidTest/java/de/westnordost/streetcomplete/data/visiblequests/QuestTypeOrderDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package de.westnordost.streetcomplete.data.visiblequests

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
7 changes: 3 additions & 4 deletions ...roidTest/java/de/westnordost/streetcomplete/data/visiblequests/VisibleQuestTypeDaoTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package de.westnordost.streetcomplete.data.visiblequests

import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

import de.westnordost.streetcomplete.data.ApplicationDbTestCase

import org.junit.Assert.*

class VisibleQuestTypeDaoTest : ApplicationDbTestCase() {
private lateinit var dao: VisibleQuestTypeDao

Expand Down
3 changes: 1 addition & 2 deletions ...t/java/de/westnordost/streetcomplete/quests/oneway_suspects/TrafficFlowSegmentsApiTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ import de.westnordost.streetcomplete.data.osm.mapdata.LatLon
import de.westnordost.streetcomplete.quests.oneway_suspects.data.TrafficFlowSegment
import de.westnordost.streetcomplete.quests.oneway_suspects.data.TrafficFlowSegmentsApi
import de.westnordost.streetcomplete.quests.oneway_suspects.data.TrafficFlowSegmentsModule.ONEWAY_API_URL

import org.assertj.core.api.Assertions.*
import org.assertj.core.api.Assertions.assertThat
import org.junit.Assert.assertTrue
import org.junit.Test

Expand Down
4 changes: 3 additions & 1 deletion ...idTest/java/de/westnordost/streetcomplete/quests/oneway_suspects/WayTrafficFlowDaoTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import de.westnordost.streetcomplete.data.ApplicationDbTestCase
import de.westnordost.streetcomplete.data.osm.mapdata.Way
import de.westnordost.streetcomplete.data.osm.mapdata.WayDao
import de.westnordost.streetcomplete.quests.oneway_suspects.data.WayTrafficFlowDao
import org.junit.Assert.*
import org.junit.Assert.assertFalse
import org.junit.Assert.assertNull
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test

Expand Down
Loading

0 comments on commit 9c6d3e2

Please sign in to comment.