[WifiScoreReport] Eliminate one name for 50
Bug: 74613347
Test: Unit tests
Change-Id: I6a723bc839955fb52e6c3aa2d76a12a3fe750841
diff --git a/service/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java b/service/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
index 9493503..23ae660 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/VelocityBasedConnectedScoreTest.java
@@ -37,7 +37,6 @@
*/
public class VelocityBasedConnectedScoreTest {
- private static final int CELLULAR_THRESHOLD_SCORE = 50;
class FakeClock extends Clock {
long mWallClockMillis = 1500000000000L;
@@ -109,7 +108,7 @@
mClock.getWallClockMillis());
}
int score = mVelocityBasedConnectedScore.generateScore();
- assertTrue(score > CELLULAR_THRESHOLD_SCORE);
+ assertTrue(score > ConnectedScore.WIFI_TRANSITION_SCORE);
}
/**
@@ -130,6 +129,6 @@
mClock.getWallClockMillis());
}
int score = mVelocityBasedConnectedScore.generateScore();
- assertTrue(score < CELLULAR_THRESHOLD_SCORE);
+ assertTrue(score < ConnectedScore.WIFI_TRANSITION_SCORE);
}
}
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index c47de58..d60264c 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -48,7 +48,6 @@
*/
public class WifiScoreReportTest {
- private static final int CELLULAR_THRESHOLD_SCORE = 50;
class FakeClock extends Clock {
long mWallClockMillis = 1500000000000L;
@@ -189,7 +188,7 @@
mWifiScoreReport.calculateAndReportScore(mWifiInfo, mNetworkAgent, mWifiMetrics);
}
int score = mWifiInfo.score;
- assertTrue(score > CELLULAR_THRESHOLD_SCORE);
+ assertTrue(score > ConnectedScore.WIFI_TRANSITION_SCORE);
}
/**
@@ -212,7 +211,7 @@
mWifiScoreReport.calculateAndReportScore(mWifiInfo, mNetworkAgent, mWifiMetrics);
}
int score = mWifiInfo.score;
- assertTrue(score < CELLULAR_THRESHOLD_SCORE);
+ assertTrue(score < ConnectedScore.WIFI_TRANSITION_SCORE);
verify(mNetworkAgent, atLeast(1)).sendNetworkScore(score);
}
@@ -231,7 +230,7 @@
}
int score = mWifiInfo.score;
verify(mNetworkAgent, atLeast(1)).sendNetworkScore(score);
- assertTrue(oops, score < CELLULAR_THRESHOLD_SCORE);
+ assertTrue(oops, score < ConnectedScore.WIFI_TRANSITION_SCORE);
}
/**
@@ -257,7 +256,7 @@
oops += ":" + mWifiInfo.score;
if (mWifiInfo.score < minScore) minScore = mWifiInfo.score;
}
- assertTrue(oops, minScore > CELLULAR_THRESHOLD_SCORE);
+ assertTrue(oops, minScore > ConnectedScore.WIFI_TRANSITION_SCORE);
}
/**
