[Commits] r1494 - in sandbox/cmoullet/ux/StreetViewPanel: tests tests/ux/widgets ux/widgets

Wed Nov 25 21:07:47 CET 2009

Author: cmoullet
Date: 2009-11-25 21:07:47 +0100 (Wed, 25 Nov 2009)
New Revision: 1494

Added:
   sandbox/cmoullet/ux/StreetViewPanel/tests/ux/widgets/StreetViewPanel.html
Modified:
   sandbox/cmoullet/ux/StreetViewPanel/tests/list-tests.html
   sandbox/cmoullet/ux/StreetViewPanel/ux/widgets/StreetViewPanel.js
Log:
Add unit tests


Modified: sandbox/cmoullet/ux/StreetViewPanel/tests/list-tests.html
===================================================================

--- sandbox/cmoullet/ux/StreetViewPanel/tests/list-tests.html	2009-11-25 19:41:21 UTC (rev 1493)
+++ sandbox/cmoullet/ux/StreetViewPanel/tests/list-tests.html	2009-11-25 20:07:47 UTC (rev 1494)
@@ -1,3 +1,3 @@
 <ul id="testlist">
-  <li>ux/widgets/form/GeoNamesSearchCombo.html</li>
+  <li>ux/widgets/StreetViewPanel.html</li>
 </ul>

Added: sandbox/cmoullet/ux/StreetViewPanel/tests/ux/widgets/StreetViewPanel.html
===================================================================
--- sandbox/cmoullet/ux/StreetViewPanel/tests/ux/widgets/StreetViewPanel.html	                        (rev 0)
+++ sandbox/cmoullet/ux/StreetViewPanel/tests/ux/widgets/StreetViewPanel.html	2009-11-25 20:07:47 UTC (rev 1494)
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html debug="true">
+<head>
+
+    <script type="text/javascript" src="http://extjs.cachefly.net/builds/ext-cdn-771.js"></script>
+    <!-- Google Maps API for "localhost" -->
+    <!--
+    <script src='http://maps.google.com/maps?file=api&amp;v=2.104;key=ABQIAAAAjpkAC9ePGem0lIq5XcMiuhR_wWLPFku8Ix9i2SXYRVK3e45q1BQUd_beF8dtzKET_EteAjPdGDwqpQ'></script>
+    -->
+
+    <!-- Google Maps API for "dev.geoext.org" -->
+    <script src='http://maps.google.com/maps?file=api&amp;v=2.104;key=ABQIAAAA_5ak-hsiH4j5bQQn7-k66xTWxvN8zH6Ta_pgIhhU0TB7bG8iAhS99ituPif4lG-2CHXoZ3qenLnK1g'></script>
+
+    <script src="http://openlayers.org/api/2.8/OpenLayers.js"></script>
+    <script type="text/javascript" src="../../../../../trunk/geoext/lib/GeoExt.js"></script>
+
+    <script type="text/javascript" src="../../../ux/widgets/StreetViewPanel.js"></script>
+    <script type="text/javascript" src="../../../ux/control/Click.js"></script>
+    <script type="text/javascript">
+        function test_ctor(t) {
+            t.plan(2);
+
+            // set up
+
+            var c, map = {};
+
+            map = new OpenLayers.Map();
+
+            // test
+
+            c = new GeoExt.ux.StreetViewPanel({
+                renderTo: "StreetViewPanel",
+                map: map
+            });
+            t.ok(c instanceof GeoExt.ux.StreetViewPanel,
+                    "ctor creates a GeoExt.ux.StreetViewPanel object");
+            t.ok(c instanceof Ext.Panel,
+                    "ctor creates an Ext.Panel object");
+            c.destroy();
+        }
+    </script>
+<body>
+<div id="StreetViewPanel"></div>
+</body>
+</html>

Modified: sandbox/cmoullet/ux/StreetViewPanel/ux/widgets/StreetViewPanel.js
===================================================================
--- sandbox/cmoullet/ux/StreetViewPanel/ux/widgets/StreetViewPanel.js	2009-11-25 19:41:21 UTC (rev 1493)
+++ sandbox/cmoullet/ux/StreetViewPanel/ux/widgets/StreetViewPanel.js	2009-11-25 20:07:47 UTC (rev 1494)
@@ -9,7 +9,7 @@
 Ext.namespace('GeoExt.ux');
 
 GeoExt.ux.StreetViewPanel = Ext.extend(Ext.Panel, {
-    
+
     initComponent : function() {
 
         var defConfig = {
@@ -28,33 +28,36 @@
     },
 
     afterRender : function() {
-        var wh = this.ownerCt.getSize();
+        if (this.ownerCt) {
+            var wh = this.ownerCt.getSize();
+            Ext.applyIf(this, wh);
+        }
 
-        Ext.applyIf(this, wh);
-
         GeoExt.ux.StreetViewPanel.superclass.afterRender.call(this);
 
         this.panorama = new GStreetviewPanorama(this.body.dom);
         this.streetviewclient = new GStreetviewClient();
-
-        if (this.mode == 'clickMode') {
-            this.clickControl = new GeoExt.ux.Click({
-                handlerOptions: {
-                    "single": true
-                },
-                panorama: this.panorama,
-                streetviewclient: this.streetviewclient
-            });
-
-            this.map.addControl(this.clickControl);
-            this.clickControl.activate();
+        if (this.map) {
+            if (this.mode == 'clickMode') {
+                this.clickControl = new GeoExt.ux.Click({
+                    handlerOptions: {
+                        "single": true
+                    },
+                    panorama: this.panorama,
+                    streetviewclient: this.streetviewclient
+                });
+                this.map.addControl(this.clickControl);
+                this.clickControl.activate();
+            }
         }
     },
 
     beforeDestroy: function() {
         if (this.mode == 'clickMode') {
-            this.clickControl.deactivate();
-            this.map.removeControl(this.clickControl);
+            if (this.map) {
+                this.clickControl.deactivate();
+                this.map.removeControl(this.clickControl);
+            }
         }
         this.panorama.remove();
         delete this.panorama;

