Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
platform_frameworks_base-old
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Farzin Kazemzadeh
platform_frameworks_base-old
Commits
dc54ad7f
Commit
dc54ad7f
authored
7 years ago
by
Hugo Benichi
Committed by
Gerrit Code Review
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge "NsdManager: add unit tests"
parents
d065cf04
db8adb79
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/java/android/net/nsd/NsdManager.java
+3
-1
3 additions, 1 deletion
core/java/android/net/nsd/NsdManager.java
tests/net/java/android/net/nsd/NsdManagerTest.java
+156
-0
156 additions, 0 deletions
tests/net/java/android/net/nsd/NsdManagerTest.java
with
159 additions
and
1 deletion
core/java/android/net/nsd/NsdManager.java
+
3
−
1
View file @
dc54ad7f
...
...
@@ -31,6 +31,7 @@ import android.util.SparseArray;
import
java.util.concurrent.CountDownLatch
;
import
com.android.internal.annotations.VisibleForTesting
;
import
com.android.internal.util.AsyncChannel
;
import
com.android.internal.util.Protocol
;
...
...
@@ -326,7 +327,8 @@ public final class NsdManager {
public
void
onServiceResolved
(
NsdServiceInfo
serviceInfo
);
}
private
class
ServiceHandler
extends
Handler
{
@VisibleForTesting
class
ServiceHandler
extends
Handler
{
ServiceHandler
(
Looper
looper
)
{
super
(
looper
);
}
...
...
This diff is collapsed.
Click to expand it.
tests/net/java/android/net/nsd/NsdManagerTest.java
0 → 100644
+
156
−
0
View file @
dc54ad7f
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
android.net.nsd
;
import
static
org
.
junit
.
Assert
.
assertEquals
;
import
static
org
.
junit
.
Assert
.
assertNotNull
;
import
static
org
.
mockito
.
Mockito
.
when
;
import
static
org
.
mockito
.
Mockito
.
any
;
import
static
org
.
mockito
.
Mockito
.
reset
;
import
static
org
.
mockito
.
Mockito
.
spy
;
import
static
org
.
mockito
.
Mockito
.
verify
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
timeout
;
import
static
org
.
mockito
.
Mockito
.
times
;
import
android.os.HandlerThread
;
import
android.os.Handler
;
import
android.os.Looper
;
import
android.content.Context
;
import
android.support.test.filters.SmallTest
;
import
android.support.test.runner.AndroidJUnit4
;
import
android.os.Message
;
import
android.os.Messenger
;
import
com.android.internal.util.AsyncChannel
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.mockito.Mock
;
import
org.mockito.MockitoAnnotations
;
@RunWith
(
AndroidJUnit4
.
class
)
@SmallTest
public
class
NsdManagerTest
{
@Mock
Context
mContext
;
@Mock
INsdManager
mService
;
MockServiceHandler
mServiceHandler
;
long
mTimeoutMs
=
100
;
// non-final so that tests can adjust the value.
@Before
public
void
setUp
()
throws
Exception
{
MockitoAnnotations
.
initMocks
(
this
);
mServiceHandler
=
spy
(
MockServiceHandler
.
create
(
mContext
));
when
(
mService
.
getMessenger
()).
thenReturn
(
new
Messenger
(
mServiceHandler
));
}
@Test
public
void
testResolveService
()
{
NsdManager
manager
=
makeManager
();
NsdServiceInfo
request
=
new
NsdServiceInfo
(
"a_name"
,
"a_type"
);
NsdServiceInfo
reply
=
new
NsdServiceInfo
(
"resolved_name"
,
"resolved_type"
);
NsdManager
.
ResolveListener
listener
=
mock
(
NsdManager
.
ResolveListener
.
class
);
manager
.
resolveService
(
request
,
listener
);
int
key1
=
verifyRequest
(
NsdManager
.
RESOLVE_SERVICE
);
int
err
=
33
;
sendResponse
(
NsdManager
.
RESOLVE_SERVICE_FAILED
,
err
,
key1
,
null
);
verify
(
listener
,
timeout
(
mTimeoutMs
).
times
(
1
)).
onResolveFailed
(
request
,
err
);
manager
.
resolveService
(
request
,
listener
);
int
key2
=
verifyRequest
(
NsdManager
.
RESOLVE_SERVICE
);
sendResponse
(
NsdManager
.
RESOLVE_SERVICE_SUCCEEDED
,
0
,
key2
,
reply
);
verify
(
listener
,
timeout
(
mTimeoutMs
).
times
(
1
)).
onServiceResolved
(
reply
);
}
@Test
public
void
testParallelResolveService
()
{
NsdManager
manager
=
makeManager
();
NsdServiceInfo
request
=
new
NsdServiceInfo
(
"a_name"
,
"a_type"
);
NsdServiceInfo
reply
=
new
NsdServiceInfo
(
"resolved_name"
,
"resolved_type"
);
NsdManager
.
ResolveListener
listener1
=
mock
(
NsdManager
.
ResolveListener
.
class
);
NsdManager
.
ResolveListener
listener2
=
mock
(
NsdManager
.
ResolveListener
.
class
);
manager
.
resolveService
(
request
,
listener1
);
int
key1
=
verifyRequest
(
NsdManager
.
RESOLVE_SERVICE
);
manager
.
resolveService
(
request
,
listener2
);
int
key2
=
verifyRequest
(
NsdManager
.
RESOLVE_SERVICE
);
sendResponse
(
NsdManager
.
RESOLVE_SERVICE_SUCCEEDED
,
0
,
key2
,
reply
);
sendResponse
(
NsdManager
.
RESOLVE_SERVICE_SUCCEEDED
,
0
,
key1
,
reply
);
verify
(
listener1
,
timeout
(
mTimeoutMs
).
times
(
1
)).
onServiceResolved
(
reply
);
verify
(
listener2
,
timeout
(
mTimeoutMs
).
times
(
1
)).
onServiceResolved
(
reply
);
}
NsdManager
makeManager
()
{
NsdManager
manager
=
new
NsdManager
(
mContext
,
mService
);
// Acknowledge first two messages connecting the AsyncChannel.
verify
(
mServiceHandler
,
timeout
(
mTimeoutMs
).
times
(
2
)).
handleMessage
(
any
());
reset
(
mServiceHandler
);
assertNotNull
(
mServiceHandler
.
chan
);
return
manager
;
}
int
verifyRequest
(
int
expectedMessageType
)
{
verify
(
mServiceHandler
,
timeout
(
mTimeoutMs
)).
handleMessage
(
any
());
reset
(
mServiceHandler
);
Message
received
=
mServiceHandler
.
lastMessage
;
assertEquals
(
NsdManager
.
nameOf
(
expectedMessageType
),
NsdManager
.
nameOf
(
received
.
what
));
return
received
.
arg2
;
}
void
sendResponse
(
int
replyType
,
int
arg
,
int
key
,
Object
obj
)
{
mServiceHandler
.
chan
.
sendMessage
(
replyType
,
arg
,
key
,
obj
);
}
// Implements the server side of AsyncChannel connection protocol
public
static
class
MockServiceHandler
extends
Handler
{
public
Context
mContext
;
public
AsyncChannel
chan
;
public
Message
lastMessage
;
MockServiceHandler
(
Looper
looper
,
Context
context
)
{
super
(
looper
);
mContext
=
context
;
}
@Override
public
void
handleMessage
(
Message
msg
)
{
lastMessage
=
obtainMessage
();
lastMessage
.
copyFrom
(
msg
);
if
(
msg
.
what
==
AsyncChannel
.
CMD_CHANNEL_FULL_CONNECTION
)
{
chan
=
new
AsyncChannel
();
chan
.
connect
(
mContext
,
this
,
msg
.
replyTo
);
chan
.
sendMessage
(
AsyncChannel
.
CMD_CHANNEL_FULLY_CONNECTED
);
}
}
public
static
MockServiceHandler
create
(
Context
context
)
{
HandlerThread
t
=
new
HandlerThread
(
"mock-service-handler"
);
t
.
start
();
return
new
MockServiceHandler
(
t
.
getLooper
(),
context
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment