drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add NetIdManagerTest

Browse Source 
Add a simple test to verify that IDs loop correctly, that they skip used
IDs correctly, and throw when there is no remaining ID.

Test: atest com.android.server.NetIdManagerTest
Change-Id: I4c9518c725156d743286e062fd2eec1423a0459e
This commit is contained in:
Remi NGUYEN VAN 2019-08-01 16:25:50 +09:00
parent bb59253d6d
commit f8a4272491
2 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/NetIdManager.java
View File

@ -20,6 +20,7 @@ import android.annotation.NonNull;
import android.util.SparseBooleanArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
/**
* Class used to reserve and release net IDs.
@ -38,14 +39,25 @@ public class NetIdManager {
@GuardedBy("mNetIdInUse")
private int mLastNetId = MIN_NET_ID - 1;
private final int mMaxNetId;
public NetIdManager() {
this(MAX_NET_ID);
}
@VisibleForTesting
NetIdManager(int maxNetId) {
mMaxNetId = maxNetId;
}
/**
* Get the first netId that follows the provided lastId and is available.
*/
private static int getNextAvailableNetIdLocked(
private int getNextAvailableNetIdLocked(
int lastId, @NonNull SparseBooleanArray netIdInUse) {
int netId = lastId;
for (int i = MIN_NET_ID; i <= MAX_NET_ID; i++) {
netId = netId < MAX_NET_ID ? netId + 1 : MIN_NET_ID;
for (int i = MIN_NET_ID; i <= mMaxNetId; i++) {
netId = netId < mMaxNetId ? netId + 1 : MIN_NET_ID;
if (!netIdInUse.get(netId)) {
return netId;
}

53
tests/net/java/com/android/server/NetIdManagerTest.kt Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (C) 2019 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 com.android.server
import androidx.test.filters.SmallTest
import androidx.test.runner.AndroidJUnit4
import com.android.server.NetIdManager.MIN_NET_ID
import com.android.testutils.ExceptionUtils.ThrowingRunnable
import com.android.testutils.assertThrows
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.test.assertEquals
@RunWith(AndroidJUnit4::class)
@SmallTest
class NetIdManagerTest {
@Test
fun testReserveReleaseNetId() {
val manager = NetIdManager(MIN_NET_ID + 4)
assertEquals(MIN_NET_ID, manager.reserveNetId())
assertEquals(MIN_NET_ID + 1, manager.reserveNetId())
assertEquals(MIN_NET_ID + 2, manager.reserveNetId())
assertEquals(MIN_NET_ID + 3, manager.reserveNetId())
manager.releaseNetId(MIN_NET_ID + 1)
manager.releaseNetId(MIN_NET_ID + 3)
// IDs only loop once there is no higher ID available
assertEquals(MIN_NET_ID + 4, manager.reserveNetId())
assertEquals(MIN_NET_ID + 1, manager.reserveNetId())
assertEquals(MIN_NET_ID + 3, manager.reserveNetId())
assertThrows(IllegalStateException::class.java, ThrowingRunnable { manager.reserveNetId() })
manager.releaseNetId(MIN_NET_ID + 5)
// Still no ID available: MIN_NET_ID + 5 was not reserved
assertThrows(IllegalStateException::class.java, ThrowingRunnable { manager.reserveNetId() })
manager.releaseNetId(MIN_NET_ID + 2)
// Throwing an exception still leaves the manager in a working state
assertEquals(MIN_NET_ID + 2, manager.reserveNetId())
}
}