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

Commit 93ca011c authored by Xia Wang's avatar Xia Wang
Browse files

Make Wi-Fi stress tests output log consistent. 

Fix: record average at the beginning of each iteration

Change-Id: Ia129348dbf79ecf7efc7169b8bbfac3755ccce63
parent 6f7f877c

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiApStress.java

+2 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class WifiApStress 
    private final static String TAG = "WifiApStress";

    private static String NETWORK_ID = "AndroidAPTest";

    private static String PASSWD = "androidwifi";

    private final static String OUTPUT_FILE = "WifiApStressOutput.txt";

    private final static String OUTPUT_FILE = "WifiStressTestOutput.txt";

    private ConnectivityManagerTestActivity mAct;

    private int iterations;

    private PowerManager.WakeLock mWakelock = null;
@@ -75,8 +75,7 @@ public class WifiApStress 
        // write the total number of iterations into output file

        mOutputWriter = new BufferedWriter(new FileWriter(new File(

                Environment.getExternalStorageDirectory(), OUTPUT_FILE)));

        mOutputWriter.write(String.format("iteration %d out of %d"

                + "\n", mLastIteration, iterations));

        mOutputWriter.write(String.format("iteration %d out of %d\n", mLastIteration, iterations));

        mOutputWriter.flush();

        mOutputWriter.close();

        super.tearDown();

core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/stress/WifiStressTest.java

+10 −9
Original line number Diff line number Diff line
@@ -169,15 +169,18 @@ public class WifiStressTest 
    public void testWifiScanning() {

        int scanTimeSum = 0;

        int i;

        int averageScanTime = 0;

        int ssidAppearInScanResultsCount = 0; // count times of given ssid appear in scan results.

        for (i = 0; i < mScanIterations; i++) {

            log("testWifiScanning: iteration: " + i);

            writeOutput(String.format("scan iteration %d out of %d",

            int averageScanTime = 0;

            if (i > 0) {

                averageScanTime = scanTimeSum/i;

            }

            writeOutput(String.format("iteration %d out of %d",

                    i, mScanIterations));

            writeOutput(String.format("average scanning time is %d", averageScanTime));

            writeOutput(String.format("ssid appear %d out of %d scan iterations",

                    ssidAppearInScanResultsCount, mScanIterations));

                    ssidAppearInScanResultsCount, i));

            long startTime = System.currentTimeMillis();

            mAct.scanResultAvailable = false;

            assertTrue("start scan failed", mAct.mWifiManager.startScanActive());
@@ -196,8 +199,6 @@ public class WifiStressTest 
                    if (mAct.scanResultAvailable) {

                        long scanTime = (System.currentTimeMillis() - startTime);

                        scanTimeSum += scanTime;

                        averageScanTime = scanTimeSum/mScanIterations;

                        log("average scanning time: " + averageScanTime);

                        break;

                    }

                }
@@ -224,9 +225,9 @@ public class WifiStressTest 
            }

        }

        if (i == mScanIterations) {

            writeOutput(String.format("scan iteration %d out of %d",

            writeOutput(String.format("iteration %d out of %d",

                    i, mScanIterations));

            writeOutput(String.format("average scanning time is %d", averageScanTime));

            writeOutput(String.format("average scanning time is %d", scanTimeSum/mScanIterations));

            writeOutput(String.format("ssid appear %d out of %d scan iterations",

                    ssidAppearInScanResultsCount, mScanIterations));

        }
@@ -269,7 +270,7 @@ public class WifiStressTest 
            // 1. Put device into sleep

            // 2. Wait for the device to sleep for sometime, very 3G is connected

            // 3. Wake up the device

            writeOutput(String.format("reconnection after sleep iteration %d out of %d",

            writeOutput(String.format("iteration %d out of %d",

                    i, mReconnectIterations));

            log("iteration: " + i);

            turnScreenOff();
@@ -294,7 +295,7 @@ public class WifiStressTest 
                    ConnectivityManagerTestActivity.LONG_TIMEOUT));

        }

        if (i == mReconnectIterations) {

            writeOutput(String.format("reconnection after sleep iteration %d out of %d",

            writeOutput(String.format("iteration %d out of %d",

                    i, mReconnectIterations));

        }

    }