@@ -572,14 +572,9 @@ function describeShapeComboTest(combo) {
572
572
var xid = axispair [ 0 ] ;
573
573
var yid = axispair [ 1 ] ;
574
574
return [
575
- '#' , gdId ,
576
- 'should create a plot with parameters:' , '\n' ,
577
- 'x-axis type:' , xaxisType , '\n' ,
578
- 'y-axis type:' , yaxisType , '\n' ,
579
- 'axis pair:' , xid , yid , '\n' ,
580
- 'ARO position x:' , JSON . stringify ( xaroPos ) , '\n' ,
581
- 'ARO position y:' , JSON . stringify ( yaroPos ) , '\n' ,
582
- 'shape type:' , shapeType , '\n' ,
575
+ 'should plot shape:' , shapeType , 'on' , gdId ,
576
+ xaxisType , xid , JSON . stringify ( xaroPos ) ,
577
+ yaxisType , yid , JSON . stringify ( yaroPos ) ,
583
578
] . join ( ' ' ) ;
584
579
}
585
580
@@ -619,21 +614,11 @@ function describeImageComboTest(combo) {
619
614
var gdId = combo [ 7 ] ;
620
615
var xid = axispair [ 0 ] ;
621
616
var yid = axispair [ 1 ] ;
622
- var xref = makeAxRef ( xid , aroposx . ref ) ;
623
- var yref = makeAxRef ( yid , aroposy . ref ) ;
624
617
// TODO Add image combo test description
625
618
return [
626
- '#' , gdId ,
627
- 'should create a plot with parameters:' , '\n' ,
628
- 'x-axis type:' , axistypex , '\n' ,
629
- 'y-axis type:' , axistypey , '\n' ,
630
- 'axis pair:' , xid , yid , '\n' ,
631
- 'ARO position x:' , JSON . stringify ( aroposx ) , '\n' ,
632
- 'ARO position y:' , JSON . stringify ( aroposy ) , '\n' ,
633
- 'xanchor:' , xanchor , '\n' ,
634
- 'yanchor:' , yanchor , '\n' ,
635
- 'xref:' , xref , '\n' ,
636
- 'yref:' , yref , '\n' ,
619
+ 'should plot image on' , gdId ,
620
+ axistypex , xid , xanchor , JSON . stringify ( aroposx ) ,
621
+ axistypey , yid , yanchor , JSON . stringify ( aroposy ) ,
637
622
] . join ( ' ' ) ;
638
623
}
639
624
@@ -681,19 +666,10 @@ function describeAnnotationComboTest(combo) {
681
666
var gdId = combo [ 6 ] ;
682
667
var xid = axispair [ 0 ] ;
683
668
var yid = axispair [ 1 ] ;
684
- var xref = makeAxRef ( xid , aroposx . ref ) ;
685
- var yref = makeAxRef ( yid , aroposy . ref ) ;
686
669
return [
687
- '#' , gdId ,
688
- 'should create a plot with parameters:' , '\n' ,
689
- 'x-axis type:' , axistypex , '\n' ,
690
- 'y-axis type:' , axistypey , '\n' ,
691
- 'axis pair:' , xid , yid , '\n' ,
692
- 'ARO position x:' , JSON . stringify ( aroposx ) , '\n' ,
693
- 'ARO position y:' , JSON . stringify ( aroposy ) , '\n' ,
694
- 'arrow axis pair:' , arrowaxispair , '\n' ,
695
- 'xref:' , xref , '\n' ,
696
- 'yref:' , yref , '\n' ,
670
+ 'should plot annotation' , arrowaxispair , 'on' , gdId ,
671
+ axistypex , xid , JSON . stringify ( aroposx ) ,
672
+ axistypey , yid , JSON . stringify ( aroposy ) ,
697
673
] . join ( ' ' ) ;
698
674
}
699
675
0 commit comments