|
1 | 1 | package main
|
2 | 2 |
|
3 | 3 | import (
|
| 4 | + "encoding/json" |
4 | 5 | "fmt"
|
5 | 6 | "log"
|
6 | 7 | "reflect"
|
@@ -441,7 +442,6 @@ func TestJsonbComparisonOp(t *testing.T) {
|
441 | 442 |
|
442 | 443 | assert.Equal(t, int64(2), inserted, "Expected to insert 2 rows")
|
443 | 444 |
|
444 |
| - t.Skip("TODO: Fix failing test due to issue with cllw ore") |
445 | 445 | path := "$.top.integer"
|
446 | 446 | ejson_path, err := goeql.EJsonPathQuery(path, "examples", "encrypted_jsonb_field")
|
447 | 447 |
|
@@ -494,13 +494,15 @@ func TestJsonbTermsOp(t *testing.T) {
|
494 | 494 | EncryptedTextField: "testing",
|
495 | 495 | EncryptedIntField: 42,
|
496 | 496 | EncryptedJsonbField: jsonOne,
|
| 497 | + EncryptedBoolField: true, |
497 | 498 | }
|
498 | 499 | example_two := Example{
|
499 | 500 | Id: expected_id,
|
500 | 501 | NonEncryptedField: "melbourne",
|
501 | 502 | EncryptedIntField: 42,
|
502 | 503 | EncryptedTextField: "someone@gmail.com",
|
503 | 504 | EncryptedJsonbField: jsonTwo,
|
| 505 | + EncryptedBoolField: false, |
504 | 506 | }
|
505 | 507 |
|
506 | 508 | examples := []Example{
|
@@ -536,13 +538,20 @@ func TestJsonbTermsOp(t *testing.T) {
|
536 | 538 | if err != nil {
|
537 | 539 | log.Fatalf("Error serializing encrypted_jsonb_field query: %v", err)
|
538 | 540 | }
|
539 |
| - t.Skip("TODO: Fix failing test due to issue with cllw ore") |
| 541 | + |
540 | 542 | results, err := engine.Query(sql, ejson_path, comparison_value)
|
541 | 543 | if err != nil {
|
542 | 544 | t.Fatalf("Could not retrieve example using terms: %v", err)
|
543 | 545 | }
|
544 | 546 |
|
545 | 547 | assert.Equal(t, 1, len(results))
|
| 548 | + |
| 549 | + var jsonData int64 |
| 550 | + if err := json.Unmarshal(results[0]["id"], &jsonData); err != nil { |
| 551 | + t.Fatalf("Could not unmarshal %v", err) |
| 552 | + } |
| 553 | + assert.Equal(t, expected_id, jsonData) |
| 554 | + |
546 | 555 | }
|
547 | 556 |
|
548 | 557 | func TestOreStringRangeQuery(t *testing.T) {
|
|
0 commit comments