Skip to content

Commit 42ad68e

Browse files
davidbrazilparkerdavidbrazilparker
committed
Unit tests and POST reqeust functionality completed for Result Data Type class.
1 parent 0eaec9c commit 42ad68e

File tree

6 files changed

+81
-66
lines changed

6 files changed

+81
-66
lines changed

‎src/main/kotlin/io/github/chapeco/DataTypes/Result.kt

Lines changed: 37 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.github.chapeco.DataTypes
22

3+
import io.github.chapeco.DataTypes.SubTypes.Results
34
import io.github.chapeco.Utilities.Request
45
import io.github.chapeco.Utilities.Timespan
56
import io.github.chapeco.Utilities.Timestamp
@@ -10,27 +11,38 @@ import kotlinx.serialization.json.JSON
1011
data class Result
1112
(
1213
//GET
13-
@Optional @SerialName("created_by") val createdBy: Int? = null,
14+
@Optional @Transient var createdBy: Int? = null,
1415
@Optional @Transient var createdOn: Timestamp? = null,
15-
@Optional val id: Int? = null,
16-
@Optional @SerialName("test_id") val testId: Int? = null,
16+
@Optional @Transient var id: Int? = null,
17+
@Optional @Transient var testId: Int? = null,
18+
@Optional @Transient var caseId: Int? = null,
1719

1820
//ADD
19-
@Optional @SerialName("status_id") var statusId: Int? = null,
20-
@Optional var comment: String? = null,
21-
@Optional var version: String? = null,
21+
@Optional @SerialName("status_id") var statusId: Int? = -1,
22+
@Optional var comment: String? = "",
23+
@Optional var version: String? = "",
2224
@Optional @Transient var elapsed: Timespan? = null,
23-
@Optional var defects: String? = null,
24-
@Optional @SerialName("assignedto_id") var assignedToId: Int? = null,
25-
@Optional @SerialName("custom_step_results") val customStepResults: String? = null
25+
@Optional var defects: String? = "",
26+
@Optional @Transient var assignedToId: Int? = null,
27+
@Optional @SerialName("custom_step_results") val customStepResults: String? = ""
2628
)
2729
{
28-
@Optional @SerialName("created_on") private val createdOnActual: Long? = createdOn.toString().toLongOrNull()
29-
@Optional @SerialName("elapsed") private val elapsedActual: String? = elapsed.toString()
30+
@Optional @SerialName("created_on") private val createdOnActual: String? = if (createdOn == null) "" else createdOn.toString()
31+
@Optional @SerialName("elapsed") private val elapsedActual: String? = if (elapsed == null) "" else elapsed.toString()
32+
@Optional @SerialName("assignedto_id") private val assignedToIdActual: String? = if (assignedToId == null) "" else assignedToId.toString()
33+
@Optional @SerialName("created_by") private val createdByActual: String? = if (createdBy == null) "" else createdBy.toString()
34+
@Optional @SerialName("id") private val idActual: String? = if (id == null) "" else id.toString()
35+
@Optional @SerialName("test_id") private val testIdActual: String? = if (testId == null) "" else testId.toString()
36+
@Optional @SerialName("case_id") private val caseIdActual: String? = if (caseId == null) "" else caseId.toString()
3037

3138
init {
32-
if(createdOn == null) createdOn = Timestamp(createdOnActual)
33-
if(elapsed == null) elapsed = Timespan().parseTimespan(elapsedActual)
39+
if(createdOn == null) createdOn = Timestamp(createdOnActual?.toLongOrNull())
40+
if(elapsed == null && elapsedActual != "") elapsed = Timespan().parseTimespan(elapsedActual)
41+
if(assignedToId == null && assignedToIdActual != "") assignedToId = assignedToIdActual?.toInt()
42+
if(createdBy == null && createdByActual != "") createdBy = createdByActual?.toInt()
43+
if(id == null && idActual != "") id = idActual?.toInt()
44+
if(testId == null && testIdActual != "") testId = testIdActual?.toInt()
45+
if(caseId == null && caseIdActual != "") caseId = caseIdActual?.toInt()
3446
}
3547

3648
//TODO
@@ -94,25 +106,30 @@ data class Result
94106

95107
fun addResult(result: Result): Result
96108
{
109+
val testId = result.testId
97110
val endpoint = "add_result/$testId"
98-
return JSON.unquoted.parse(Request().Post(endpoint,JSON.stringify(Result))!!)
111+
println(JSON.stringify(result))
112+
return JSON.unquoted.parse(Request().Post(endpoint,JSON.stringify(result))!!)
99113
}
100114

101-
fun addResultForCase(runId: Int, caseId: Int): Result
115+
fun addResultForCase(runId: Int, caseId: Int, result: Result): Result
102116
{
103117
val endpoint = "add_result_for_case/$runId/$caseId"
104-
return Result()
118+
println(JSON.stringify(result))
119+
return JSON.unquoted.parse(Request().Post(endpoint,JSON.stringify(result))!!)
105120
}
106121

107-
fun addResults(runId: Int): Array<Result>
122+
fun addResults(runId: Int, results: Results): List<Result>
108123
{
109124
val endpoint = "add_results/$runId"
110-
return Array<Result>(0) {Result()}
125+
println(JSON.stringify(results))
126+
return JSON.unquoted.parse(Result.serializer().list,Request().Post(endpoint,JSON.stringify(results))!!)
111127
}
112128

113-
fun addResultsForCases(runId: Int): Array<Result>
129+
fun addResultsForCases(runId: Int, results: Results): List<Result>
114130
{
115131
val endpoint = "add_results_for_cases/$runId"
116-
return Array<Result>(0) {Result()}
132+
println(JSON.stringify(results))
133+
return JSON.unquoted.parse(Result.serializer().list,Request().Post(endpoint,JSON.stringify(results))!!)
117134
}
118135
}

