Ver Fonte

HUE-9090 [frontend] Fix exceptions in parser related test utils

Johan Ahlen há 6 anos atrás
pai
commit
b17c9a98a8
1 ficheiros alterados com 9 adições e 11 exclusões
  1. 9 11
      desktop/core/src/desktop/js/jest/sqlTestUtils.js

+ 9 - 11
desktop/core/src/desktop/js/jest/sqlTestUtils.js

@@ -33,10 +33,8 @@ const resultEquals = function(a, b) {
       }
     }
     return true;
-  } else {
-    // TODO: Jasmine version?
-    return jasmine.jasmine.matchersUtil.equals(a, b);
   }
+  return a == b;
 };
 
 const jsonStringToJsString = function(jsonString) {
@@ -97,7 +95,7 @@ expect.extend({
       if (!resultEquals(actualResponse.definitions, testDefinition.expectedDefinitions)) {
         return {
           pass: false,
-          message:
+          message: () =>
             '\n        Statement: ' +
             testDefinition.beforeCursor +
             '|' +
@@ -118,7 +116,7 @@ expect.extend({
     if (testDefinition.locationsOnly) {
       return {
         pass: resultEquals(actualResponse.locations, testDefinition.expectedLocations),
-        message:
+        message: () =>
           '\n        Statement: ' +
           testDefinition.beforeCursor +
           '|' +
@@ -145,7 +143,7 @@ expect.extend({
       if (actualResponse.locations.length > 0) {
         return {
           pass: false,
-          message:
+          message: () =>
             '\nStatement: ' +
             testDefinition.beforeCursor +
             '|' +
@@ -164,7 +162,7 @@ expect.extend({
       if (typeof actualResponse.suggestColRefKeywords == 'undefined') {
         return {
           pass: false,
-          message:
+          message: () =>
             '\nStatement: ' +
             testDefinition.beforeCursor +
             '|' +
@@ -184,7 +182,7 @@ expect.extend({
         if (!contains) {
           return {
             pass: false,
-            message:
+            message: () =>
               '\nStatement: ' +
               testDefinition.beforeCursor +
               '|' +
@@ -215,7 +213,7 @@ expect.extend({
       if (!contains) {
         return {
           pass: false,
-          message:
+          message: () =>
             '\n        Statement: ' +
             testDefinition.beforeCursor +
             '|' +
@@ -243,7 +241,7 @@ expect.extend({
       if (contains) {
         return {
           pass: false,
-          message:
+          message: () =>
             '\n            Statement: ' +
             testDefinition.beforeCursor +
             '|' +
@@ -265,7 +263,7 @@ expect.extend({
     }
     return {
       pass: resultEquals(actualResponse, testDefinition.expectedResult),
-      message:
+      message: () =>
         '\n        Statement: ' +
         testDefinition.beforeCursor +
         '|' +