Merge "Accept more than one SD in NsdManagerTest" into lollipop-cts-dev

automerge: 1840edc

* commit '1840edcd80a4bc62bae117848ef64a5c4bf83ef2':
  Accept more than one SD in NsdManagerTest
This commit is contained in:
Daniel Xie
2015-06-02 23:18:57 +00:00
committed by android-build-merger

View File

@@ -372,8 +372,6 @@ public class NsdManagerTest extends AndroidTestCase {
assertTrue(lastEvent != null); assertTrue(lastEvent != null);
assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName));
assertTrue(eventCacheSize() == 2);
// Register service again to see if we discover it // Register service again to see if we discover it
checkForAdditionalEvents(); checkForAdditionalEvents();
clearEventCache(); clearEventCache();
@@ -405,7 +403,6 @@ public class NsdManagerTest extends AndroidTestCase {
lastEvent.mInfo.getServiceName()); lastEvent.mInfo.getServiceName());
assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName)); assertTrue(lastEvent.mInfo.getServiceName().equals(registeredName));
assertTrue(checkCacheSize(2));
checkForAdditionalEvents(); checkForAdditionalEvents();
clearEventCache(); clearEventCache();