Skip to content

Commit e14aeb2

Browse files
romtsnromtsn
committed
Spotless
1 parent cb7ee71 commit e14aeb2

File tree

2 files changed

+174
-175
lines changed

2 files changed

+174
-175
lines changed

‎sentry/src/test/java/io/sentry/protocol/DeviceSerializationTest.kt‎

Lines changed: 81 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -6,99 +6,100 @@ import io.sentry.ILogger
66
import io.sentry.JsonObjectReader
77
import io.sentry.JsonObjectWriter
88
import io.sentry.JsonSerializable
9-
import org.junit.Test
10-
import org.mockito.kotlin.mock
119
import java.io.StringReader
1210
import java.io.StringWriter
1311
import java.util.TimeZone
1412
import kotlin.test.assertEquals
13+
import org.junit.Test
14+
import org.mockito.kotlin.mock
1515

1616
class DeviceSerializationTest {
1717

18-
class Fixture {
19-
val logger = mock<ILogger>()
18+
class Fixture {
19+
val logger = mock<ILogger>()
20+
21+
fun getSut() =
22+
Device().apply {
23+
name = "83f1de77-fdb0-470e-8249-8f5c5d894ec4"
24+
manufacturer = "e21b2405-e378-4a0b-ad2c-4822d97cd38c"
25+
brand = "1abbd13e-d1ca-4d81-bd1b-24aa2c339cf9"
26+
family = "67a4b8ea-6c38-4c33-8579-7697f538685c"
27+
model = "d6ca2f35-bcc5-4dd3-ad64-7c3b585e02fd"
28+
modelId = "d3f133bd-b0a2-4aa4-9eed-875eba93652e"
29+
archs =
30+
arrayOf(
31+
"856e5da3-774c-4663-a830-d19f0b7dbb5b",
32+
"b345bd5a-90a5-4301-a5a2-6c102d7589b6",
33+
"fd7ed64e-a591-49e0-8dc1-578234356d23",
34+
"8cec4101-0305-480b-91ee-f3c007f668c3",
35+
"22583b9b-195e-49bf-bfe8-825ae3a346f2",
36+
"8675b7aa-5b94-42d0-bc14-72ea1bb7112e",
37+
)
38+
batteryLevel = 0.45770407f
39+
isCharging = false
40+
isOnline = true
41+
orientation = Device.DeviceOrientation.PORTRAIT
42+
isSimulator = true
43+
memorySize = -6712323365568152393
44+
freeMemory = -953384122080236886
45+
usableMemory = -8999512249221323968
46+
isLowMemory = false
47+
storageSize = -3227905175393990709
48+
freeStorage = -3749039933924297357
49+
externalStorageSize = -7739608324159255302
50+
externalFreeStorage = -1562576688560812557
51+
screenWidthPixels = 1101873181
52+
screenHeightPixels = 1902392170
53+
screenDensity = 0.9829039f
54+
screenDpi = -2092079070
55+
bootTime = DateUtils.getDateTime("2004-11-04T08:38:00.000Z")
56+
timezone = TimeZone.getTimeZone("Europe/Vienna")
57+
id = "e0fa5c8d-83f5-4e70-bc60-1e82ad30e196"
58+
connectionType = "9ceb3a6c-5292-4ed9-8665-5732495e8ed4"
59+
batteryTemperature = 0.14775127f
60+
cpuDescription = "cpu0"
61+
chipset = "unisoc"
62+
processorCount = 4
63+
processorFrequency = 800.0
64+
}
65+
}
2066

21-
fun getSut() = Device().apply {
22-
name = "83f1de77-fdb0-470e-8249-8f5c5d894ec4"
23-
manufacturer = "e21b2405-e378-4a0b-ad2c-4822d97cd38c"
24-
brand = "1abbd13e-d1ca-4d81-bd1b-24aa2c339cf9"
25-
family = "67a4b8ea-6c38-4c33-8579-7697f538685c"
26-
model = "d6ca2f35-bcc5-4dd3-ad64-7c3b585e02fd"
27-
modelId = "d3f133bd-b0a2-4aa4-9eed-875eba93652e"
28-
archs = arrayOf(
29-
"856e5da3-774c-4663-a830-d19f0b7dbb5b",
30-
"b345bd5a-90a5-4301-a5a2-6c102d7589b6",
31-
"fd7ed64e-a591-49e0-8dc1-578234356d23",
32-
"8cec4101-0305-480b-91ee-f3c007f668c3",
33-
"22583b9b-195e-49bf-bfe8-825ae3a346f2",
34-
"8675b7aa-5b94-42d0-bc14-72ea1bb7112e"
35-
)
36-
batteryLevel = 0.45770407f
37-
isCharging = false
38-
isOnline = true
39-
orientation = Device.DeviceOrientation.PORTRAIT
40-
isSimulator = true
41-
memorySize = -6712323365568152393
42-
freeMemory = -953384122080236886
43-
usableMemory = -8999512249221323968
44-
isLowMemory = false
45-
storageSize = -3227905175393990709
46-
freeStorage = -3749039933924297357
47-
externalStorageSize = -7739608324159255302
48-
externalFreeStorage = -1562576688560812557
49-
screenWidthPixels = 1101873181
50-
screenHeightPixels = 1902392170
51-
screenDensity = 0.9829039f
52-
screenDpi = -2092079070
53-
bootTime = DateUtils.getDateTime("2004-11-04T08:38:00.000Z")
54-
timezone = TimeZone.getTimeZone("Europe/Vienna")
55-
id = "e0fa5c8d-83f5-4e70-bc60-1e82ad30e196"
56-
connectionType = "9ceb3a6c-5292-4ed9-8665-5732495e8ed4"
57-
batteryTemperature = 0.14775127f
58-
cpuDescription = "cpu0"
59-
chipset = "unisoc"
60-
processorCount = 4
61-
processorFrequency = 800.0
62-
}
63-
}
64-
private val fixture = Fixture()
67+
private val fixture = Fixture()
6568

66-
@Test
67-
fun serialize() {
68-
val expected = sanitizedFile("json/device.json")
69-
val actual = serializeToString(fixture.getSut())
70-
assertEquals(expected, actual)
71-
}
69+
@Test
70+
fun serialize() {
71+
val expected = sanitizedFile("json/device.json")
72+
val actual = serializeToString(fixture.getSut())
73+
assertEquals(expected, actual)
74+
}
7275

73-
@Test
74-
fun deserialize() {
75-
val expectedJson = sanitizedFile("json/device.json")
76-
val actual = deserialize(expectedJson)
77-
val actualJson = serializeToString(actual)
78-
assertEquals(expectedJson, actualJson)
79-
}
76+
@Test
77+
fun deserialize() {
78+
val expectedJson = sanitizedFile("json/device.json")
79+
val actual = deserialize(expectedJson)
80+
val actualJson = serializeToString(actual)
81+
assertEquals(expectedJson, actualJson)
82+
}
8083

81-
// Helper
84+
// Helper
8285

83-
private fun sanitizedFile(path: String): String {
84-
return FileFromResources.invoke(path)
85-
.replace(Regex("[\n\r]"), "")
86-
.replace(" ", "")
87-
}
86+
private fun sanitizedFile(path: String): String {
87+
return FileFromResources.invoke(path).replace(Regex("[\n\r]"), "").replace(" ", "")
88+
}
8889

89-
private fun serializeToString(jsonSerializable: JsonSerializable): String {
90-
return this.serializeToString { wrt -> jsonSerializable.serialize(wrt, fixture.logger) }
91-
}
90+
private fun serializeToString(jsonSerializable: JsonSerializable): String {
91+
return this.serializeToString { wrt -> jsonSerializable.serialize(wrt, fixture.logger) }
92+
}
9293

93-
private fun serializeToString(serialize: (JsonObjectWriter) -> Unit): String {
94-
val wrt = StringWriter()
95-
val jsonWrt = JsonObjectWriter(wrt, 100)
96-
serialize(jsonWrt)
97-
return wrt.toString()
98-
}
94+
private fun serializeToString(serialize: (JsonObjectWriter) -> Unit): String {
95+
val wrt = StringWriter()
96+
val jsonWrt = JsonObjectWriter(wrt, 100)
97+
serialize(jsonWrt)
98+
return wrt.toString()
99+
}
99100

100-
private fun deserialize(json: String): Device {
101-
val reader = JsonObjectReader(StringReader(json))
102-
return Device.Deserializer().deserialize(reader, fixture.logger)
103-
}
101+
private fun deserialize(json: String): Device {
102+
val reader = JsonObjectReader(StringReader(json))
103+
return Device.Deserializer().deserialize(reader, fixture.logger)
104+
}
104105
}

