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

Commit fc2dbd04 authored by Xia Wang's avatar Xia Wang
Browse files

* Move connectivity manager test closer to source. 

 * Add license header to java files
 * Remove google related information from the test

Change-Id: I2e57960f9ac963cdf3591385e21ed68832f74bd0
parent 0ee0a2ea

tests/ConnectivityManagerTest/Android.mk→core/tests/ConnectivityManagerTest/Android.mk

+1 −1
Original line number Diff line number Diff line 
# Copyright 2010, The Android Open Source Project

# Copyright (C) 2010, 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.

tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java→core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestActivity.java

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010, 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.connectivitymanagertest;



import android.app.Activity;

tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestRunner.java→core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/ConnectivityManagerTestRunner.java

+18 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010, 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.connectivitymanagertest;



import android.os.Bundle;
@@ -13,7 +29,7 @@ import junit.framework.TestSuite; 
 *

 * To run the connectivity manager tests:

 *

 * adb shell am instrument \

 * adb shell am instrument -e ssid <ssid> \

 *     -w com.android.connectivitymanagertest/.ConnectivityManagerTestRunner

 */
@@ -39,5 +55,5 @@ public class ConnectivityManagerTestRunner extends InstrumentationTestRunner { 
        }

    }



    public String TEST_SSID = "GoogleGuest";

    public String TEST_SSID = null;

}

tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/NetworkState.java→core/tests/ConnectivityManagerTest/src/com/android/connectivitymanagertest/NetworkState.java

+16 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 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.connectivitymanagertest;



import android.net.NetworkInfo.State;