Skip to content

Commit 074c597

Browse files
author
Tim Middleton
authored
Update Go client to remove gomega as a direct depdency (#138)
1 parent 8a81dac commit 074c597

31 files changed

+1169
-862
lines changed

‎Makefile‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -404,43 +404,43 @@ test: test-clean gotestsum $(BUILD_PROPS) ## Run the unit tests
404404
# ----------------------------------------------------------------------------------------------------------------------
405405
.PHONY: test-e2e-standalone
406406
test-e2e-standalone: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence
407-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test.xml \
408-
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional.out -v ./test/e2e/standalone/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
407+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test.xml \
408+
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional.out -v ./e2e/standalone/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
409409
go tool cover -func=$(COVERAGE_DIR)/cover-functional.out | grep -v '0.0%'
410410

411411
# ----------------------------------------------------------------------------------------------------------------------
412412
# Executes the Go streaming tests for standalone Coherence
413413
# ----------------------------------------------------------------------------------------------------------------------
414414
.PHONY: test-e2e-streaming
415415
test-e2e-streaming: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence
416-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-streaming-test.xml \
417-
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional.out -v ./test/e2e/streaming/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
416+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-streaming-test.xml \
417+
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional.out -v ./e2e/streaming/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
418418

419419
# ----------------------------------------------------------------------------------------------------------------------
420420
# Executes the Go end to end tests for standalone Coherence with Scope set
421421
# ----------------------------------------------------------------------------------------------------------------------
422422
.PHONY: test-e2e-standalone-scope
423423
test-e2e-standalone-scope: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence with Scope set
424-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-scope.xml \
425-
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-scope.out -v ./test/e2e/scope/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
424+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-scope.xml \
425+
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-scope.out -v ./e2e/scope/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
426426
go tool cover -func=$(COVERAGE_DIR)/cover-functional-scope.out | grep -v '0.0%'
427427

428428
# ----------------------------------------------------------------------------------------------------------------------
429429
# Executes the Go end to end tests for standalone Coherence with Queues
430430
# ----------------------------------------------------------------------------------------------------------------------
431431
.PHONY: test-e2e-standalone-queues
432432
test-e2e-standalone-queues: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence queues
433-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-queues.xml \
434-
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-queues.out -v ./test/e2e/queues/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
433+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-queues.xml \
434+
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-queues.out -v ./e2e/queues/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
435435
go tool cover -func=$(COVERAGE_DIR)/cover-functional-queues.out | grep -v '0.0%'
436436

437437
# ----------------------------------------------------------------------------------------------------------------------
438438
# Executes the Go end to end tests for gRPC v1 tests
439439
# ----------------------------------------------------------------------------------------------------------------------
440440
.PHONY: test-v1-base
441441
test-v1-base: test-clean test gotestsum $(BUILD_PROPS) ## Run e2e tests with Coherence
442-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-v1.xml \
443-
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-v1.out -v ./test/v1/base/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
442+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/go-client-test-v1.xml \
443+
-- $(GO_TEST_FLAGS) -v -coverprofile=$(COVERAGE_DIR)/cover-functional-v1.out -v ./v1/base/... -coverpkg=github.com/oracle/coherence-go-client/v2/coherence/...
444444
go tool cover -func=$(COVERAGE_DIR)/cover-functional-v1.out | grep -v '0.0%'
445445

446446
# ----------------------------------------------------------------------------------------------------------------------
@@ -516,8 +516,8 @@ test-clean: gotestsum ## Clean the go test cache
516516
test-discovery: test-clean gotestsum $(BUILD_PROPS) ## Run Discovery tests with Coherence
517517
make test-coherence-shutdown || true
518518
make test-coherence-startup
519-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-discovery.xml \
520-
-- $(GO_TEST_FLAGS) -v ./test/e2e/discovery/...
519+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-discovery.xml \
520+
-- $(GO_TEST_FLAGS) -v ./e2e/discovery/...
521521
make test-coherence-shutdown
522522

523523
# ----------------------------------------------------------------------------------------------------------------------
@@ -528,8 +528,8 @@ test-perf: test-clean gotestsum $(BUILD_PROPS) ## Run Discovery tests with Coher
528528
./scripts/perf-cluster.sh $(TEST_LOGS_DIR)/cli $(COHERENCE_VERSION) stop || true
529529
mkdir -p $(TEST_LOGS_DIR)/cli
530530
./scripts/perf-cluster.sh $(TEST_LOGS_DIR)/cli $(COHERENCE_VERSION) start
531-
CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-perf.xml \
532-
-- $(GO_TEST_FLAGS) -v ./test/e2e/perf/...
531+
cd test && CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-perf.xml \
532+
-- $(GO_TEST_FLAGS) -v ./e2e/perf/...
533533
./scripts/perf-cluster.sh $(TEST_LOGS_DIR)/cli $(COHERENCE_VERSION) stop || true
534534
rm -rf $(TEST_LOGS_DIR)/cli/*
535535

@@ -538,8 +538,8 @@ test-perf: test-clean gotestsum $(BUILD_PROPS) ## Run Discovery tests with Coher
538538
# ----------------------------------------------------------------------------------------------------------------------
539539
.PHONY: test-resolver
540540
test-resolver: test-clean gotestsum $(BUILD_PROPS) ## Run Resolver tests with Coherence
541-
COHERENCE_RESOLVER_DEBUG=true CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-resover.xml \
542-
-- $(GO_TEST_FLAGS) -v ./test/e2e/resolver/...
541+
cd test && COHERENCE_RESOLVER_DEBUG=true CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-resover.xml \
542+
-- $(GO_TEST_FLAGS) -v ./e2e/resolver/...
543543

544544
# ----------------------------------------------------------------------------------------------------------------------
545545
# Executes the Go resolver cluster tests for standalone Coherence
@@ -548,8 +548,8 @@ test-resolver: test-clean gotestsum $(BUILD_PROPS) ## Run Resolver tests with Co
548548
test-resolver-cluster: test-clean gotestsum $(BUILD_PROPS) ## Run Resolver tests with Coherence
549549
make test-coherence-shutdown || true
550550
make test-coherence-startup
551-
COHERENCE_RESOLVER_DEBUG=true CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-resover-cluster.xml \
552-
-- $(GO_TEST_FLAGS) -v ./test/e2e/resolver_cluster/...
551+
cd test && COHERENCE_RESOLVER_DEBUG=true CGO_ENABLED=0 $(GOTESTSUM) --format testname --junitfile $(TEST_LOGS_DIR)/cohctl-test-resover-cluster.xml \
552+
-- $(GO_TEST_FLAGS) -v ./e2e/resolver_cluster/...
553553
make test-coherence-shutdown
554554

555555
# ----------------------------------------------------------------------------------------------------------------------

‎coherence/coherence_test_helpers.go‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,111 +13,135 @@ import (
1313
"time"
1414
)
1515

16-
// test helpers
16+
// test helpers only for internal use only.
1717

18+
// TestEnsureCache is only exported for integration tests, not for general use.
1819
func TestEnsureCache(ctx context.Context, session *Session, cache string) (*int32, error) {
1920
return session.v1StreamManagerCache.ensureCache(ctx, cache)
2021
}
2122

23+
// TestClearCache is only exported for integration tests, not for general use.
2224
func TestClearCache(ctx context.Context, session *Session, cache string) error {
2325
return session.v1StreamManagerCache.clearCache(ctx, cache)
2426
}
2527

28+
// TestRemoveMapping is only exported for integration tests, not for general use.
2629
func TestRemoveMapping(ctx context.Context, session *Session, cache string, key []byte, value []byte) (bool, error) {
2730
return session.v1StreamManagerCache.removeMapping(ctx, cache, key, value)
2831
}
2932

33+
// TestReplaceMapping is only exported for integration tests, not for general use.
3034
func TestReplaceMapping(ctx context.Context, session *Session, cache string, key []byte, prevValue []byte, newValue []byte) (bool, error) {
3135
return session.v1StreamManagerCache.replaceMapping(ctx, cache, key, prevValue, newValue)
3236
}
3337

38+
// TestReplace is only exported for integration tests, not for general use.
3439
func TestReplace(ctx context.Context, session *Session, cache string, key []byte, value []byte) (*[]byte, error) {
3540
return session.v1StreamManagerCache.replace(ctx, cache, key, value)
3641
}
3742

43+
// TestTruncateCache is only exported for integration tests, not for general use.
3844
func TestTruncateCache(ctx context.Context, session *Session, cache string) error {
3945
return session.v1StreamManagerCache.truncateCache(ctx, cache)
4046
}
4147

48+
// TestDestroyCache is only exported for integration tests, not for general use.
4249
func TestDestroyCache(ctx context.Context, session *Session, cache string) error {
4350
return session.v1StreamManagerCache.destroyCache(ctx, cache)
4451
}
4552

53+
// TestSize is only exported for integration tests, not for general use.
4654
func TestSize(ctx context.Context, session *Session, cache string) (int32, error) {
4755
return session.v1StreamManagerCache.size(ctx, cache)
4856
}
4957

58+
// TestIsEmpty is only exported for integration tests, not for general use.
5059
func TestIsEmpty(ctx context.Context, session *Session, cache string) (bool, error) {
5160
return session.v1StreamManagerCache.isEmpty(ctx, cache)
5261
}
5362

63+
// TestIsReady is only exported for integration tests, not for general use.
5464
func TestIsReady(ctx context.Context, session *Session, cache string) (bool, error) {
5565
return session.v1StreamManagerCache.isReady(ctx, cache)
5666
}
5767

68+
// TestContainsKey is only exported for integration tests, not for general use.
5869
func TestContainsKey(ctx context.Context, session *Session, cache string, key []byte) (bool, error) {
5970
return session.v1StreamManagerCache.containsKey(ctx, cache, key)
6071
}
6172

73+
// TestContainsValue is only exported for integration tests, not for general use.
6274
func TestContainsValue(ctx context.Context, session *Session, cache string, value []byte) (bool, error) {
6375
return session.v1StreamManagerCache.containsValue(ctx, cache, value)
6476
}
6577

78+
// TestContainsEntry is only exported for integration tests, not for general use.
6679
func TestContainsEntry(ctx context.Context, session *Session, cache string, key []byte, value []byte) (bool, error) {
6780
return session.v1StreamManagerCache.containsEntry(ctx, cache, key, value)
6881
}
6982

83+
// TestGet is only exported for integration tests, not for general use.
7084
func TestGet(ctx context.Context, session *Session, cache string, key []byte) (*[]byte, error) {
7185
return session.v1StreamManagerCache.get(ctx, cache, key)
7286
}
7387

88+
// TestGetAll is only exported for integration tests, not for general use.
7489
func TestGetAll(ctx context.Context, session *Session, cache string, keys [][]byte) (<-chan BinaryKeyAndValue, error) {
7590
return session.v1StreamManagerCache.getAll(ctx, cache, keys)
7691
}
7792

93+
// TestKeyAndValuePage is only exported for integration tests, not for general use.
7894
func TestKeyAndValuePage(ctx context.Context, session *Session, cache string, cookie []byte) (<-chan BinaryKeyAndValue, error) {
7995
return session.v1StreamManagerCache.keyAndValuePage(ctx, cache, cookie)
8096
}
8197

98+
// TestPut is only exported for integration tests, not for general use.
8299
func TestPut(ctx context.Context, session *Session, cache string, key []byte, value []byte, ttl time.Duration) (*[]byte, error) {
83100
return session.v1StreamManagerCache.put(ctx, cache, key, value, ttl)
84101
}
85102

103+
// TestPutAll is only exported for integration tests, not for general use.
86104
func TestPutAll(ctx context.Context, session *Session, cache string, entries []*pb1.BinaryKeyAndValue, ttl time.Duration) error {
87105
return session.v1StreamManagerCache.putAll(ctx, cache, entries, ttl)
88106
}
89107

108+
// TestRemove is only exported for integration tests, not for general use.
90109
func TestRemove(ctx context.Context, session *Session, cache string, key []byte) (*[]byte, error) {
91110
return session.v1StreamManagerCache.remove(ctx, cache, key)
92111
}
93112

113+
// TestPutIfAbsent is only exported for integration tests, not for general use.
94114
func TestPutIfAbsent(ctx context.Context, session *Session, cache string, key []byte, value []byte) (*[]byte, error) {
95115
return session.v1StreamManagerCache.putIfAbsent(ctx, cache, key, value)
96116
}
97117

118+
// TestAggregate is only exported for integration tests, not for general use.
98119
func TestAggregate(ctx context.Context, session *Session, cache string, agent []byte, keysOrFilter *pb1.KeysOrFilter) (*[]byte, error) {
99120
return session.v1StreamManagerCache.aggregate(ctx, cache, agent, keysOrFilter)
100121
}
101122

123+
// TestInvoke is only exported for integration tests, not for general use.
102124
func TestInvoke(ctx context.Context, session *Session, cache string, agent []byte, keysOrFilter *pb1.KeysOrFilter) (<-chan BinaryKeyAndValue, error) {
103125
return session.v1StreamManagerCache.invoke(ctx, cache, agent, keysOrFilter)
104126
}
105127

128+
// TestMapListenerRequest is only exported for integration tests, not for general use.
106129
func TestMapListenerRequest(ctx context.Context, session *Session, cache string, subscribe bool, keyOrFilter *pb1.KeyOrFilter,
107130
lite bool, synchronous bool, priming bool, filterID int64) error {
108131
return session.v1StreamManagerCache.mapListenerRequest(ctx, cache, subscribe, keyOrFilter, lite, synchronous, priming, filterID)
109132
}
110133

111-
// GetSessionCacheID returns the cache id for a cache name
134+
// GetSessionCacheID is only exported for integration tests, not for general use.
112135
func GetSessionCacheID(session *Session, cache string) *int32 {
113136
return session.getCacheID(cache)
114137
}
115138

116-
// GetSessionQueueID returns the queue id for a cache name
139+
// GetSessionQueueID is only exported for integration tests, not for general use.
117140
func GetSessionQueueID(session *Session, queue string) *int32 {
118141
return session.getQueueID(queue)
119142
}
120143

144+
// GetNearCachePruneFactor is only exported for integration tests, not for general use.
121145
func GetNearCachePruneFactor[K comparable, V any](namedMap NamedMap[K, V]) float32 {
122146
ncOptions := namedMap.getBaseClient().cacheOpts.NearCacheOptions
123147
if ncOptions == nil {
@@ -128,11 +152,13 @@ func GetNearCachePruneFactor[K comparable, V any](namedMap NamedMap[K, V]) float
128152
}
129153

130154
// revive:disable:unexported-return
155+
// GetKeyListenerGroupMap is only exported for integration tests, not for general use.
131156
func GetKeyListenerGroupMap[K comparable, V any](namedMap NamedMap[K, V]) map[K]*listenerGroupV1[K, V] {
132157
return namedMap.getBaseClient().keyListenersV1
133158
}
134159

135160
// revive:disable:unexported-return
161+
// GetKeyListenerGroupListeners is only exported for integration tests, not for general use.
136162
func GetKeyListenerGroupListeners[K comparable, V any](namedMap NamedMap[K, V], key K) []MapListener[K, V] {
137163
mapListeners := make([]MapListener[K, V], 0)
138164
listenerGroupMap := GetKeyListenerGroupMap[K, V](namedMap)
@@ -146,10 +172,12 @@ func GetKeyListenerGroupListeners[K comparable, V any](namedMap NamedMap[K, V],
146172
}
147173

148174
// revive:disable:unexported-return
175+
// GetFilterListenerGroupMap is only exported for integration tests, not for general use.
149176
func GetFilterListenerGroupMap[K comparable, V any](namedMap NamedMap[K, V]) map[filters.Filter]*listenerGroupV1[K, V] {
150177
return namedMap.getBaseClient().filterListenersV1
151178
}
152179

180+
// GetFilterListenerGroupListeners is only exported for integration tests, not for general use.
153181
func GetFilterListenerGroupListeners[K comparable, V any](namedMap NamedMap[K, V], f filters.Filter) []MapListener[K, V] {
154182
mapListeners := make([]MapListener[K, V], 0)
155183
listenerGroupMap := GetFilterListenerGroupMap[K, V](namedMap)
@@ -161,11 +189,3 @@ func GetFilterListenerGroupListeners[K comparable, V any](namedMap NamedMap[K, V
161189

162190
return mapListeners
163191
}
164-
165-
func GetCacheServiceProtocol() V1ProxyProtocol {
166-
return cacheServiceProtocol
167-
}
168-
169-
func NewEnsureCacheRequest(session *Session, cache string) (*pb1.ProxyRequest, error) {
170-
return session.v1StreamManagerCache.newEnsureCacheRequest(cache)
171-
}

‎coherence/discovery/nslookup_test.go‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,58 @@
11
/*
2-
* Copyright (c) 2021, 2024 Oracle and/or its affiliates.
2+
* Copyright (c) 2021, 2025 Oracle and/or its affiliates.
33
* Licensed under the Universal Permissive License v 1.0 as shown at
44
* https://oss.oracle.com/licenses/upl.
55
*/
66

77
package discovery
88

99
import (
10-
"github.com/onsi/gomega"
1110
"testing"
1211
)
1312

1413
var defaultTimeout int32 = 30
1514

1615
func TestInvalidHostIp(t *testing.T) {
17-
g := gomega.NewGomegaWithT(t)
18-
1916
_, err := Open("host:123:123", defaultTimeout)
20-
g.Expect(err).To(gomega.Not(gomega.BeNil()))
17+
ensureFails(t, err)
2118

2219
_, err = Open("host:1233f", defaultTimeout)
23-
g.Expect(err).To(gomega.Not(gomega.BeNil()))
20+
ensureFails(t, err)
2421

2522
_, err = Open("host:-1", defaultTimeout)
26-
g.Expect(err).To(gomega.Not(gomega.BeNil()))
23+
ensureFails(t, err)
2724

2825
_, err = Open("host:1023", defaultTimeout)
29-
g.Expect(err).To(gomega.Not(gomega.BeNil()))
26+
ensureFails(t, err)
3027

3128
_, err = Open("host:65536", defaultTimeout)
32-
g.Expect(err).To(gomega.Not(gomega.BeNil()))
29+
ensureFails(t, err)
30+
}
31+
32+
func ensureFails(t *testing.T, err error) {
33+
if err == nil {
34+
t.Errorf("err was nil but should have failed")
35+
}
3336
}
3437

3538
func TestParseResults(t *testing.T) {
36-
g := gomega.NewGomegaWithT(t)
37-
g.Expect(len(parseResults(""))).To(gomega.Equal(0))
38-
g.Expect(len(parseResults("[123]"))).To(gomega.Equal(1))
39-
g.Expect(len(parseResults("[123, 123]"))).To(gomega.Equal(2))
40-
g.Expect(len(parseResults("[123, 123, 456]"))).To(gomega.Equal(3))
39+
assertEquals(t, len(parseResults("")), 0)
40+
assertEquals(t, len(parseResults("[123]")), 1)
41+
assertEquals(t, len(parseResults("[123, 123]")), 2)
42+
assertEquals(t, len(parseResults("[123, 123, 456]")), 3)
43+
4144
result := parseResults("[A, BB, CCC]")
42-
g.Expect(len(result)).To(gomega.Equal(3))
45+
assertEquals(t, len(result), 3)
4346
for _, v := range result {
4447
valid := v == "A" || v == "BB" || v == "CCC"
45-
g.Expect(valid).To(gomega.BeTrue())
48+
if !valid {
49+
t.Errorf("invalid result: %v", v)
50+
}
51+
}
52+
}
53+
54+
func assertEquals(t *testing.T, actual, expected int) {
55+
if actual != expected {
56+
t.Errorf("actual %d != expected %d", actual, expected)
4657
}
4758
}

0 commit comments

Comments
 (0)