diff options
author | Takeshi Hagikura <thagikura@google.com> | 2015-03-11 13:49:35 +0900 |
---|---|---|
committer | Takeshi Hagikura <thagikura@google.com> | 2015-03-11 14:47:40 +0900 |
commit | 6d4a36dda82026cc9abfa08d3946512bba4fe2e6 (patch) | |
tree | c3e9d05accec18b44ac086f16714408324069c7d /ui/actionbarcompat | |
parent | 9a34d39336a6fecaf9a2242b395173a208626a25 (diff) | |
download | android-6d4a36dda82026cc9abfa08d3946512bba4fe2e6.tar.gz |
Fixes test code that don't compile.
- Removed the double license.
- Removed non-existent classes such as ?????Fragment or ?????Activity which
seemed to be created through the template but haven't been executed.
- Changed the wrong index of the Fragment from 1 to 0.
- Fixes the targetPackage name consistent with the application package.
Change-Id: Id4e5924687ac2320f8ffc4319c4fbadd8523b42e
Diffstat (limited to 'ui/actionbarcompat')
5 files changed, 11 insertions, 113 deletions
diff --git a/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java index 8c1b2be8..767dbbb0 100644 --- a/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java +++ b/ui/actionbarcompat/ActionBarCompat-Basic/Application/tests/src/com/example/android/actionbarcompat/basic/tests/SampleTests.java @@ -1,22 +1,4 @@ /* -* Copyright 2013 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. -*/ - - - -/* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2; public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { private MainActivity mTestActivity; - private BasicFragment mTestFragment; public SampleTests() { super(MainActivity.class); @@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} // All other fields are null or empty. mTestActivity = getActivity(); - mTestFragment = (BasicFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); } /** @@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> //Try to add a message to add context to your assertions. These messages will be shown if //a tests fails and make it easy to understand why a test failed assertNotNull("mTestActivity is null", mTestActivity); - assertNotNull("mTestFragment is null", mTestFragment); } /** * Add more tests below. */ -}
\ No newline at end of file +} diff --git a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java index c91ae2ef..adc025af 100644 --- a/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java +++ b/ui/actionbarcompat/ActionBarCompat-ListPopupMenu/Application/tests/src/com/example/android/actionbarcompat/listpopupmenu/tests/SampleTests.java @@ -1,22 +1,4 @@ /* -* Copyright 2013 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. -*/ - - - -/* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +25,7 @@ import android.test.ActivityInstrumentationTestCase2; public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { private MainActivity mTestActivity; - private ListPopupMenuFragment mTestFragment; + private PopupListFragment mTestFragment; public SampleTests() { super(MainActivity.class); @@ -58,8 +40,8 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} // All other fields are null or empty. mTestActivity = getActivity(); - mTestFragment = (ListPopupMenuFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); + mTestFragment = (PopupListFragment) + mTestActivity.getSupportFragmentManager().getFragments().get(0); } /** @@ -76,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> * Add more tests below. */ -}
\ No newline at end of file +} diff --git a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java index 9e592f5b..a6ee4ae7 100644 --- a/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java +++ b/ui/actionbarcompat/ActionBarCompat-ListViewModalSelect/Application/tests/src/com/example/android/actionbarcompat/listviewmodalselect/tests/SampleTests.java @@ -1,22 +1,4 @@ /* -* Copyright 2013 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. -*/ - - - -/* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +25,7 @@ import android.test.ActivityInstrumentationTestCase2; public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { private MainActivity mTestActivity; - private ActionBarCompat-ListViewModalSelectFragment mTestFragment; + private CheeseListFragment mTestFragment; public SampleTests() { super(MainActivity.class); @@ -58,8 +40,8 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} // All other fields are null or empty. mTestActivity = getActivity(); - mTestFragment = (ActionBarCompat-ListViewModalSelectFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); + mTestFragment = (CheeseListFragment) + mTestActivity.getSupportFragmentManager().getFragments().get(0); } /** @@ -76,4 +58,4 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> * Add more tests below. */ -}
\ No newline at end of file +} diff --git a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java index e655bcf9..2d56881f 100644 --- a/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java +++ b/ui/actionbarcompat/ActionBarCompat-ShareActionProvider/Application/tests/src/com/example/android/actionbarcompat/shareactionprovider/tests/SampleTests.java @@ -1,22 +1,4 @@ /* -* Copyright 2013 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. -*/ - - - -/* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2; public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { private MainActivity mTestActivity; - private ShareActionProviderFragment mTestFragment; public SampleTests() { super(MainActivity.class); @@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} // All other fields are null or empty. mTestActivity = getActivity(); - mTestFragment = (ShareActionProviderFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); } /** @@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> //Try to add a message to add context to your assertions. These messages will be shown if //a tests fails and make it easy to understand why a test failed assertNotNull("mTestActivity is null", mTestActivity); - assertNotNull("mTestFragment is null", mTestFragment); } /** * Add more tests below. */ -}
\ No newline at end of file +} diff --git a/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java index 204afdc7..1e99f202 100644 --- a/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java +++ b/ui/actionbarcompat/ActionBarCompat-Styled/Application/tests/src/com/example/android/actionbarcompat/styled/tests/SampleTests.java @@ -1,22 +1,4 @@ /* -* Copyright 2013 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. -*/ - - - -/* * Copyright (C) 2013 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -43,7 +25,6 @@ import android.test.ActivityInstrumentationTestCase2; public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> { private MainActivity mTestActivity; - private StyledFragment mTestFragment; public SampleTests() { super(MainActivity.class); @@ -58,8 +39,6 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> // flags = {@link Intent#FLAG_ACTIVITY_NEW_TASK} // All other fields are null or empty. mTestActivity = getActivity(); - mTestFragment = (StyledFragment) - mTestActivity.getSupportFragmentManager().getFragments().get(1); } /** @@ -69,11 +48,10 @@ public class SampleTests extends ActivityInstrumentationTestCase2<MainActivity> //Try to add a message to add context to your assertions. These messages will be shown if //a tests fails and make it easy to understand why a test failed assertNotNull("mTestActivity is null", mTestActivity); - assertNotNull("mTestFragment is null", mTestFragment); } /** * Add more tests below. */ -}
\ No newline at end of file +} |