test: fix test

vega · Mar 11, 2021 · 42c4ae1 · 42c4ae1
1 parent 6357ba5
commit 42c4ae1
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 35 deletions.
diff --git a/test/compile/mark/encode/position-point.test.ts b/test/compile/mark/encode/position-point.test.ts
@@ -1,4 +1,4 @@
-import {getSizeChannel, X, Y} from '../../../../src/channel';
+import {X, Y} from '../../../../src/channel';
 import {pointPosition} from '../../../../src/compile/mark/encode';
 import {parseUnitModelWithScaleAndLayoutSize} from '../../../util';
 
@@ -29,38 +29,4 @@ describe('compile/mark/encode/position-point', () => {
       expect(mixins[channel]['field']).toEqual(model.getName(channel));
     });
   });
-
-  it('should return correctly for lat/lng with size', () => {
-    const model = parseUnitModelWithScaleAndLayoutSize({
-      data: {
-        url: 'data/zipcodes.csv',
-        format: {
-          type: 'csv'
-        }
-      },
-      mark: {
-        type: 'image',
-        width: 42,
-        height: 42
-      },
-      encoding: {
-        longitude: {
-          field: 'longitude',
-          type: 'quantitative'
-        },
-        latitude: {
-          field: 'latitude',
-          type: 'quantitative'
-        }
-      }
-    });
-
-    [X, Y].forEach(channel => {
-      const mixins = pointPosition(channel, model, {defaultPos: 'zeroOrMin'});
-      expect(mixins[channel]['field']).toEqual(model.getName(channel));
-
-      const sizeChannel = getSizeChannel(channel);
-      expect(mixins[sizeChannel]).toEqual({[sizeChannel]: 42});
-    });
-  });
 });
diff --git a/test/compile/mark/encode/position-range.test.ts b/test/compile/mark/encode/position-range.test.ts
@@ -0,0 +1,39 @@
+import {getSizeChannel, X, Y} from '../../../../src/channel';
+import {rangePosition} from '../../../../src/compile/mark/encode';
+import {parseUnitModelWithScaleAndLayoutSize} from '../../../util';
+
+describe('compile/mark/encode/position-range', () => {
+  it('should return correctly for lat/lng with size', () => {
+    const model = parseUnitModelWithScaleAndLayoutSize({
+      data: {
+        url: 'data/zipcodes.csv',
+        format: {
+          type: 'csv'
+        }
+      },
+      mark: {
+        type: 'image',
+        width: 42,
+        height: 42
+      },
+      encoding: {
+        longitude: {
+          field: 'longitude',
+          type: 'quantitative'
+        },
+        latitude: {
+          field: 'latitude',
+          type: 'quantitative'
+        }
+      }
+    });
+
+    [X, Y].forEach(channel => {
+      const mixins = rangePosition(channel, model, {defaultPos: 'zeroOrMin', defaultPos2: 'zeroOrMin'});
+      expect(mixins[channel + 'c']['field']).toEqual(model.getName(channel));
+
+      const sizeChannel = getSizeChannel(channel);
+      expect(mixins[sizeChannel]).toEqual({value: 42});
+    });
+  });
+});