‎sentry/src/test/java/io/sentry/protocol/DeviceTest.kt‎

Lines changed: 93 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -9,105 +9,103 @@ import kotlin.test.assertNotSame
99

1010
class DeviceTest {
1111

12-
@Test
13-
fun `copying device wont have the same references`() {
14-
val device = Device()
15-
device.archs = arrayOf("archs1", "archs2")
16-
device.bootTime = Date()
17-
device.timezone = TimeZone.getDefault()
18-
val unknown = mapOf(Pair("unknown", "unknown"))
19-
device.setUnknown(unknown)
12+
@Test
13+
fun `copying device wont have the same references`() {
14+
val device = Device()
15+
device.archs = arrayOf("archs1", "archs2")
16+
device.bootTime = Date()
17+
device.timezone = TimeZone.getDefault()
18+
val unknown = mapOf(Pair("unknown", "unknown"))
19+
device.setUnknown(unknown)
2020

21-
val clone = Device(device)
21+
val clone = Device(device)
2222

23-
assertNotNull(clone)
24-
assertNotSame(device, clone)
25-
assertNotSame(device.archs, clone.archs)
26-
assertNotSame(device.bootTime, clone.bootTime)
27-
assertNotSame(device.timezone, clone.timezone)
28-
assertNotSame(device.unknown, clone.unknown)
29-
}
23+
assertNotNull(clone)
24+
assertNotSame(device, clone)
25+
assertNotSame(device.archs, clone.archs)
26+
assertNotSame(device.bootTime, clone.bootTime)
27+
assertNotSame(device.timezone, clone.timezone)
28+
assertNotSame(device.unknown, clone.unknown)
29+
}
3030

31-
@Test
32-
fun `copying device will have the same values`() {
33-
val device = Device()
34-
device.name = "name"
35-
device.manufacturer = "manufacturer"
36-
device.brand = "brand"
37-
device.family = "family"
38-
device.model = "model"
39-
device.modelId = "modelId"
40-
device.archs = arrayOf("archs1", "archs2")
41-
device.batteryLevel = 3.14f
42-
device.isCharging = true
43-
device.isOnline = true
44-
device.orientation = Device.DeviceOrientation.LANDSCAPE
45-
device.isSimulator = true
46-
device.memorySize = 10
47-
device.freeMemory = 5
48-
device.usableMemory = 2
49-
device.isLowMemory = true
50-
device.storageSize = 1024
51-
device.freeStorage = 512
52-
device.externalStorageSize = 768
53-
device.externalFreeStorage = 384
54-
device.screenWidthPixels = 1024
55-
device.screenHeightPixels = 768
56-
device.screenDensity = 1.5f
57-
device.screenDpi = 300
58-
device.bootTime = Date()
59-
device.timezone = TimeZone.getDefault()
60-
device.id = "id"
61-
device.connectionType = "connection type"
62-
device.batteryTemperature = 30f
63-
device.locale = "en-US"
64-
device.cpuDescription = "cpu0"
65-
device.chipset = "unisoc t606"
66-
device.processorCount = 4
67-
device.processorFrequency = 800.0
68-
val unknown = mapOf(Pair("unknown", "unknown"))
69-
device.setUnknown(unknown)
31+
@Test
32+
fun `copying device will have the same values`() {
33+
val device = Device()
34+
device.name = "name"
35+
device.manufacturer = "manufacturer"
36+
device.brand = "brand"
37+
device.family = "family"
38+
device.model = "model"
39+
device.modelId = "modelId"
40+
device.archs = arrayOf("archs1", "archs2")
41+
device.batteryLevel = 3.14f
42+
device.isCharging = true
43+
device.isOnline = true
44+
device.orientation = Device.DeviceOrientation.LANDSCAPE
45+
device.isSimulator = true
46+
device.memorySize = 10
47+
device.freeMemory = 5
48+
device.usableMemory = 2
49+
device.isLowMemory = true
50+
device.storageSize = 1024
51+
device.freeStorage = 512
52+
device.externalStorageSize = 768
53+
device.externalFreeStorage = 384
54+
device.screenWidthPixels = 1024
55+
device.screenHeightPixels = 768
56+
device.screenDensity = 1.5f
57+
device.screenDpi = 300
58+
device.bootTime = Date()
59+
device.timezone = TimeZone.getDefault()
60+
device.id = "id"
61+
device.connectionType = "connection type"
62+
device.batteryTemperature = 30f
63+
device.locale = "en-US"
64+
device.cpuDescription = "cpu0"
65+
device.chipset = "unisoc t606"
66+
device.processorCount = 4
67+
device.processorFrequency = 800.0
68+
val unknown = mapOf(Pair("unknown", "unknown"))
69+
device.setUnknown(unknown)
7070

71-
val clone = Device(device)
71+
val clone = Device(device)
7272

73-
assertEquals("name", clone.name)
74-
assertEquals("manufacturer", clone.manufacturer)
75-
assertEquals("brand", clone.brand)
76-
assertEquals("family", clone.family)
77-
assertEquals("model", clone.model)
78-
assertEquals("modelId", clone.modelId)
79-
assertNotNull(clone.archs) {
80-
assertEquals(2, it.size)
81-
assertEquals("archs1", it[0])
82-
assertEquals("archs2", it[1])
83-
}
84-
assertEquals(3.14f, clone.batteryLevel)
85-
assertEquals(true, clone.isCharging)
86-
assertEquals(true, clone.isOnline)
87-
assertEquals(Device.DeviceOrientation.LANDSCAPE, clone.orientation)
88-
assertEquals(true, clone.isSimulator)
89-
assertEquals(10, clone.memorySize)
90-
assertEquals(5, clone.freeMemory)
91-
assertEquals(2, clone.usableMemory)
92-
assertEquals(true, clone.isLowMemory)
93-
assertEquals(1024, clone.storageSize)
94-
assertEquals(512, clone.freeStorage)
95-
assertEquals(768, clone.externalStorageSize)
96-
assertEquals(384, clone.externalFreeStorage)
97-
assertEquals(1024, clone.screenWidthPixels)
98-
assertEquals(768, clone.screenHeightPixels)
99-
assertEquals(1.5f, clone.screenDensity)
100-
assertEquals(300, clone.screenDpi)
101-
assertEquals("id", clone.id)
102-
assertEquals("connection type", clone.connectionType)
103-
assertEquals(30f, clone.batteryTemperature)
104-
assertEquals("cpu0", clone.cpuDescription)
105-
assertEquals("unisoc t606", clone.chipset)
106-
assertEquals(4, clone.processorCount)
107-
assertEquals(800.0, clone.processorFrequency)
108-
device.processorFrequency = 800.0
109-
assertNotNull(clone.unknown) {
110-
assertEquals("unknown", it["unknown"])
111-
}
73+
assertEquals("name", clone.name)
74+
assertEquals("manufacturer", clone.manufacturer)
75+
assertEquals("brand", clone.brand)
76+
assertEquals("family", clone.family)
77+
assertEquals("model", clone.model)
78+
assertEquals("modelId", clone.modelId)
79+
assertNotNull(clone.archs) {
80+
assertEquals(2, it.size)
81+
assertEquals("archs1", it[0])
82+
assertEquals("archs2", it[1])
11283
}
84+
assertEquals(3.14f, clone.batteryLevel)
85+
assertEquals(true, clone.isCharging)
86+
assertEquals(true, clone.isOnline)
87+
assertEquals(Device.DeviceOrientation.LANDSCAPE, clone.orientation)
88+
assertEquals(true, clone.isSimulator)
89+
assertEquals(10, clone.memorySize)
90+
assertEquals(5, clone.freeMemory)
91+
assertEquals(2, clone.usableMemory)
92+
assertEquals(true, clone.isLowMemory)
93+
assertEquals(1024, clone.storageSize)
94+
assertEquals(512, clone.freeStorage)
95+
assertEquals(768, clone.externalStorageSize)
96+
assertEquals(384, clone.externalFreeStorage)
97+
assertEquals(1024, clone.screenWidthPixels)
98+
assertEquals(768, clone.screenHeightPixels)
99+
assertEquals(1.5f, clone.screenDensity)
100+
assertEquals(300, clone.screenDpi)
101+
assertEquals("id", clone.id)
102+
assertEquals("connection type", clone.connectionType)
103+
assertEquals(30f, clone.batteryTemperature)
104+
assertEquals("cpu0", clone.cpuDescription)
105+
assertEquals("unisoc t606", clone.chipset)
106+
assertEquals(4, clone.processorCount)
107+
assertEquals(800.0, clone.processorFrequency)
108+
device.processorFrequency = 800.0
109+
assertNotNull(clone.unknown) { assertEquals("unknown", it["unknown"]) }
110+
}
113111
}

0 commit comments

Comments
 (0)