Skip to content

Commit

Permalink
fix android build
Browse files Browse the repository at this point in the history
  • Loading branch information
gjc13 committed Sep 10, 2021
1 parent 096e067 commit beeee90
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions src/app/tests/TestCommissionManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* limitations under the License.
*/

#include "app/server/Mdns.h"
#include <app/server/CommissionManager.h>
#include <app/server/Server.h>
#include <lib/support/Span.h>
#include <lib/support/UnitTestRegistration.h>
#include <messaging/tests/echo/common.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/ConfigurationManager.h>
#include <platform/PlatformManager.h>
#include <protocols/secure_channel/PASESession.h>

Expand Down Expand Up @@ -77,6 +77,7 @@ void CheckCommissionManagerWindowTimeout(nlTestSuite * suite, void *)
commissionMgr.CloseCommissioningWindow();
}

#if !CHIP_DEVICE_LAYER_NONE
void CheckCommissionManagerEnhancedWindow(nlTestSuite * suite, void *)
{
CommissionManager & commissionMgr = Server::GetInstance().GetCommissionManager();
Expand Down Expand Up @@ -105,11 +106,15 @@ void CheckCommissionManagerEnhancedWindow(nlTestSuite * suite, void *)
NL_TEST_ASSERT(suite, err == CHIP_NO_ERROR);
NL_TEST_ASSERT(suite, currentDiscriminator == originDiscriminator);
}

const nlTest sTests[] = { NL_TEST_DEF("CheckCommissionManagerBasicWindowOpenClose", CheckCommissionManagerBasicWindowOpenClose),
NL_TEST_DEF("CheckCommissionManagerWindowTimeout", CheckCommissionManagerWindowTimeout),
NL_TEST_DEF("CheckCommissionManagerEnhancedWindow", CheckCommissionManagerEnhancedWindow),
NL_TEST_SENTINEL() };
#endif // !CHIP_DEVICE_LAYER_NONE

const nlTest sTests[] = {
#if !CHIP_DEVICE_LAYER_NONE // ConfigurationManager is not avaiable without device layer
NL_TEST_DEF("CheckCommissionManagerEnhancedWindow", CheckCommissionManagerEnhancedWindow),
#endif
NL_TEST_DEF("CheckCommissionManagerBasicWindowOpenClose", CheckCommissionManagerBasicWindowOpenClose),
NL_TEST_DEF("CheckCommissionManagerWindowTimeout", CheckCommissionManagerWindowTimeout), NL_TEST_SENTINEL()
};

} // namespace

Expand Down

0 comments on commit beeee90

Please sign in to comment.