test java & node clients

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Sep 16, 2024 · 4d5203a · 4d5203a
1 parent aa00b22
commit 4d5203a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 7 deletions.
diff --git a/java/integTest/build.gradle b/java/integTest/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'java-library'
+    id "com.google.osdetector" version "1.7.3"
 }
 
 repositories {
@@ -8,15 +9,18 @@ repositories {
 
 dependencies {
     // client
-    implementation project(':client')
+    implementation files("../jars/valkey-glide-v1.1.0-rc1-${osdetector.classifier}.jar")
 
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
 
     // https://github.com/netty/netty/wiki/Native-transports
     // At the moment, Windows is not supported
     implementation group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.100.Final', classifier: 'linux-x86_64'
+    implementation group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.100.Final', classifier: 'linux-aarch_64'
     implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.100.Final', classifier: 'osx-x86_64'
     implementation group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.100.Final', classifier: 'osx-aarch_64'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.27.1'
+    implementation group: 'io.netty', name: 'netty-handler', version: '4.1.100.Final'
 
     // junit
     testImplementation 'org.mockito:mockito-junit-jupiter:3.12.4'

diff --git a/java/jars/valkey-glide-v1.1.0-rc1-linux-aarch_64.jar b/java/jars/valkey-glide-v1.1.0-rc1-linux-aarch_64.jar
diff --git a/java/jars/valkey-glide-v1.1.0-rc1-linux-x86_64.jar b/java/jars/valkey-glide-v1.1.0-rc1-linux-x86_64.jar
diff --git a/java/jars/valkey-glide-v1.1.0-rc1-osx-aarch_64.jar b/java/jars/valkey-glide-v1.1.0-rc1-osx-aarch_64.jar
diff --git a/java/jars/valkey-glide-v1.1.0-rc1-osx-x86_64.jar b/java/jars/valkey-glide-v1.1.0-rc1-osx-x86_64.jar
diff --git a/node/package.json b/node/package.json
@@ -11,6 +11,7 @@
     },
     "homepage": "https://github.com/valkey-io/valkey-glide#readme",
     "dependencies": {
+        "@valkey/valkey-glide": "^1.1.0-rc5",
         "glide-rs": "file:rust-client",
         "long": "^5.2.3",
         "npmignore": "^0.3.1",

diff --git a/node/tests/GlideClient.test.ts b/node/tests/GlideClient.test.ts
@@ -24,7 +24,7 @@ import {
     RequestError,
     Script,
     Transaction,
-} from "..";
+} from "@valkey/valkey-glide";
 import { ValkeyCluster } from "../../utils/TestUtils.js";
 import { command_request } from "../src/ProtobufMessage";
 import { runBaseTests } from "./SharedTests";

diff --git a/node/tests/GlideClusterClient.test.ts b/node/tests/GlideClusterClient.test.ts
@@ -33,7 +33,7 @@ import {
     Script,
     SlotKeyTypes,
     SortOrder,
-} from "..";
+} from "@valkey/valkey-glide";
 import { ValkeyCluster } from "../../utils/TestUtils.js";
 import { runBaseTests } from "./SharedTests";
 import {

diff --git a/node/tests/PubSub.test.ts b/node/tests/PubSub.test.ts
@@ -23,7 +23,7 @@ import {
     ProtocolVersion,
     PubSubMsg,
     TimeoutError,
-} from "..";
+} from "@valkey/valkey-glide";
 import ValkeyCluster from "../../utils/TestUtils";
 import {
     flushAndCloseClient,

diff --git a/node/tests/ScanTest.test.ts b/node/tests/ScanTest.test.ts
@@ -12,7 +12,7 @@ import {
     GlideString,
     ObjectType,
     ProtocolVersion,
-} from "..";
+} from "@valkey/valkey-glide";
 import { ValkeyCluster } from "../../utils/TestUtils.js";
 import {
     flushAndCloseClient,

diff --git a/node/tests/SharedTests.ts b/node/tests/SharedTests.ts
@@ -54,7 +54,7 @@ import {
     convertFieldsAndValuesToHashDataType,
     convertGlideRecordToRecord,
     parseInfoResponse,
-} from "..";
+} from "@valkey/valkey-glide";
 import { ValkeyCluster } from "../../utils/TestUtils";
 import { Client, GetAndSetRandomValue, getFirstResult } from "./TestUtilities";
 

diff --git a/node/tests/TestUtilities.ts b/node/tests/TestUtilities.ts
@@ -39,7 +39,7 @@ import {
     Transaction,
     UnsignedEncoding,
     convertRecordToGlideRecord,
-} from "..";
+} from "@valkey/valkey-glide";
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 function intoArrayInternal(obj: any, builder: string[]) {