‎src/main/kotlin/io/github/chapeco/DataTypes/SubTypes/Results.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package io.github.chapeco.DataTypes.SubTypes
2+
3+
import io.github.chapeco.DataTypes.Result
4+
import kotlinx.serialization.Serializable
5+
6+
@Serializable
7+
data class Results(
8+
val results: List<Result>? = null
9+
)

‎src/main/kotlin/io/github/chapeco/Utilities/Request.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,16 @@ class Request
4242

4343
fun Post(endpoint: String, jsonPayload: String): String?
4444
{
45+
println(jsonPayload)
4546
val (request, response, result) = endpoint.httpPost()
4647
.authenticate(username,password)
4748
.body(jsonPayload)
49+
.also { println(it) }
4850
.responseString()
4951
val (data, error) = result
5052
if(error == null)
5153
{
54+
println(data)
5255
return data
5356
}
5457
else

‎src/main/kotlin/io/github/chapeco/Utilities/Timespan.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.github.chapeco.Utilities
22

3+
import java.lang.StringBuilder
4+
35

46
data class Timespan
57
(
@@ -15,20 +17,20 @@ data class Timespan
1517
private val secondsString: String = "s"
1618

1719
private fun getTimespan(): String{
18-
var timespanString: String = ""
19-
if (days > 0) timespanString = timespanString + days + daysString
20-
if (hours > 0) timespanString = timespanString + hours + hoursString
21-
if (minutes > 0) timespanString = timespanString + minutes + minutesString
22-
if (seconds > 0) timespanString = timespanString + seconds + secondsString
23-
return timespanString
20+
val timespanString = StringBuilder()
21+
if(days > 0) timespanString.append(days.toString() + daysString)
22+
if(hours > 0) timespanString.append(hours.toString() + hoursString)
23+
if(minutes > 0) timespanString.append(minutes.toString() + minutesString)
24+
if(seconds > 0) timespanString.append(seconds.toString() + secondsString)
25+
return timespanString.toString()
2426
}
2527

2628
override fun toString(): String {
2729
return getTimespan()
2830
}
2931

3032
fun parseTimespan(timespanString: String?): Timespan? {
31-
if (timespanString.toString().equals("null")) return null
33+
if (timespanString.toString().equals("null")) return Timespan(seconds = 1)
3234
var currentString = timespanString!!.replace(" ","")
3335
var days: Int = 0
3436
var hours: Int = 0

‎src/main/kotlin/io/github/chapeco/Utilities/Timestamp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import kotlinx.serialization.Serializable
55
@Serializable
66
data class Timestamp
77
(
8-
var time: Long? = null
8+
var time: Long? = -1
99
)
1010
{
1111
override fun toString(): String {

‎src/test/kotlin/io/github/chapeco/DataTypes/ResultTest.kt

Lines changed: 22 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package io.github.chapeco.DataTypes
22

3+
import io.github.chapeco.DataTypes.SubTypes.Results
34
import io.github.chapeco.Utilities.Timespan
45
import io.github.chapeco.Utilities.Timestamp
56
import kotlinx.serialization.json.JSON
67
import kotlinx.serialization.list
78
import org.junit.jupiter.api.Assertions
9+
import org.junit.jupiter.api.Disabled
810
import org.junit.jupiter.api.Test
911

1012
class ResultTest
@@ -50,7 +52,7 @@ class ResultTest
5052
@Test
5153
fun serializeResultTest()
5254
{
53-
val expectedResult: String = "{created_by:1,id:1,test_id:1,status_id:1,comment:\"some comment\",version:\"some version\",defects:\"some defects\",assignedto_id:1,created_on:1000,elapsed:1s}"
55+
val expectedResult = "{status_id:1,comment:\"some comment\",version:\"some version\",defects:\"some defects\",custom_step_results:,created_on:1000,elapsed:1s,assignedto_id:1,created_by:1,id:1,test_id:1,case_id:}"
5456
val actualResult = Result(
5557
createdBy = 1,
5658
createdOn = Timestamp(
@@ -88,85 +90,67 @@ class ResultTest
8890
seconds = 1
8991
),
9092
defects = "some defects",
91-
assignedToId = 1
93+
assignedToId = 1,
94+
customStepResults = null
9295
)
93-
Assertions.assertEquals(expectedResult,JSON.unquoted.parse<Result>("{created_by:1,id:1,test_id:1,status_id:1,comment:\"some comment\",version:\"some version\",defects:\"some defects\",assignedto_id:1,created_on:1000,elapsed:1s}"))
96+
Assertions.assertEquals(expectedResult,JSON.unquoted.parse<Result>("{test_id:1,status_id:1,comment:\"some comment\",version:\"some version\",defects:\"some defects\",custom_step_results:null,created_on:1000,elapsed:1s,assignedto_id:1,created_by:\"1\",id:1}"))
9497
}
9598

9699
@Test
97100
fun getResultsTest()
98101
{
99-
val expectedResultsList = listOf(
100-
Result(
101-
createdBy = 1,
102-
id = 1,
103-
testId = 1,
104-
statusId = 1,
105-
createdOn = Timestamp(1542143242)
106-
)
107-
)
108102
val actualResultsList = Result().getResults(1)
109103
println(JSON.unquoted.stringify(Result.serializer().list,actualResultsList))
110-
Assertions.assertEquals(expectedResultsList,actualResultsList)
104+
Assertions.assertTrue(actualResultsList.isNotEmpty())
111105
}
112106

113107
@Test
114108
fun getResultsForCaseTest()
115109
{
116-
val expectedResultsList = listOf(
117-
Result(
118-
createdBy = 1,
119-
id = 1,
120-
testId = 1,
121-
statusId = 1,
122-
createdOn = Timestamp(1542143242)
123-
)
124-
)
125110
val actualResultsList = Result().getResultsForCase(1,1)
126111
println(JSON.unquoted.stringify(Result.serializer().list,actualResultsList))
127-
Assertions.assertEquals(expectedResultsList,actualResultsList)
112+
Assertions.assertTrue(actualResultsList.isNotEmpty())
128113
}
129114

130115
@Test
131116
fun getResultsForRunTest()
132117
{
133-
val expectedResultsList = listOf(
134-
Result(
135-
createdBy = 1,
136-
id = 1,
137-
testId = 1,
138-
statusId = 1,
139-
createdOn = Timestamp(1542143242)
140-
)
141-
)
142118
val actualResultsList = Result().getResultsForRun(1)
143119
println(JSON.unquoted.stringify(Result.serializer().list,actualResultsList))
144-
Assertions.assertEquals(expectedResultsList,actualResultsList)
120+
Assertions.assertTrue(actualResultsList.isNotEmpty())
145121
}
146122

147123
@Test
148124
fun addResultTest()
149125
{
150-
val expectedResult = Result(testId = 1)
126+
val expectedResult = Result(testId = 1, statusId = 1)
151127
val actualResult = Result().addResult(expectedResult)
152-
Assertions.assertEquals(expectedResult,actualResult)
128+
println(JSON.unquoted.stringify(actualResult))
129+
Assertions.assertEquals(expectedResult.testId,actualResult.testId)
153130
}
154131

155132
@Test
156133
fun addResultForCaseTest()
157134
{
158-
135+
val expectedResult = Result(testId = 1, statusId = 1)
136+
val actualResult = Result().addResultForCase(1,1,expectedResult)
137+
println(JSON.unquoted.stringify(actualResult))
138+
Assertions.assertEquals(expectedResult.testId,actualResult.testId)
159139
}
160140

161141
@Test
162142
fun addResultsTest()
163143
{
164-
144+
val actualResultsList = Result().addResults(1, Results(listOf(Result(testId = 1, statusId = 1))))
145+
println(JSON.unquoted.stringify(Result.serializer().list,actualResultsList))
146+
Assertions.assertTrue(actualResultsList.isNotEmpty())
165147
}
166148

167149
@Test
168150
fun addResultsForCasesTest()
169151
{
170-
152+
val actualResultsList = Result().addResultsForCases(1, Results(listOf(Result(caseId = 1, statusId = 1))))
153+
println(JSON.unquoted.stringify(Result.serializer().list,actualResultsList))
154+
Assertions.assertTrue(actualResultsList.isNotEmpty())
171155
}
172156
}

0 commit comments

Comments
 (0)