Vadim Tryshev
14c6c8cee4
1. Make waitXXX methods fail if the condition diesn’t turn true. 2. Waiting for loading to complete in tearDown instead of reloading the model 3. Avoiding waiting for load-complete where loading didn’t start 4. Disabling last test in AddConfigWidgetTest 5. Waiting for loading to complete inside setupAndVerifyContents(), not outside 6. Unifying how we wait for loader to complete 7. Adding more logging Bug: 117332845 Test: running all Nexus tests Change-Id: I3070e1ac2b9161179cc3e0800b0cd8162807389a
89 lines
3.0 KiB
Java
89 lines
3.0 KiB
Java
/*
|
|
* Copyright (C) 2017 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.launcher3.ui.widget;
|
|
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import androidx.test.filters.LargeTest;
|
|
import androidx.test.runner.AndroidJUnit4;
|
|
import androidx.test.uiautomator.By;
|
|
import androidx.test.uiautomator.UiObject2;
|
|
import android.view.View;
|
|
|
|
import com.android.launcher3.ItemInfo;
|
|
import com.android.launcher3.LauncherAppWidgetInfo;
|
|
import com.android.launcher3.LauncherAppWidgetProviderInfo;
|
|
import com.android.launcher3.Workspace.ItemOperator;
|
|
import com.android.launcher3.ui.AbstractLauncherUiTest;
|
|
import com.android.launcher3.util.Condition;
|
|
import com.android.launcher3.util.Wait;
|
|
import com.android.launcher3.util.rule.ShellCommandRule;
|
|
import com.android.launcher3.widget.WidgetCell;
|
|
|
|
import org.junit.Ignore;
|
|
import org.junit.Rule;
|
|
import org.junit.Test;
|
|
import org.junit.runner.RunWith;
|
|
|
|
/**
|
|
* Test to add widget from widget tray
|
|
*/
|
|
@LargeTest
|
|
@RunWith(AndroidJUnit4.class)
|
|
public class AddWidgetTest extends AbstractLauncherUiTest {
|
|
|
|
@Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grandWidgetBind();
|
|
|
|
@Test
|
|
@Ignore
|
|
public void testDragIcon_portrait() throws Throwable {
|
|
lockRotation(true);
|
|
performTest();
|
|
}
|
|
|
|
@Test
|
|
@Ignore
|
|
public void testDragIcon_landscape() throws Throwable {
|
|
lockRotation(false);
|
|
performTest();
|
|
}
|
|
|
|
private void performTest() throws Throwable {
|
|
clearHomescreen();
|
|
mActivityMonitor.startLauncher();
|
|
|
|
final LauncherAppWidgetProviderInfo widgetInfo =
|
|
findWidgetProvider(false /* hasConfigureScreen */);
|
|
|
|
// Open widget tray and wait for load complete.
|
|
final UiObject2 widgetContainer = openWidgetsTray();
|
|
Wait.atMost(null, Condition.minChildCount(widgetContainer, 2), DEFAULT_UI_TIMEOUT);
|
|
|
|
// Drag widget to homescreen
|
|
UiObject2 widget = scrollAndFind(widgetContainer, By.clazz(WidgetCell.class)
|
|
.hasDescendant(By.text(widgetInfo.getLabel(mTargetContext.getPackageManager()))));
|
|
dragToWorkspace(widget, false);
|
|
|
|
assertTrue(mActivityMonitor.itemExists(new ItemOperator() {
|
|
@Override
|
|
public boolean evaluate(ItemInfo info, View view) {
|
|
return info instanceof LauncherAppWidgetInfo &&
|
|
((LauncherAppWidgetInfo) info).providerName.equals(widgetInfo.provider);
|
|
}
|
|
}).call());
|
|
}
|
|
}
|