Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb1c5b52 authored by Eric Schwarzenbach's avatar Eric Schwarzenbach
Browse files

Fix TimestampedScoredNetwork parceling logic.

Bug: 65379063
Test: make -j40 RunSettingsLibRoboTests

Change-Id: I6a6c183fe065f36fcc8d4a25637f98dfdaad350d
parent f6ec6561
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class TimestampedScoredNetwork implements Parcelable {

    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeParcelable(mScore, flags);
        mScore.writeToParcel(dest, flags);
        dest.writeLong(mUpdatedTimestampMillis);
    }

+71 −0
Original line number Diff line number Diff line
/*
 * 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.SettingsLibRobolectricTestRunner;
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(SettingsLibRobolectricTestRunner.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());
  }
}