From ccf7fa9210887633944bd4d78f90463b82807e6e Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 28 九月 2026 17:31:21 +0800
Subject: [PATCH] 实现 22 所推式来源闭环：接收端点、落地表与读落地表的适配器
---
battery-device-neware/src/test/java/com/battery/device/neware/NewareMysqlAdapterContractTest.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/battery-device-neware/src/test/java/com/battery/device/neware/NewareMysqlAdapterContractTest.java b/battery-device-neware/src/test/java/com/battery/device/neware/NewareMysqlAdapterContractTest.java
index 529c1ae..8ca9a29 100644
--- a/battery-device-neware/src/test/java/com/battery/device/neware/NewareMysqlAdapterContractTest.java
+++ b/battery-device-neware/src/test/java/com/battery/device/neware/NewareMysqlAdapterContractTest.java
@@ -16,6 +16,7 @@
import com.battery.device.api.TestDataObservationAdapter.CycleRecord;
import com.battery.device.api.TestDataObservationAdapter.SampleWatermark;
import com.battery.device.api.TestDataObservationAdapter.StepRecord;
+import com.battery.device.api.credentials.LocalCredentials;
import com.battery.device.api.model.AdapterCapabilities;
import com.battery.device.api.model.ChannelIdentity;
import com.battery.device.api.model.DetectedChannel;
@@ -429,22 +430,22 @@
{
// 文件、环境变量、启动参数都在时取文件。
java.nio.file.Files.writeString(file, key + "=from-file\n");
- assertEquals("from-file", NewareMysqlAdapterFactory.credential(key, file,
+ assertEquals("from-file", LocalCredentials.resolve(key, file,
Map.of(key, "from-env"), name -> "from-parameter"));
// 没有文件时退到环境变量。
java.nio.file.Files.delete(file);
- assertEquals("from-env", NewareMysqlAdapterFactory.credential(key, file,
+ assertEquals("from-env", LocalCredentials.resolve(key, file,
Map.of(key, "from-env"), name -> "from-parameter"));
// 前两者都没有时退到启动参数。
- assertEquals("from-parameter", NewareMysqlAdapterFactory.credential(key, file,
+ assertEquals("from-parameter", LocalCredentials.resolve(key, file,
Map.of(), name -> "from-parameter"));
// 三者都没有：失败信息里同时出现文件路径与键名。
var failure = org.junit.jupiter.api.Assertions.assertThrows(
com.battery.device.api.DeviceAdapterException.class,
- () -> NewareMysqlAdapterFactory.credential(key, file, Map.of(), name -> null));
+ () -> LocalCredentials.resolve(key, file, Map.of(), name -> null));
assertTrue(failure.getMessage().contains(file.toString()));
assertTrue(failure.getMessage().contains(key));
}
@@ -465,7 +466,7 @@
try
{
java.nio.file.Files.writeString(file, key + "=\n");
- assertEquals("from-env", NewareMysqlAdapterFactory.credential(key, file, Map.of(key, "from-env"),
+ assertEquals("from-env", LocalCredentials.resolve(key, file, Map.of(key, "from-env"),
name -> null));
}
finally
--
Gitblit v1.7.1