Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
ea749f21
Verified
Commit
ea749f21
authored
Oct 03, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor improvements to JsonDict output classes
parent
b4b0d3da
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
30 deletions
+49
-30
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateMessage.kt
...rproject/briar/headless/messaging/OutputPrivateMessage.kt
+13
-16
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateRequest.kt
...rproject/briar/headless/messaging/OutputPrivateRequest.kt
+1
-3
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateResponse.kt
...project/briar/headless/messaging/OutputPrivateResponse.kt
+1
-3
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
...t/briar/headless/messaging/MessagingControllerImplTest.kt
+34
-8
No files found.
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateMessage.kt
View file @
ea749f21
...
@@ -5,21 +5,18 @@ import org.briarproject.briar.api.messaging.PrivateMessage
...
@@ -5,21 +5,18 @@ import org.briarproject.briar.api.messaging.PrivateMessage
import
org.briarproject.briar.api.messaging.PrivateMessageHeader
import
org.briarproject.briar.api.messaging.PrivateMessageHeader
import
org.briarproject.briar.headless.json.JsonDict
import
org.briarproject.briar.headless.json.JsonDict
internal
fun
PrivateMessageHeader
.
output
(
contactId
:
ContactId
,
body
:
String
?):
JsonDict
{
internal
fun
PrivateMessageHeader
.
output
(
contactId
:
ContactId
,
body
:
String
?)
=
JsonDict
(
val
dict
=
JsonDict
(
"type"
to
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
"type"
to
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
"contactId"
to
contactId
.
int
,
"contactId"
to
contactId
.
int
,
"timestamp"
to
timestamp
,
"timestamp"
to
timestamp
,
"read"
to
isRead
,
"read"
to
isRead
,
"seen"
to
isSeen
,
"seen"
to
isSeen
,
"sent"
to
isSent
,
"sent"
to
isSent
,
"local"
to
isLocal
,
"local"
to
isLocal
,
"id"
to
id
.
bytes
,
"id"
to
id
.
bytes
,
"groupId"
to
groupId
.
bytes
,
"groupId"
to
groupId
.
bytes
"body"
to
body
)
)
if
(
body
!=
null
)
dict
[
"body"
]
=
body
return
dict
}
internal
fun
PrivateMessage
.
output
(
contactId
:
ContactId
,
body
:
String
)
=
JsonDict
(
internal
fun
PrivateMessage
.
output
(
contactId
:
ContactId
,
body
:
String
)
=
JsonDict
(
"type"
to
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
"type"
to
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
...
@@ -32,4 +29,4 @@ internal fun PrivateMessage.output(contactId: ContactId, body: String) = JsonDic
...
@@ -32,4 +29,4 @@ internal fun PrivateMessage.output(contactId: ContactId, body: String) = JsonDic
"id"
to
message
.
id
.
bytes
,
"id"
to
message
.
id
.
bytes
,
"groupId"
to
message
.
groupId
.
bytes
,
"groupId"
to
message
.
groupId
.
bytes
,
"body"
to
body
"body"
to
body
)
)
\ No newline at end of file
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateRequest.kt
View file @
ea749f21
@
file
:
Suppress
(
"unused"
)
package
org.briarproject.briar.headless.messaging
package
org.briarproject.briar.headless.messaging
import
org.briarproject.bramble.api.contact.ContactId
import
org.briarproject.bramble.api.contact.ContactId
...
@@ -53,4 +51,4 @@ internal fun GroupInvitationRequest.output(contactId: ContactId): JsonDict {
...
@@ -53,4 +51,4 @@ internal fun GroupInvitationRequest.output(contactId: ContactId): JsonDict {
val
dict
=
(
this
as
InvitationRequest
<
*
>).
output
(
contactId
)
val
dict
=
(
this
as
InvitationRequest
<
*
>).
output
(
contactId
)
dict
[
"type"
]
=
"org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest"
dict
[
"type"
]
=
"org.briarproject.briar.api.privategroup.invitation.GroupInvitationRequest"
return
dict
return
dict
}
}
\ No newline at end of file
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputPrivateResponse.kt
View file @
ea749f21
@
file
:
Suppress
(
"MemberVisibilityCanBePrivate"
,
"unused"
)
package
org.briarproject.briar.headless.messaging
package
org.briarproject.briar.headless.messaging
import
org.briarproject.bramble.api.contact.ContactId
import
org.briarproject.bramble.api.contact.ContactId
...
@@ -54,4 +52,4 @@ internal fun GroupInvitationResponse.output(contactId: ContactId): JsonDict {
...
@@ -54,4 +52,4 @@ internal fun GroupInvitationResponse.output(contactId: ContactId): JsonDict {
val
dict
=
(
this
as
InvitationResponse
).
output
(
contactId
)
val
dict
=
(
this
as
InvitationResponse
).
output
(
contactId
)
dict
[
"type"
]
=
"org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse"
dict
[
"type"
]
=
"org.briarproject.briar.api.privategroup.invitation.GroupInvitationResponse"
return
dict
return
dict
}
}
\ No newline at end of file
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
View file @
ea749f21
...
@@ -11,7 +11,6 @@ import org.briarproject.bramble.test.ImmediateExecutor
...
@@ -11,7 +11,6 @@ import org.briarproject.bramble.test.ImmediateExecutor
import
org.briarproject.bramble.test.TestUtils.getRandomId
import
org.briarproject.bramble.test.TestUtils.getRandomId
import
org.briarproject.bramble.util.StringUtils.getRandomString
import
org.briarproject.bramble.util.StringUtils.getRandomString
import
org.briarproject.briar.api.client.SessionId
import
org.briarproject.briar.api.client.SessionId
import
org.briarproject.briar.api.introduction.IntroductionConstants.MAX_REQUEST_MESSAGE_LENGTH
import
org.briarproject.briar.api.introduction.IntroductionRequest
import
org.briarproject.briar.api.introduction.IntroductionRequest
import
org.briarproject.briar.api.messaging.*
import
org.briarproject.briar.api.messaging.*
import
org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH
import
org.briarproject.briar.api.messaging.MessagingConstants.MAX_PRIVATE_MESSAGE_BODY_LENGTH
...
@@ -44,6 +43,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
...
@@ -44,6 +43,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
private
val
header
=
private
val
header
=
PrivateMessageHeader
(
message
.
id
,
group
.
id
,
timestamp
,
true
,
true
,
true
,
true
)
PrivateMessageHeader
(
message
.
id
,
group
.
id
,
timestamp
,
true
,
true
,
true
,
true
)
private
val
sessionId
=
SessionId
(
getRandomId
())
@Test
@Test
fun
list
()
{
fun
list
()
{
...
@@ -57,10 +57,8 @@ internal class MessagingControllerImplTest : ControllerTest() {
...
@@ -57,10 +57,8 @@ internal class MessagingControllerImplTest : ControllerTest() {
@Test
@Test
fun
listIntroductionRequest
()
{
fun
listIntroductionRequest
()
{
val
sessionId
=
SessionId
(
getRandomId
())
val
text
=
getRandomString
(
MAX_REQUEST_MESSAGE_LENGTH
)
val
request
=
IntroductionRequest
(
val
request
=
IntroductionRequest
(
message
.
id
,
group
.
id
,
timestamp
,
true
,
true
,
false
,
true
,
sessionId
,
author
,
text
,
message
.
id
,
group
.
id
,
timestamp
,
true
,
true
,
false
,
true
,
sessionId
,
author
,
body
,
false
,
false
false
,
false
)
)
...
@@ -113,12 +111,13 @@ internal class MessagingControllerImplTest : ControllerTest() {
...
@@ -113,12 +111,13 @@ internal class MessagingControllerImplTest : ControllerTest() {
controller
.
write
(
ctx
)
controller
.
write
(
ctx
)
val
output
=
slot
.
captured
val
output
=
slot
.
captured
assertEquals
(
contact
.
id
.
int
,
output
.
get
(
"contactId"
))
assertEquals
(
privateMessage
.
output
(
contact
.
id
,
body
),
output
)
assertEquals
(
body
,
output
.
get
(
"body"
))
assertEquals
(
contact
.
id
.
int
,
output
[
"contactId"
])
assertEquals
(
message
.
id
.
bytes
,
output
.
get
(
"id"
))
assertEquals
(
body
,
output
[
"body"
])
assertEquals
(
message
.
id
.
bytes
,
output
[
"id"
])
assertEquals
(
assertEquals
(
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
"org.briarproject.briar.api.messaging.PrivateMessageHeader"
,
output
.
get
(
"type"
)
output
[
"type"
]
)
)
}
}
...
@@ -185,6 +184,33 @@ internal class MessagingControllerImplTest : ControllerTest() {
...
@@ -185,6 +184,33 @@ internal class MessagingControllerImplTest : ControllerTest() {
assertJsonEquals
(
json
,
header
.
output
(
contact
.
id
,
body
))
assertJsonEquals
(
json
,
header
.
output
(
contact
.
id
,
body
))
}
}
@Test
fun
testIntroductionRequestWithEmptyBody
()
{
val
request
=
IntroductionRequest
(
message
.
id
,
group
.
id
,
timestamp
,
true
,
true
,
false
,
true
,
sessionId
,
author
,
null
,
false
,
false
)
val
json
=
"""
{
"body": null,
"type": "org.briarproject.briar.api.introduction.IntroductionRequest",
"timestamp": $timestamp,
"groupId": ${toJson(request.groupId.bytes)},
"contactId": ${contact.id.int},
"local": ${request.isLocal},
"seen": ${request.isSeen},
"read": ${request.isRead},
"sent": ${request.isSent},
"id": ${toJson(request.id.bytes)},
"sessionId": ${toJson(request.sessionId.bytes)},
"name": ${request.name},
"answered": ${request.wasAnswered()},
"alreadyContact": ${request.isContact}
}
"""
assertJsonEquals
(
json
,
request
.
output
(
contact
.
id
))
}
private
fun
expectGetContact
()
{
private
fun
expectGetContact
()
{
every
{
ctx
.
pathParam
(
"contactId"
)
}
return
s
contact
.
id
.
int
.
toString
()
every
{
ctx
.
pathParam
(
"contactId"
)
}
return
s
contact
.
id
.
int
.
toString
()
every
{
contactManager
.
getContact
(
contact
.
id
)
}
return
s
contact
every
{
contactManager
.
getContact
(
contact
.
id
)
}
return
s
contact
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment