[Commits] r2775 - sandbox/gxm/geoext/gxm/tests/lib/widgets

[commits at geoext.org]

Author: marcjansen
Date: 2011-07-24 01:11:02 +0200 (Sun, 24 Jul 2011)
New Revision: 2775

Modified:
   sandbox/gxm/geoext/gxm/tests/lib/widgets/LayerList.test.html
   sandbox/gxm/geoext/gxm/tests/lib/widgets/MapPanel.test.html
Log:
[gxm] fix tests that failed due to newly introduced sorters on the layer store

Modified: sandbox/gxm/geoext/gxm/tests/lib/widgets/LayerList.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/widgets/LayerList.test.html	2011-07-23 22:34:27 UTC (rev 2774)
+++ sandbox/gxm/geoext/gxm/tests/lib/widgets/LayerList.test.html	2011-07-23 23:11:02 UTC (rev 2775)
@@ -103,7 +103,11 @@
                 t.eq(layerpanel.getStore().getCount(), mappanel.map.layers.length, 'store count and map.layers.length are the same');
                 
                 // compairing the managed layers by id:
-                t.eq(layerpanel.getStore().getAt(0).get('layer').id, mappanel.map.layers[0].id, 'managed entities are the same');
+                var firstOrLast = ( mappanel.layers.sorters.get(0).property === 'zindex' 
+                                && mappanel.layers.sorters.get(0).direction === "DESC") 
+                                    ? 'last' 
+                                    : 'first';
+                t.eq(layerpanel.getStore()[firstOrLast]().get('layer').id, mappanel.map.layers[0].id, 'managed entities are the same');
                 
                 // check the generated HTML:
                 var elem = layerpanel.el.dom;

Modified: sandbox/gxm/geoext/gxm/tests/lib/widgets/MapPanel.test.html
===================================================================
--- sandbox/gxm/geoext/gxm/tests/lib/widgets/MapPanel.test.html	2011-07-23 22:34:27 UTC (rev 2774)
+++ sandbox/gxm/geoext/gxm/tests/lib/widgets/MapPanel.test.html	2011-07-23 23:11:02 UTC (rev 2775)
@@ -344,13 +344,19 @@
             t.eq(mappanel.layers.model.modelName, 'gxm_layer', 
                 '...the store has the right modelName "gxm_layer" bound.');
             // check the field "layer"
-            var firstRec = mappanel.layers.first();
+            console.log(mappanel.layers);
+            
+            var firstOrLast = ( mappanel.layers.sorters.get(0).property === 'zindex' 
+                                && mappanel.layers.sorters.get(0).direction === "DESC") 
+                                    ? 'last' 
+                                    : 'first';
+            var rec = mappanel.layers[firstOrLast]();
             // is it an OpenLayers Layer?
-            t.ok(firstRec.get('layer') instanceof OpenLayers.Layer, 
+            t.ok(rec.get('layer') instanceof OpenLayers.Layer, 
                 '...the first record has an attribute layer that is an OpenLayers.Layer-instance.');
             // is it the correct one?
-            t.eq(firstRec.get('layer').id, mappanel.map.layers[0].id, 
-                '...that records layer-field has the correct layer reference (id="' + firstRec.get('layer').id + '").');
+            t.eq(rec.get('layer').id, mappanel.map.layers[0].id, 
+                '...that records layer-field has the correct layer reference (id="' + rec.get('layer').id + '").');
         } else {
             t.fail("mappanel.layers wasn't an instance of GXM.data.LayerStore, fail this test.");
             t.fail("mappanel.layers wasn't an instance of GXM.data.LayerStore, fail this test.");