react-native-navigation 7.24.2 → 7.24.3-snapshot.492

package/lib/android/app/src/test/java/com/reactnativenavigation/options/parsers/ColorParseTest.java

@@ -1,50 +0,0 @@
-package com.reactnativenavigation.options.parsers;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.JavaOnlyArray;
-import com.facebook.react.bridge.JavaOnlyMap;
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.options.params.DontApplyColour;
-import com.reactnativenavigation.options.params.ReactPlatformColor;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-import android.app.Activity;
-
-public class ColorParseTest extends BaseTest {
-
-    Activity activity;
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        activity = newActivity();
-    }
-
-    @Test
-    public void nullIsParsedAsNoColor() throws JSONException {
-        JSONObject json = new JSONObject();
-        json.put("color", "NoColor");
-        assertThat(ColorParser.parse(null, json, "color")).isInstanceOf(DontApplyColour.class);
-    }
-
-    @Test
-    public void shouldParsePlatformColors() throws JSONException {
-        JSONObject color = new JSONObject();
-        final JSONArray jsonArray = new JSONArray();
-        jsonArray.put("@color/colorPrimary");
-        color.put("resource_paths",
-                jsonArray);
-        try (MockedStatic<Arguments> theMock = Mockito.mockStatic(Arguments.class)) {
-            theMock.when(Arguments::createMap).thenReturn(new JavaOnlyMap());
-            theMock.when(Arguments::createArray).thenReturn(new JavaOnlyArray());
-            assertThat(ColorParser.parse(activity, color, "color")).isInstanceOf(ReactPlatformColor.class);
-        }
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/options/parsers/JSONParserTest.java

@@ -1,64 +0,0 @@
-package com.reactnativenavigation.options.parsers;
-
-import com.facebook.react.bridge.JavaOnlyArray;
-import com.facebook.react.bridge.JavaOnlyMap;
-import com.reactnativenavigation.BaseTest;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Test;
-
-import static org.assertj.core.api.Java6Assertions.assertThat;
-
-public class JSONParserTest extends BaseTest {
-    @Test
-    public void parsesMap() throws Exception {
-        JavaOnlyMap input = new JavaOnlyMap();
-        input.putString("keyString", "stringValue");
-        input.putInt("keyInt", 123);
-        input.putDouble("keyDouble", 123.456);
-        input.putBoolean("keyBoolean", true);
-        input.putArray("keyArray", new JavaOnlyArray());
-        input.putMap("keyMap", new JavaOnlyMap());
-        input.putNull("bla");
-
-        JSONObject result = new JSONParser().parse(input);
-
-
-        assertThat(result.keys()).containsOnly(
-                "keyString",
-                "keyInt",
-                "keyDouble",
-                "keyBoolean",
-                "keyMap",
-                "keyArray");
-
-        assertThat(result.get("keyString")).isEqualTo("stringValue");
-        assertThat(result.get("keyInt")).isEqualTo(123);
-        assertThat(result.get("keyDouble")).isEqualTo(123.456);
-        assertThat(result.get("keyBoolean")).isEqualTo(true);
-        assertThat(result.getJSONObject("keyMap").keys()).isEmpty();
-        assertThat(result.getJSONArray("keyArray").length()).isZero();
-    }
-
-    @Test
-    public void parsesArrays() throws Exception {
-        JavaOnlyArray input = new JavaOnlyArray();
-        input.pushString("Hello");
-        input.pushInt(123);
-        input.pushDouble(123.456);
-        input.pushBoolean(true);
-        input.pushArray(new JavaOnlyArray());
-        input.pushMap(new JavaOnlyMap());
-        input.pushNull();
-
-        JSONArray result = new JSONParser().parse(input);
-        assertThat(result.length()).isEqualTo(6);
-        assertThat(result.get(0)).isEqualTo("Hello");
-        assertThat(result.get(1)).isEqualTo(123);
-        assertThat(result.get(2)).isEqualTo(123.456);
-        assertThat(result.get(3)).isEqualTo(true);
-        assertThat(result.getJSONArray(4).length()).isZero();
-        assertThat(result.getJSONObject(5).keys()).isEmpty();
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/PresenterTest.java

@@ -1,56 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-import android.app.Activity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.options.Options;
-import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.utils.SystemUiUtils;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.Presenter;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public class PresenterTest extends BaseTest {
-    private Presenter uut;
-    private Activity activity;
-    private ViewController<ViewGroup> controller;
-
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        activity = newActivity();
-        controller = mock(ViewController.class);
-        uut = new Presenter(activity, Options.EMPTY);
-    }
-
-    @Test
-    public void mergeStatusBarVisible_callsShowHide() {
-        mockSystemUiUtils(1,1,(mockedStatic)->{
-            ViewGroup spy = Mockito.spy(new FrameLayout(activity));
-            Mockito.when(controller.getView()).thenReturn(spy);
-            Mockito.when(controller.resolveCurrentOptions()).thenReturn(Options.EMPTY);
-            Options options = new Options();
-            options.statusBar.visible = new Bool(false);
-            uut.mergeOptions(controller, options);
-            mockedStatic.verify(
-                    ()-> SystemUiUtils.hideStatusBar(any(),eq(spy)),times(1));
-
-            options.statusBar.visible = new Bool(true);
-            uut.mergeOptions(controller, options);
-            mockedStatic.verify(
-                    ()-> SystemUiUtils.showStatusBar(any(),eq(spy)),times(1));
-        });
-
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/RenderCheckerTest.java

@@ -1,59 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.utils.RenderChecker;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import java.util.Arrays;
-import java.util.Collection;
-
-import static com.reactnativenavigation.utils.CollectionUtils.forEach;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class RenderCheckerTest extends BaseTest {
-    private RenderChecker uut;
-
-    @Override
-    public void beforeEach() {
-        uut = new RenderChecker();
-    }
-
-    @Test
-    public void areRendered() {
-        Collection<ViewController<?>> items = Arrays.asList(
-                renderedComponent(),
-                renderedComponent(),
-                renderedComponent()
-        );
-        assertThat(uut.areRendered(items)).isTrue();
-        forEach(items, i -> verify(i).isRendered());
-    }
-
-    @Test
-    public void areRendered_reduce() {
-        Collection<ViewController<?>> items = Arrays.asList(
-                renderedComponent(),
-                notRenderedComponent(),
-                renderedComponent()
-        );
-        assertThat(uut.areRendered(items)).isFalse();
-
-    }
-
-    private ViewController<?> renderedComponent() {
-        ViewController<?> mock = Mockito.mock(ViewController.class);
-        when(mock.isRendered()).then(__ -> true);
-        return mock;
-    }
-
-    private ViewController<?> notRenderedComponent() {
-        ViewController<?> mock = Mockito.mock(ViewController.class);
-        when(mock.isRendered()).then(__ -> false);
-        return mock;
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/presentation/SideMenuPresenterTest.java

@@ -1,35 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.viewcontrollers.sidemenu.SideMenuPresenter;
-import com.reactnativenavigation.options.SideMenuRootOptions;
-import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.views.sidemenu.SideMenu;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import static org.junit.Assert.assertFalse;
-
-public class SideMenuPresenterTest extends BaseTest {
-    private SideMenuPresenter uut;
-
-    @Override
-    public void beforeEach() {
-        uut = new SideMenuPresenter();
-        SideMenu sideMenu = Mockito.mock(SideMenu.class);
-        uut.bindView(sideMenu);
-    }
-
-    @Test
-    public void mergeVisibility_visibilityOptionsAreConsumed() {
-        SideMenuRootOptions options = new SideMenuRootOptions();
-        options.left.visible = new Bool(true);
-        options.right.visible = new Bool(true);
-
-        uut.mergeOptions(options);
-
-        assertFalse(options.right.visible.hasValue());
-        assertFalse(options.left.visible.hasValue());
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/react/NavigationModuleTest.java

@@ -1,102 +0,0 @@
-package com.reactnativenavigation.react;
-
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.NavigationActivity;
-import com.reactnativenavigation.options.LayoutFactory;
-import com.reactnativenavigation.options.LayoutNode;
-import com.reactnativenavigation.options.parsers.JSONParser;
-import com.reactnativenavigation.viewcontrollers.viewcontroller.ViewController;
-import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.robolectric.annotation.LooperMode;
-import org.robolectric.shadows.ShadowLooper;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-@LooperMode(LooperMode.Mode.PAUSED)
-public class NavigationModuleTest extends BaseTest {
-    private NavigationModule uut;
-    private Navigator navigator;
-    private JSONParser jsonParser;
-    private NavigationActivity activity;
-    private ReactApplicationContext reactApplicationContext;
-    private LayoutFactory layoutFactory;
-
-    @Override
-    public void beforeEach() {
-        jsonParser = mock(JSONParser.class);
-        navigator = mock(Navigator.class);
-        activity = mockActivity();
-        reactApplicationContext = mock(ReactApplicationContext.class);
-        layoutFactory = mock(LayoutFactory.class);
-
-        uut = spy(new NavigationModule(
-                reactApplicationContext,
-                mock(ReactInstanceManager.class),
-                jsonParser,
-                layoutFactory
-        ));
-    }
-
-    @Test
-    public void setRoot_delegatesToNavigator() throws JSONException {
-        when(reactApplicationContext.getCurrentActivity()).thenReturn(activity);
-        ReadableMap root = mock(ReadableMap.class);
-        when(jsonParser.parse(root)).thenReturn(rootJson());
-        ViewController rootViewController = mock(ViewController.class);
-        when(layoutFactory.create(any(LayoutNode.class))).thenReturn(rootViewController);
-
-        uut.setRoot("1", root, mock(Promise.class));
-        ShadowLooper.idleMainLooper();
-        verify(navigator).setRoot(eq(rootViewController), any(), any());
-    }
-
-    @Test
-    public void postCommandsOnMainThread_doesNotCrashIfActivityIsNull() {
-        NavigationModule spy = spy(uut);
-        when(spy.activity()).thenReturn(mock(NavigationActivity.class));
-        Runnable runnable = mock(Runnable.class);
-        spy.handle(runnable);
-        ShadowLooper.idleMainLooper();
-        verify(runnable).run();
-
-        when(spy.activity()).thenReturn(null);
-        Runnable dontRun = mock(Runnable.class);
-        spy.handle(dontRun);
-        ShadowLooper.idleMainLooper();
-        verify(dontRun, times(0)).run();
-    }
-
-    private NavigationActivity mockActivity() {
-        NavigationActivity activity = mock(NavigationActivity.class);
-        when(activity.getNavigator()).thenReturn(navigator);
-        return activity;
-    }
-
-    private JSONObject rootJson() throws JSONException {
-        JSONObject root = new JSONObject();
-        root.put("root", componentJson());
-        return root;
-    }
-
-    private JSONObject componentJson() throws JSONException {
-        JSONObject component = new JSONObject();
-        component.put("id", "Component1");
-        component.put("type", "Component");
-        component.put("data", new JSONObject().put("name", "mockComponent"));
-        return component;
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/react/ReloadListenerTest.java

@@ -1,24 +0,0 @@
-package com.reactnativenavigation.react;
-
-import com.reactnativenavigation.BaseTest;
-
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class ReloadListenerTest extends BaseTest {
-    private ReloadHandler uut;
-    private Runnable handler;
-
-    @Override
-    public void beforeEach() {
-        handler = Mockito.mock(Runnable.class);
-        uut = new ReloadHandler();
-    }
-
-    @Test
-    public void onSuccess_viewsAreDestroyed() {
-        uut.setOnReloadListener(handler);
-        uut.onSuccess();
-        Mockito.verify(handler).run();
-    }
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/utils/AnimationHelper.kt

@@ -1,33 +0,0 @@
-package com.reactnativenavigation.utils
-
-import com.reactnativenavigation.options.AnimationOptions
-import com.reactnativenavigation.options.ValueAnimationOptions
-import com.reactnativenavigation.options.animations.ViewAnimationOptions
-import org.json.JSONObject
-
-
-fun createEnterExitAnimation(duration: Int = 300): ViewAnimationOptions {
-    val alpha = JSONObject().apply {
-        put("alpha", JSONObject().apply {
-            put("from", 0)
-            put("to", 0)
-            put("duration", duration)
-        })
-    }
-    val animation = JSONObject().apply {
-        put("enter", alpha)
-        put("exit", alpha)
-    }
-    return ViewAnimationOptions(animation)
-}
-
-fun createContentJson(vararg values: Pair<String, ValueAnimationOptions>): AnimationOptions {
-    val content = JSONObject()
-    values.forEach {
-        content.put(it.first, JSONObject().apply {
-            put("from", it.second.from)
-            put("to", it.second.to)
-        })
-    }
-    return AnimationOptions(content)
-}

package/lib/android/app/src/test/java/com/reactnativenavigation/utils/ButtonPresenterTest.java

@@ -1,241 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.app.Activity;
-import android.content.res.Configuration;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
-import android.text.SpannableString;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import androidx.appcompat.widget.ActionMenuView;
-
-import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.fakes.IconResolverFake;
-import com.reactnativenavigation.mocks.ImageLoaderMock;
-import com.reactnativenavigation.options.ButtonOptions;
-import com.reactnativenavigation.options.IconBackgroundOptions;
-import com.reactnativenavigation.options.params.Bool;
-import com.reactnativenavigation.options.params.Colour;
-import com.reactnativenavigation.options.params.Number;
-import com.reactnativenavigation.options.params.ThemeColour;
-import com.reactnativenavigation.options.params.Text;
-import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonController;
-import com.reactnativenavigation.viewcontrollers.stack.topbar.button.ButtonPresenter;
-import com.reactnativenavigation.views.stack.topbar.titlebar.ButtonBar;
-import com.reactnativenavigation.views.stack.topbar.titlebar.IconBackgroundDrawable;
-import com.reactnativenavigation.views.stack.topbar.titlebar.TitleBarButtonCreator;
-
-import org.junit.Test;
-import org.robolectric.annotation.LooperMode;
-import org.robolectric.shadows.ShadowLooper;
-
-import static java.util.Objects.requireNonNull;
-import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-@LooperMode(LooperMode.Mode.PAUSED)
-public class ButtonPresenterTest extends BaseTest {
-    private static final String BTN_TEXT = "button1";
-
-    private ButtonBar titleBar;
-    private ButtonPresenter uut;
-    private ButtonController buttonController;
-    private ButtonOptions button;
-    private Activity activity;
-
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        activity = newActivity();
-        titleBar = new ButtonBar(activity);
-        activity.setContentView(titleBar);
-        button = createButton();
-        ImageLoader imageLoaderMock;
-
-        imageLoaderMock = ImageLoaderMock.mock();
-        initUUt(imageLoaderMock);
-    }
-
-    private void initUUt(ImageLoader imageLoaderMock) {
-        IconResolverFake iconResolver = new IconResolverFake(activity, imageLoaderMock);
-        uut = new ButtonPresenter(activity, button, iconResolver);
-        buttonController = new ButtonController(
-                activity,
-                uut,
-                button,
-                mock(TitleBarButtonCreator.class),
-                mock(ButtonController.OnClickListener.class)
-        );
-    }
-
-    @Test
-    public void applyOptions_buttonIsAddedToMenu() {
-        addButtonAndApplyOptions();
-        assertThat(findButtonView().getText().toString()).isEqualTo(BTN_TEXT);
-    }
-
-    @Test
-    public void applyOptions_appliesColorOnButtonTextView() {
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        addButtonAndApplyOptions();
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.RED);
-    }
-
-    @Test
-    public void applyOptions_appliesColorOnButtonTextViewOnDarkMode() {
-        mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_NO;
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.BLACK));
-        MenuItem menuItem = addButtonAndApplyOptions();
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.RED);
-
-        mockConfiguration.uiMode = Configuration.UI_MODE_NIGHT_YES;
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.BLACK);
-
-    }
-
-    @Test
-    public void apply_disabledColor() {
-        button.enabled = new Bool(false);
-        addButtonAndApplyOptions();
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(ButtonPresenter.DISABLED_COLOR);
-    }
-
-    @Test
-    public void applyColor_shouldChangeColor() {
-        MenuItem menuItem = addMenuButton();
-
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-        ThemeColour color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        uut.applyColor(titleBar, menuItem, color);
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.RED);
-    }
-
-    @Test
-    public void applyOptions_shouldChangeIconColorTint() {
-        IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);
-        initUUt(ImageLoaderMock.mock(mockD));
-        button.enabled = new Bool(true);
-        button.icon = new Text("icon");
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        MenuItem menuItem = spy(addMenuButton());
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-
-        Drawable icon = menuItem.getIcon();
-        assertThat(icon).isNotNull();
-        verify(icon).setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
-    }
-
-    @Test
-    public void applyOptions_shouldChangeIconDisabledColorTint() {
-        IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);
-        initUUt(ImageLoaderMock.mock(mockD));
-        button.enabled = new Bool(false);
-        button.icon = new Text("icon");
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        button.disabledColor = new ThemeColour(new Colour(Color.YELLOW), new Colour(Color.YELLOW));
-        MenuItem menuItem = spy(addMenuButton());
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-
-        Drawable icon = menuItem.getIcon();
-        assertThat(icon).isNotNull();
-        verify(icon).setColorFilter(new PorterDuffColorFilter(Color.YELLOW, PorterDuff.Mode.SRC_IN));
-    }
-
-    @Test
-    public void applyOptions_shouldChangeIconColorBackground() {
-        IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);
-        initUUt(ImageLoaderMock.mock(mockD));
-        button.enabled = new Bool(true);
-        button.icon = new Text("icon");
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        IconBackgroundOptions iconBackground = new IconBackgroundOptions();
-        iconBackground.color = new ThemeColour(new Colour(Color.GREEN),new Colour(Color.GREEN));
-        button.iconBackground = iconBackground;
-        MenuItem menuItem = spy(addMenuButton());
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-
-        Drawable icon = menuItem.getIcon();
-        assertThat(icon).isNotNull();
-        assertThat(icon).isInstanceOf(IconBackgroundDrawable.class);
-        IconBackgroundDrawable modifed = (IconBackgroundDrawable) icon;
-        verify(modifed.getWrappedDrawable()).setColorFilter(new PorterDuffColorFilter(Color.RED, PorterDuff.Mode.SRC_IN));
-        assertThat(modifed.getBackgroundColor()).isEqualTo(Color.GREEN);
-    }
-
-    @Test
-    public void applyOptions_shouldChangeIconDisabledColorBackground() {
-        IconBackgroundDrawable mockD = mock(IconBackgroundDrawable.class);
-        initUUt(ImageLoaderMock.mock(mockD));
-        button.enabled = new Bool(false);
-        button.icon = new Text("icon");
-        button.color = new ThemeColour(new Colour(Color.RED), new Colour(Color.RED));
-        button.disabledColor = new ThemeColour(new Colour(Color.YELLOW), new Colour(Color.YELLOW));
-        IconBackgroundOptions iconBackground = new IconBackgroundOptions();
-        iconBackground.color = new ThemeColour( new Colour(Color.GREEN), new Colour(Color.GREEN));
-        iconBackground.disabledColor = new ThemeColour(new Colour(Color.CYAN),new Colour(Color.CYAN));
-        button.iconBackground = iconBackground;
-        MenuItem menuItem = spy(addMenuButton());
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-
-        Drawable icon = menuItem.getIcon();
-        assertThat(icon).isNotNull();
-        assertThat(icon).isInstanceOf(IconBackgroundDrawable.class);
-        IconBackgroundDrawable modifed = (IconBackgroundDrawable) icon;
-        verify(modifed.getWrappedDrawable()).setColorFilter(new PorterDuffColorFilter(Color.YELLOW, PorterDuff.Mode.SRC_IN));
-        assertThat(modifed.getBackgroundColor()).isEqualTo(Color.CYAN);
-    }
-
-    @Test
-    public void applyColor_shouldChangeDisabledColor() {
-        button.enabled = new Bool(false);
-        MenuItem menuItem = addMenuButton();
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-        ThemeColour disabledColor = new ThemeColour(new Colour(Color.BLUE), new Colour(Color.BLUE));
-        uut.applyDisabledColor(titleBar, menuItem, disabledColor);
-        assertThat(findButtonView().getCurrentTextColor()).isEqualTo(Color.BLUE);
-    }
-
-    private MenuItem addButtonAndApplyOptions() {
-        MenuItem menuItem = addMenuButton();
-        uut.applyOptions(titleBar, menuItem, buttonController::getView);
-        return menuItem;
-    }
-
-    private MenuItem addMenuButton() {
-        return titleBar.addButton(Menu.NONE,
-                1,
-                0,
-                SpannableString.valueOf(button.text.get("text")));
-    }
-
-    @Test
-    public void apply_allCaps() {
-        button.allCaps = new Bool(false);
-        addButtonAndApplyOptions();
-        assertThat(findButtonView().isAllCaps()).isEqualTo(false);
-    }
-
-    private TextView findButtonView() {
-        ShadowLooper.idleMainLooper();
-        return (TextView) ViewUtils.findChildrenByClass(
-                requireNonNull(ViewUtils.findChildByClass(titleBar, ActionMenuView.class)),
-                TextView.class,
-                child -> true
-        ).get(0);
-    }
-
-    private ButtonOptions createButton() {
-        ButtonOptions b = new ButtonOptions();
-        b.id = "btn1";
-        b.text = new Text(BTN_TEXT);
-        b.showAsAction = new Number(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        return b;
-    }
-}