Skip to content

Commit

Permalink
Migrate src/test/ to ES6 imports
Browse files Browse the repository at this point in the history
  • Loading branch information
danvk committed Dec 3, 2015
1 parent 12519b9 commit 4d93e3f
Show file tree
Hide file tree
Showing 35 changed files with 161 additions and 164 deletions.
10 changes: 5 additions & 5 deletions src/test/BamDataSource-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var Bam = require('../main/bam'),
BamDataSource = require('../main/BamDataSource'),
ContigInterval = require('../main/ContigInterval'),
MappedRemoteFile = require('./MappedRemoteFile');
import Bam from '../main/bam';
import BamDataSource from '../main/BamDataSource';
import ContigInterval from '../main/ContigInterval';
import MappedRemoteFile from './MappedRemoteFile';

describe('BamDataSource', function() {
function getTestSource() {
Expand Down
9 changes: 5 additions & 4 deletions src/test/BigBed-test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var Q = require('q');
var BigBed = require('../main/BigBed');
var ContigInterval = require('../main/ContigInterval');
import Q from 'q';

import BigBed from '../main/BigBed';
import ContigInterval from '../main/ContigInterval';

describe('BigBed', function() {
function getTestBigBed() {
Expand Down
8 changes: 4 additions & 4 deletions src/test/BigBedDataSource-test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var BigBed = require('../main/BigBed'),
BigBedDataSource = require('../main/BigBedDataSource'),
ContigInterval = require('../main/ContigInterval');
import BigBed from '../main/BigBed';
import BigBedDataSource from '../main/BigBedDataSource';
import ContigInterval from '../main/ContigInterval';

describe('BigBedDataSource', function() {
function getTestSource() {
Expand Down
4 changes: 2 additions & 2 deletions src/test/ContigInterval-test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var ContigInterval = require('../main/ContigInterval');
import ContigInterval from '../main/ContigInterval';

describe('ContigInterval', function() {
it('should have basic accessors', function() {
Expand Down
10 changes: 5 additions & 5 deletions src/test/CoverageCache-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

import type {Alignment, CigarOp, MateProperties, Strand} from '../main/Alignment';

var expect = require('chai').expect;
var _ = require('underscore');
import {expect} from 'chai';
import _ from 'underscore';

var CoverageCache = require('../main/CoverageCache'),
ContigInterval = require('../main/ContigInterval'),
{makeRead, makeReadPair, fakeSource} = require('./FakeAlignment');
import CoverageCache from '../main/CoverageCache';
import ContigInterval from '../main/ContigInterval';
import {makeRead, makeReadPair, fakeSource} from './FakeAlignment';

describe('CoverageCache', function() {
function ci(chr: string, start: number, end:number) {
Expand Down
16 changes: 8 additions & 8 deletions src/test/CoverageTrack-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
*/
'use strict';

var expect = require('chai').expect;

import type SamRead from '../main/SamRead';

var pileup = require('../main/pileup'),
TwoBit = require('../main/TwoBit'),
TwoBitDataSource = require('../main/TwoBitDataSource'),
MappedRemoteFile = require('./MappedRemoteFile'),
dataCanvas = require('data-canvas'),
{waitFor} = require('./async');
import {expect} from 'chai';

import pileup from '../main/pileup';
import TwoBit from '../main/TwoBit';
import TwoBitDataSource from '../main/TwoBitDataSource';
import MappedRemoteFile from './MappedRemoteFile';
import dataCanvas from 'data-canvas';
import {waitFor} from './async';

describe('CoverageTrack', function() {
var testDiv = document.getElementById('testdiv');
Expand Down
8 changes: 4 additions & 4 deletions src/test/GA4GHAlignment-test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/** @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var GA4GHAlignment = require('../main/GA4GHAlignment'),
RemoteFile = require('../main/RemoteFile'),
Bam = require('../main/bam');
import GA4GHAlignment from '../main/GA4GHAlignment';
import RemoteFile from '../main/RemoteFile';
import Bam from '../main/bam';

describe('GA4GHAlignment', function() {
var sampleAlignments = [];
Expand Down
10 changes: 5 additions & 5 deletions src/test/GA4GHDataSource-test.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/** @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var sinon = require('sinon');
import sinon from 'sinon';

var ContigInterval = require('../main/ContigInterval'),
GA4GHDataSource = require('../main/GA4GHDataSource'),
RemoteFile = require('../main/RemoteFile');
import ContigInterval from '../main/ContigInterval';
import GA4GHDataSource from '../main/GA4GHDataSource';
import RemoteFile from '../main/RemoteFile';

describe('GA4GHDataSource', function() {
var server: any = null, response;
Expand Down
8 changes: 4 additions & 4 deletions src/test/GeneTrack-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var pileup = require('../main/pileup'),
dataCanvas = require('data-canvas'),
{waitFor} = require('./async');
import pileup from '../main/pileup';
import dataCanvas from 'data-canvas';
import {waitFor} from './async';

describe('GeneTrack', function() {
var testDiv = document.getElementById('testdiv');
Expand Down
16 changes: 8 additions & 8 deletions src/test/GenomeTrack-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var ReactTestUtils = require('react-addons-test-utils');
import ReactTestUtils from 'react-addons-test-utils';

var pileup = require('../main/pileup'),
TwoBit = require('../main/TwoBit'),
TwoBitDataSource = require('../main/TwoBitDataSource'),
dataCanvas = require('data-canvas'),
MappedRemoteFile = require('./MappedRemoteFile'),
{waitFor} = require('./async');
import pileup from '../main/pileup';
import TwoBit from '../main/TwoBit';
import TwoBitDataSource from '../main/TwoBitDataSource';
import dataCanvas from 'data-canvas';
import MappedRemoteFile from './MappedRemoteFile';
import {waitFor} from './async';

describe('GenomeTrack', function() {
var testDiv = document.getElementById('testdiv');
Expand Down
4 changes: 2 additions & 2 deletions src/test/Interval-test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var Interval = require('../main/Interval');
import Interval from '../main/Interval';

describe('Interval', function() {
it('should have start/stop/length', function() {
Expand Down
8 changes: 4 additions & 4 deletions src/test/MappedRemoteFile-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var jBinary = require('jbinary'),
Q = require('q');
import jBinary from 'jbinary';
import Q from 'q';

var MappedRemoteFile = require('./MappedRemoteFile');
import MappedRemoteFile from './MappedRemoteFile';

describe('MappedRemoteFile', function() {
function bufferToText(buf) {
Expand Down
6 changes: 3 additions & 3 deletions src/test/MappedRemoteFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
*/
'use strict';

var Q = require('q');
import Q from 'q';

var RemoteFile = require('../main/RemoteFile'),
Interval = require('../main/Interval');
import RemoteFile from '../main/RemoteFile';
import Interval from '../main/Interval';

class MappedRemoteFile extends RemoteFile {
maps: Array<Interval>;
Expand Down
16 changes: 8 additions & 8 deletions src/test/PileupCache-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

import type {Alignment, CigarOp, MateProperties, Strand} from '../main/Alignment';

var expect = require('chai').expect;
var _ = require('underscore');

var PileupCache = require('../main/PileupCache'),
ContigInterval = require('../main/ContigInterval'),
Bam = require('../main/bam'),
RemoteFile = require('../main/RemoteFile'),
{makeRead, makeReadPair, fakeSource} = require('./FakeAlignment');
import {expect} from 'chai';
import _ from 'underscore';

import PileupCache from '../main/PileupCache';
import ContigInterval from '../main/ContigInterval';
import Bam from '../main/bam';
import RemoteFile from '../main/RemoteFile';
import {makeRead, makeReadPair, fakeSource} from './FakeAlignment';


describe('PileupCache', function() {
Expand Down
30 changes: 15 additions & 15 deletions src/test/PileupTrack-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
*/
'use strict';

var expect = require('chai').expect;

var Q = require('q'),
_ = require('underscore');

import type SamRead from '../main/SamRead';

var pileup = require('../main/pileup'),
TwoBit = require('../main/TwoBit'),
TwoBitDataSource = require('../main/TwoBitDataSource'),
Bam = require('../main/bam'),
BamDataSource = require('../main/BamDataSource'),
RemoteFile = require('../main/RemoteFile'),
MappedRemoteFile = require('./MappedRemoteFile'),
ContigInterval = require('../main/ContigInterval'),
{waitFor} = require('./async'),
dataCanvas = require('data-canvas');
import {expect} from 'chai';

import Q from 'q';
import _ from 'underscore';

import pileup from '../main/pileup';
import TwoBit from '../main/TwoBit';
import TwoBitDataSource from '../main/TwoBitDataSource';
import Bam from '../main/bam';
import BamDataSource from '../main/BamDataSource';
import RemoteFile from '../main/RemoteFile';
import MappedRemoteFile from './MappedRemoteFile';
import ContigInterval from '../main/ContigInterval';
import {waitFor} from './async';
import dataCanvas from 'data-canvas';


// This is like TwoBit, but allows a controlled release of sequence data.
Expand Down
6 changes: 3 additions & 3 deletions src/test/RecordedRemoteFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

import type Q from 'q';

var _ = require('underscore');
import _ from 'underscore';

var RemoteFile = require('../main/RemoteFile'),
Interval = require('../main/Interval');
import RemoteFile from '../main/RemoteFile';
import Interval from '../main/Interval';

class RecordedRemoteFile extends RemoteFile {
requests: Array<Interval>;
Expand Down
6 changes: 3 additions & 3 deletions src/test/RemoteFile-test.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var jBinary = require('jbinary');
import jBinary from 'jbinary';

var RemoteFile = require('../main/RemoteFile');
import RemoteFile from '../main/RemoteFile';

describe('RemoteFile', () => {
function bufferToText(buf) {
Expand Down
8 changes: 4 additions & 4 deletions src/test/SamRead-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import type Q from 'q';
import type SamRead from '../main/SamRead';

var expect = require('chai').expect;
import {expect} from 'chai';

var RemoteFile = require('../main/RemoteFile'),
Bam = require('../main/bam'),
ContigInterval = require('../main/ContigInterval');
import RemoteFile from '../main/RemoteFile';
import Bam from '../main/bam';
import ContigInterval from '../main/ContigInterval';

describe('SamRead', function() {

Expand Down
2 changes: 1 addition & 1 deletion src/test/SequenceStore-test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

import SequenceStore from '../main/SequenceStore';
import ContigInterval from '../main/ContigInterval';
Expand Down
8 changes: 4 additions & 4 deletions src/test/TiledCanvas-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/** @flow */
'use strict';

var expect = require('chai').expect;
import {expect} from 'chai';

var _ = require('underscore');
import _ from 'underscore';

var Interval = require('../main/Interval'),
TiledCanvas = require('../main/TiledCanvas');
import Interval from '../main/Interval';
import TiledCanvas from '../main/TiledCanvas';

describe('TiledCanvas', function() {
describe('getNewTileRanges', function() {
Expand Down
8 changes: 3 additions & 5 deletions src/test/TwoBit-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
/* @flow */
'use strict';

var chai = require('chai');
var expect = chai.expect;
var assert = chai.assert;
import {expect, assert} from 'chai';

var TwoBit = require('../main/TwoBit'),
RemoteFile = require('../main/RemoteFile');
import TwoBit from '../main/TwoBit';
import RemoteFile from '../main/RemoteFile';

describe('TwoBit', function() {
function getTestTwoBit() {
Expand Down
10 changes: 5 additions & 5 deletions src/test/TwoBitDataSource-test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* @flow */
'use strict';

var expect = require('chai').expect;
var Q = require('q');
import {expect} from 'chai';
import Q from 'q';

var TwoBit = require('../main/TwoBit'),
TwoBitDataSource = require('../main/TwoBitDataSource'),
RemoteFile = require('../main/RemoteFile');
import TwoBit from '../main/TwoBit';
import TwoBitDataSource from '../main/TwoBitDataSource';
import RemoteFile from '../main/RemoteFile';

describe('TwoBitDataSource', function() {
function getTestSource() {
Expand Down

0 comments on commit 4d93e3f

Please sign in to comment.