@@ -2,8 +2,7 @@ const { assert } = require("chai");
22const rust = require ( "../../index" ) ;
33const utils = require ( "../../lib/utils" ) ;
44const types = require ( "../../lib/types" ) ;
5- const typeGuessing = require ( "../../lib/types/type-guessing" ) ;
6- const { rustConvertHint } = require ( "../../lib/types/cql-utils" ) ;
5+ const Encoder = require ( "../../lib/encoder" ) ;
76
87describe ( "Encoder.guessDataType()" , function ( ) {
98 it ( "should guess the native types" , function ( ) {
@@ -54,7 +53,7 @@ describe("Encoder.guessDataType()", function () {
5453 ) ;
5554 assertGuessed (
5655 types . TimeUuid . now ( ) ,
57- rust . CqlType . Timeuuid ,
56+ rust . CqlType . Uuid ,
5857 "Guess type for a TimeUuid value failed" ,
5958 ) ;
6059 assertGuessed (
@@ -87,11 +86,11 @@ describe("Encoder.guessDataType()", function () {
8786 rust . CqlType . Inet ,
8887 "Guess type for a inet value failed" ,
8988 ) ;
90- /* assertGuessed(
89+ assertGuessed (
9190 new types . Tuple ( 1 , 2 , 3 ) ,
9291 rust . CqlType . Tuple ,
9392 "Guess type for a tuple value failed" ,
94- ); */
93+ ) ;
9594 assertGuessed (
9695 new types . LocalDate ( 2010 , 4 , 29 ) ,
9796 rust . CqlType . Date ,
@@ -102,23 +101,20 @@ describe("Encoder.guessDataType()", function () {
102101 rust . CqlType . Time ,
103102 "Guess type for a time value failed" ,
104103 ) ;
105- /* assertGuessed(
104+ assertGuessed (
106105 new Float32Array ( [ 1.2 , 3.4 , 5.6 ] ) ,
107106 rust . CqlType . Custom ,
108107 "Guess type for a Float32 TypedArray value failed" ,
109- ); */
108+ ) ;
110109 assertGuessed ( { } , null , "Objects must not be guessed" ) ;
111110 } ) ;
112111
113112 function assertGuessed ( value , expectedType , message ) {
114- let type = typeGuessing . guessType ( value ) ;
115- if ( type === null ) {
116- if ( expectedType !== null ) {
117- assert . ok ( false , "Type not guessed for value " + value ) ;
118- }
119- return ;
120- }
121- type = rustConvertHint ( type ) . baseType ;
122- assert . strictEqual ( type , expectedType , message + ": " + value ) ;
113+ let type = Encoder . guessDataType ( value ) ;
114+ assert . strictEqual (
115+ type === null ? null : type . code ,
116+ expectedType ,
117+ message + ": " + value ,
118+ ) ;
123119 }
124120} ) ;
0 commit comments