diff options
author | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-08-22 10:33:59 +0200 |
---|---|---|
committer | Tobrun Van Nuland <tobrun.van.nuland@gmail.com> | 2017-08-22 10:34:15 +0200 |
commit | b377586cb7f67506068a6cbcd706dfd39709d667 (patch) | |
tree | fc4b8646f69a90bb1883d6c18205ea1e1cd75ab0 | |
parent | a059c74a54302f9604f3e3b28143be7645e6204f (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-limit-ci-tests.tar.gz |
[android] - remove transition option testsupstream/tvn-limit-ci-tests
8 files changed, 0 insertions, 928 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java index 0e4cf6a8ca..5bfde251ff 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/BackgroundLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -80,24 +79,6 @@ public class BackgroundLayerTest extends BaseActivityTest { } @Test - public void testBackgroundColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("background-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setBackgroundColorTransition(options); - assertEquals(layer.getBackgroundColorTransition(), options); - } - }); - } - - @Test public void testBackgroundColorAsConstant() { validateTestSetup(); setupLayer(); @@ -164,24 +145,6 @@ public class BackgroundLayerTest extends BaseActivityTest { } @Test - public void testBackgroundPatternTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("background-patternTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setBackgroundPatternTransition(options); - assertEquals(layer.getBackgroundPatternTransition(), options); - } - }); - } - - @Test public void testBackgroundPatternAsConstant() { validateTestSetup(); setupLayer(); @@ -230,24 +193,6 @@ public class BackgroundLayerTest extends BaseActivityTest { } @Test - public void testBackgroundOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("background-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setBackgroundOpacityTransition(options); - assertEquals(layer.getBackgroundOpacityTransition(), options); - } - }); - } - - @Test public void testBackgroundOpacityAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java index 559e446307..f2aa2981cb 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/CircleLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -108,24 +107,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleRadiusTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-radiusTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleRadiusTransition(options); - assertEquals(layer.getCircleRadiusTransition(), options); - } - }); - } - - @Test public void testCircleRadiusAsConstant() { validateTestSetup(); setupLayer(); @@ -308,24 +289,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleColorTransition(options); - assertEquals(layer.getCircleColorTransition(), options); - } - }); - } - - @Test public void testCircleColorAsConstant() { validateTestSetup(); setupLayer(); @@ -485,24 +448,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleBlurTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-blurTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleBlurTransition(options); - assertEquals(layer.getCircleBlurTransition(), options); - } - }); - } - - @Test public void testCircleBlurAsConstant() { validateTestSetup(); setupLayer(); @@ -685,24 +630,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleOpacityTransition(options); - assertEquals(layer.getCircleOpacityTransition(), options); - } - }); - } - - @Test public void testCircleOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -885,24 +812,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleTranslateTransition(options); - assertEquals(layer.getCircleTranslateTransition(), options); - } - }); - } - - @Test public void testCircleTranslateAsConstant() { validateTestSetup(); setupLayer(); @@ -1096,24 +1005,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleStrokeWidthTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-stroke-widthTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleStrokeWidthTransition(options); - assertEquals(layer.getCircleStrokeWidthTransition(), options); - } - }); - } - - @Test public void testCircleStrokeWidthAsConstant() { validateTestSetup(); setupLayer(); @@ -1296,24 +1187,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleStrokeColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-stroke-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleStrokeColorTransition(options); - assertEquals(layer.getCircleStrokeColorTransition(), options); - } - }); - } - - @Test public void testCircleStrokeColorAsConstant() { validateTestSetup(); setupLayer(); @@ -1473,24 +1346,6 @@ public class CircleLayerTest extends BaseActivityTest { } @Test - public void testCircleStrokeOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("circle-stroke-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setCircleStrokeOpacityTransition(options); - assertEquals(layer.getCircleStrokeOpacityTransition(), options); - } - }); - } - - @Test public void testCircleStrokeOpacityAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java index 66c6093537..aa92a3d6ab 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillExtrusionLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -108,24 +107,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionOpacityTransition(options); - assertEquals(layer.getFillExtrusionOpacityTransition(), options); - } - }); - } - - @Test public void testFillExtrusionOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -175,24 +156,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionColorTransition(options); - assertEquals(layer.getFillExtrusionColorTransition(), options); - } - }); - } - - @Test public void testFillExtrusionColorAsConstant() { validateTestSetup(); setupLayer(); @@ -352,24 +315,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionTranslateTransition(options); - assertEquals(layer.getFillExtrusionTranslateTransition(), options); - } - }); - } - - @Test public void testFillExtrusionTranslateAsConstant() { validateTestSetup(); setupLayer(); @@ -467,24 +412,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionPatternTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-patternTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionPatternTransition(options); - assertEquals(layer.getFillExtrusionPatternTransition(), options); - } - }); - } - - @Test public void testFillExtrusionPatternAsConstant() { validateTestSetup(); setupLayer(); @@ -533,24 +460,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionHeightTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-heightTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionHeightTransition(options); - assertEquals(layer.getFillExtrusionHeightTransition(), options); - } - }); - } - - @Test public void testFillExtrusionHeightAsConstant() { validateTestSetup(); setupLayer(); @@ -733,24 +642,6 @@ public class FillExtrusionLayerTest extends BaseActivityTest { } @Test - public void testFillExtrusionBaseTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-extrusion-baseTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillExtrusionBaseTransition(options); - assertEquals(layer.getFillExtrusionBaseTransition(), options); - } - }); - } - - @Test public void testFillExtrusionBaseAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java index 939bcb6892..e09486c0da 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/FillLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -156,24 +155,6 @@ public class FillLayerTest extends BaseActivityTest { } @Test - public void testFillOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillOpacityTransition(options); - assertEquals(layer.getFillOpacityTransition(), options); - } - }); - } - - @Test public void testFillOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -356,24 +337,6 @@ public class FillLayerTest extends BaseActivityTest { } @Test - public void testFillColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillColorTransition(options); - assertEquals(layer.getFillColorTransition(), options); - } - }); - } - - @Test public void testFillColorAsConstant() { validateTestSetup(); setupLayer(); @@ -533,24 +496,6 @@ public class FillLayerTest extends BaseActivityTest { } @Test - public void testFillOutlineColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-outline-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillOutlineColorTransition(options); - assertEquals(layer.getFillOutlineColorTransition(), options); - } - }); - } - - @Test public void testFillOutlineColorAsConstant() { validateTestSetup(); setupLayer(); @@ -710,24 +655,6 @@ public class FillLayerTest extends BaseActivityTest { } @Test - public void testFillTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillTranslateTransition(options); - assertEquals(layer.getFillTranslateTransition(), options); - } - }); - } - - @Test public void testFillTranslateAsConstant() { validateTestSetup(); setupLayer(); @@ -825,24 +752,6 @@ public class FillLayerTest extends BaseActivityTest { } @Test - public void testFillPatternTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("fill-patternTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setFillPatternTransition(options); - assertEquals(layer.getFillPatternTransition(), options); - } - }); - } - - @Test public void testFillPatternAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java index 8123d24be8..c9ca3fc617 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LineLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -359,24 +358,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineOpacityTransition(options); - assertEquals(layer.getLineOpacityTransition(), options); - } - }); - } - - @Test public void testLineOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -559,24 +540,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineColorTransition(options); - assertEquals(layer.getLineColorTransition(), options); - } - }); - } - - @Test public void testLineColorAsConstant() { validateTestSetup(); setupLayer(); @@ -736,24 +699,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineTranslateTransition(options); - assertEquals(layer.getLineTranslateTransition(), options); - } - }); - } - - @Test public void testLineTranslateAsConstant() { validateTestSetup(); setupLayer(); @@ -851,24 +796,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineWidthTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-widthTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineWidthTransition(options); - assertEquals(layer.getLineWidthTransition(), options); - } - }); - } - - @Test public void testLineWidthAsConstant() { validateTestSetup(); setupLayer(); @@ -1051,24 +978,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineGapWidthTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-gap-widthTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineGapWidthTransition(options); - assertEquals(layer.getLineGapWidthTransition(), options); - } - }); - } - - @Test public void testLineGapWidthAsConstant() { validateTestSetup(); setupLayer(); @@ -1251,24 +1160,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineOffsetTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-offsetTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineOffsetTransition(options); - assertEquals(layer.getLineOffsetTransition(), options); - } - }); - } - - @Test public void testLineOffsetAsConstant() { validateTestSetup(); setupLayer(); @@ -1451,24 +1342,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineBlurTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-blurTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineBlurTransition(options); - assertEquals(layer.getLineBlurTransition(), options); - } - }); - } - - @Test public void testLineBlurAsConstant() { validateTestSetup(); setupLayer(); @@ -1651,24 +1524,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLineDasharrayTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-dasharrayTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLineDasharrayTransition(options); - assertEquals(layer.getLineDasharrayTransition(), options); - } - }); - } - - @Test public void testLineDasharrayAsConstant() { validateTestSetup(); setupLayer(); @@ -1717,24 +1572,6 @@ public class LineLayerTest extends BaseActivityTest { } @Test - public void testLinePatternTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("line-patternTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setLinePatternTransition(options); - assertEquals(layer.getLinePatternTransition(), options); - } - }); - } - - @Test public void testLinePatternAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java index 020effe331..f132a2e982 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/RasterLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -87,24 +86,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterOpacityTransition(options); - assertEquals(layer.getRasterOpacityTransition(), options); - } - }); - } - - @Test public void testRasterOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -154,24 +135,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterHueRotateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-hue-rotateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterHueRotateTransition(options); - assertEquals(layer.getRasterHueRotateTransition(), options); - } - }); - } - - @Test public void testRasterHueRotateAsConstant() { validateTestSetup(); setupLayer(); @@ -221,24 +184,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterBrightnessMinTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-brightness-minTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterBrightnessMinTransition(options); - assertEquals(layer.getRasterBrightnessMinTransition(), options); - } - }); - } - - @Test public void testRasterBrightnessMinAsConstant() { validateTestSetup(); setupLayer(); @@ -288,24 +233,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterBrightnessMaxTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-brightness-maxTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterBrightnessMaxTransition(options); - assertEquals(layer.getRasterBrightnessMaxTransition(), options); - } - }); - } - - @Test public void testRasterBrightnessMaxAsConstant() { validateTestSetup(); setupLayer(); @@ -355,24 +282,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterSaturationTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-saturationTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterSaturationTransition(options); - assertEquals(layer.getRasterSaturationTransition(), options); - } - }); - } - - @Test public void testRasterSaturationAsConstant() { validateTestSetup(); setupLayer(); @@ -422,24 +331,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterContrastTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-contrastTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterContrastTransition(options); - assertEquals(layer.getRasterContrastTransition(), options); - } - }); - } - - @Test public void testRasterContrastAsConstant() { validateTestSetup(); setupLayer(); @@ -489,24 +380,6 @@ public class RasterLayerTest extends BaseActivityTest { } @Test - public void testRasterFadeDurationTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("raster-fade-durationTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setRasterFadeDurationTransition(options); - assertEquals(layer.getRasterFadeDurationTransition(), options); - } - }); - } - - @Test public void testRasterFadeDurationAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java index e2694af348..3acd7a8c40 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/SymbolLayerTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -2733,24 +2732,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconOpacityTransition(options); - assertEquals(layer.getIconOpacityTransition(), options); - } - }); - } - - @Test public void testIconOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -2933,24 +2914,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconColorTransition(options); - assertEquals(layer.getIconColorTransition(), options); - } - }); - } - - @Test public void testIconColorAsConstant() { validateTestSetup(); setupLayer(); @@ -3110,24 +3073,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconHaloColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-halo-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconHaloColorTransition(options); - assertEquals(layer.getIconHaloColorTransition(), options); - } - }); - } - - @Test public void testIconHaloColorAsConstant() { validateTestSetup(); setupLayer(); @@ -3287,24 +3232,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconHaloWidthTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-halo-widthTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconHaloWidthTransition(options); - assertEquals(layer.getIconHaloWidthTransition(), options); - } - }); - } - - @Test public void testIconHaloWidthAsConstant() { validateTestSetup(); setupLayer(); @@ -3487,24 +3414,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconHaloBlurTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-halo-blurTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconHaloBlurTransition(options); - assertEquals(layer.getIconHaloBlurTransition(), options); - } - }); - } - - @Test public void testIconHaloBlurAsConstant() { validateTestSetup(); setupLayer(); @@ -3687,24 +3596,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testIconTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("icon-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setIconTranslateTransition(options); - assertEquals(layer.getIconTranslateTransition(), options); - } - }); - } - - @Test public void testIconTranslateAsConstant() { validateTestSetup(); setupLayer(); @@ -3802,24 +3693,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextOpacityTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-opacityTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextOpacityTransition(options); - assertEquals(layer.getTextOpacityTransition(), options); - } - }); - } - - @Test public void testTextOpacityAsConstant() { validateTestSetup(); setupLayer(); @@ -4002,24 +3875,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextColorTransition(options); - assertEquals(layer.getTextColorTransition(), options); - } - }); - } - - @Test public void testTextColorAsConstant() { validateTestSetup(); setupLayer(); @@ -4179,24 +4034,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextHaloColorTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-halo-colorTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextHaloColorTransition(options); - assertEquals(layer.getTextHaloColorTransition(), options); - } - }); - } - - @Test public void testTextHaloColorAsConstant() { validateTestSetup(); setupLayer(); @@ -4356,24 +4193,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextHaloWidthTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-halo-widthTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextHaloWidthTransition(options); - assertEquals(layer.getTextHaloWidthTransition(), options); - } - }); - } - - @Test public void testTextHaloWidthAsConstant() { validateTestSetup(); setupLayer(); @@ -4556,24 +4375,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextHaloBlurTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-halo-blurTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextHaloBlurTransition(options); - assertEquals(layer.getTextHaloBlurTransition(), options); - } - }); - } - - @Test public void testTextHaloBlurAsConstant() { validateTestSetup(); setupLayer(); @@ -4756,24 +4557,6 @@ public class SymbolLayerTest extends BaseActivityTest { } @Test - public void testTextTranslateTransition() { - validateTestSetup(); - setupLayer(); - Timber.i("text-translateTransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.setTextTranslateTransition(options); - assertEquals(layer.getTextTranslateTransition(), options); - } - }); - } - - @Test public void testTextTranslateAsConstant() { validateTestSetup(); setupLayer(); diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs index 192740f708..b918de6a44 100644 --- a/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs +++ b/platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/layer.junit.ejs @@ -37,7 +37,6 @@ import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; -import com.mapbox.mapboxsdk.style.layers.TransitionOptions; import com.mapbox.mapboxsdk.testapp.activity.espresso.EspressoTestActivity; /** @@ -123,26 +122,6 @@ public class <%- camelize(type) %>LayerTest extends BaseActivityTest { } <% } -%> <% for (const property of properties) { -%> -<% if (property.transition) { -%> - - @Test - public void test<%- camelize(property.name) %>Transition() { - validateTestSetup(); - setupLayer(); - Timber.i("<%- property.name %>TransitionOptions"); - invoke(mapboxMap, new MapboxMapAction.OnInvokeActionListener() { - @Override - public void onInvokeAction(UiController uiController, MapboxMap mapboxMap) { - assertNotNull(layer); - - // Set and Get - TransitionOptions options = new TransitionOptions(300, 100); - layer.set<%- camelize(property.name) %>Transition(options); - assertEquals(layer.get<%- camelize(property.name) %>Transition(), options); - } - }); - } -<% } -%> @Test public void test<%- camelize(property.name) %>AsConstant() { |