add tests for autotype - case of 2d arrays

Author: archmoj

test/jasmine/tests/gl3dlayout_test.js

@@ -399,12 +399,15 @@ describe('Test Gl3d layout defaults', function() {
                 scene: 'scene'
             }]);
 
-            expect(layoutOut.scene.xaxis.autotypenumbers).toBe('strict');
-            expect(layoutOut.scene.yaxis.autotypenumbers).toBe('convert types');
-            expect(layoutOut.scene.zaxis.autotypenumbers).toBe('strict');
-            expect(layoutOut.scene.xaxis.type).toBe('category');
-            expect(layoutOut.scene.yaxis.type).toBe('linear');
-            expect(layoutOut.scene.zaxis.type).toBe('category');
+            var xaxis = layoutOut.scene.xaxis;
+            var yaxis = layoutOut.scene.yaxis;
+            var zaxis = layoutOut.scene.zaxis;
+            expect(xaxis.autotypenumbers).toBe('strict');
+            expect(yaxis.autotypenumbers).toBe('convert types');
+            expect(zaxis.autotypenumbers).toBe('strict');
+            expect(xaxis.type).toBe('category');
+            expect(yaxis.type).toBe('linear');
+            expect(zaxis.type).toBe('category');
         });
 
         it('should enable converting numeric strings using axis.autotypenumbers and inherit defaults from layout.autotypenumbers', function() {
@@ -424,12 +427,112 @@ describe('Test Gl3d layout defaults', function() {
                 scene: 'scene'
             }]);
 
-            expect(layoutOut.scene.xaxis.autotypenumbers).toBe('convert types');
-            expect(layoutOut.scene.yaxis.autotypenumbers).toBe('strict');
-            expect(layoutOut.scene.zaxis.autotypenumbers).toBe('convert types');
-            expect(layoutOut.scene.xaxis.type).toBe('linear');
-            expect(layoutOut.scene.yaxis.type).toBe('category');
-            expect(layoutOut.scene.zaxis.type).toBe('linear');
+            var xaxis = layoutOut.scene.xaxis;
+            var yaxis = layoutOut.scene.yaxis;
+            var zaxis = layoutOut.scene.zaxis;
+            expect(xaxis.autotypenumbers).toBe('convert types');
+            expect(yaxis.autotypenumbers).toBe('strict');
+            expect(zaxis.autotypenumbers).toBe('convert types');
+            expect(xaxis.type).toBe('linear');
+            expect(yaxis.type).toBe('category');
+            expect(zaxis.type).toBe('linear');
+        });
+
+        ['convert types', 'strict'].forEach(function(autotypenumbers) {
+            it('with autotypenumbers: *' + autotypenumbers + '* should autotype *linear* case of 2d array', function() {
+                var typedArray = new Float32Array(2);
+                typedArray[0] = 0;
+                typedArray[1] = 1;
+
+                supplyLayoutDefaults({
+                    scene: {
+                        xaxis: { autotypenumbers: autotypenumbers },
+                        yaxis: { autotypenumbers: autotypenumbers },
+                        zaxis: { autotypenumbers: autotypenumbers }
+                    }
+                }, layoutOut, [{
+                    scene: 'scene',
+                    type: 'surface',
+                    x: [0, 1],
+                    y: typedArray,
+                    z: [
+                        typedArray,
+                        [1, 0]
+                    ]
+                }]);
+
+                var xaxis = layoutOut.scene.xaxis;
+                var yaxis = layoutOut.scene.yaxis;
+                var zaxis = layoutOut.scene.zaxis;
+                expect(xaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(yaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(zaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(xaxis.type).toBe('linear');
+                expect(yaxis.type).toBe('linear');
+                expect(zaxis.type).toBe('linear');
+            });
+        });
+
+        ['convert types', 'strict'].forEach(function(autotypenumbers) {
+            it('with autotypenumbers: *' + autotypenumbers + '* should autotype *category* case of 2d array', function() {
+                supplyLayoutDefaults({
+                    scene: {
+                        xaxis: { autotypenumbers: autotypenumbers },
+                        yaxis: { autotypenumbers: autotypenumbers },
+                        zaxis: { autotypenumbers: autotypenumbers }
+                    }
+                }, layoutOut, [{
+                    scene: 'scene',
+                    type: 'surface',
+                    x: ['A', 'B'],
+                    y: ['C', 'D'],
+                    z: [
+                        ['E', 'F'],
+                        ['F', 'E']
+                    ]
+                }]);
+
+                var xaxis = layoutOut.scene.xaxis;
+                var yaxis = layoutOut.scene.yaxis;
+                var zaxis = layoutOut.scene.zaxis;
+                expect(xaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(yaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(zaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(xaxis.type).toBe('category');
+                expect(yaxis.type).toBe('category');
+                expect(zaxis.type).toBe('category');
+            });
+        });
+
+        ['convert types', 'strict'].forEach(function(autotypenumbers) {
+            it('with autotypenumbers: *' + autotypenumbers + '* should autotype *date* case of 2d array', function() {
+                supplyLayoutDefaults({
+                    scene: {
+                        xaxis: { autotypenumbers: autotypenumbers },
+                        yaxis: { autotypenumbers: autotypenumbers },
+                        zaxis: { autotypenumbers: autotypenumbers }
+                    }
+                }, layoutOut, [{
+                    scene: 'scene',
+                    type: 'surface',
+                    x: ['00-01', '00-02'],
+                    y: ['00-01', '00-02'],
+                    z: [
+                        ['00-01', '00-02'],
+                        ['00-02', '00-01']
+                    ]
+                }]);
+
+                var xaxis = layoutOut.scene.xaxis;
+                var yaxis = layoutOut.scene.yaxis;
+                var zaxis = layoutOut.scene.zaxis;
+                expect(xaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(yaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(zaxis.autotypenumbers).toBe(autotypenumbers);
+                expect(xaxis.type).toBe('date');
+                expect(yaxis.type).toBe('date');
+                expect(zaxis.type).toBe('date');
+            });
         });
     });
 });