Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TimestampedScoredNetwork parceling logic." into oc-mr1-dev

Browse Source
This commit is contained in:
Eric Schwarzenbach
2017-09-12 21:21:44 +00:00
committed by Android (Google) Code Review
parent f876e789fd bd44c9e69a
commit 7ccaa98fbb
2 changed files with 72 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/TimestampedScoredNetwork.java
View File

@@ -33,7 +33,7 @@ class TimestampedScoredNetwork implements Parcelable {
}
protected TimestampedScoredNetwork(Parcel in) {
mScore = ScoredNetwork.CREATOR.createFromParcel(in);
mScore = in.readParcelable(ScoredNetwork.class.getClassLoader());
mUpdatedTimestampMillis = in.readLong();
}

71
packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/TimestampedScoredNetworkTest.java Normal file
View File

@@ -0,0 +1,71 @@
/*
* Copyright (C) 2016 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.settingslib.wifi;
import static com.google.common.truth.Truth.assertThat;
import android.net.NetworkKey;
import android.net.ScoredNetwork;
import android.net.WifiKey;
import android.os.Parcel;
import com.android.settingslib.SettingLibRobolectricTestRunner;
import com.android.settingslib.TestConfig;
import java.util.Date;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@RunWith(SettingLibRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class TimestampedScoredNetworkTest {
private TimestampedScoredNetwork impl;
private ScoredNetwork createTestScoredNetwork(String ssid) {
return new ScoredNetwork(
new NetworkKey(new WifiKey("\"" + ssid + "\"", "00:00:00:00:00:00")), null);
}
@Before
public void setUp() {
impl = new TimestampedScoredNetwork(createTestScoredNetwork("test"),
0 /* updatedTimestampMillis */);
}
@Test
public void testUpdate() {
long time = new Date().getTime();
ScoredNetwork updated = createTestScoredNetwork("updated");
impl.update(updated, time);
assertThat(impl.getScore()).isEqualTo(updated);
assertThat(impl.getUpdatedTimestampMillis()).isEqualTo(time);
}
@Test
public void testParcel() {
Parcel parcel = Parcel.obtain();
impl.writeToParcel(parcel, 0);
parcel.setDataPosition(0);
TimestampedScoredNetwork fromParcel = TimestampedScoredNetwork.CREATOR.createFromParcel(parcel);
assertThat(fromParcel.getScore()).isEqualTo(impl.getScore());
assertThat(fromParcel.getUpdatedTimestampMillis()).isEqualTo(impl.getUpdatedTimestampMillis());
}
}