Fix encrypt e2e test case exception caused by EncryptRule#getLogicCol…

…umnByCipherColumn (#28709)
apache · Oct 10, 2023 · c2e6330 · c2e6330
1 parent 3dcf45d
commit c2e6330
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rule/EncryptTable.java
@@ -134,7 +134,7 @@ public boolean isCipherColumn(final String columnName) {
     public String getLogicColumnByCipherColumn(final String cipherColumnName) {
         for (Entry<String, EncryptColumn> entry : columns.entrySet()) {
             if (entry.getValue().getCipher().getName().equalsIgnoreCase(cipherColumnName)) {
-                return entry.getKey();
+                return entry.getValue().getName();
             }
         }
         throw new EncryptLogicColumnNotFoundException(cipherColumnName);

diff --git a/...s/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java b/...s/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rule/EncryptTableTest.java
@@ -80,7 +80,7 @@ void assertIsEncryptColumn() {
 
     @Test
     void assertGetLogicColumnByCipherColumn() {
-        assertNotNull(encryptTable.getLogicColumnByCipherColumn("cipherColumn"));
+        assertThat(encryptTable.getLogicColumnByCipherColumn("cipherColumn"), is("logicColumn"));
     }
 
     @Test
-Original file line number
+Diff line change
@@ Expand Up / @@ -80,7 +80,7 @@ void assertIsEncryptColumn() { @@
         @Test
         void assertGetLogicColumnByCipherColumn() {
-            assertNotNull(encryptTable.getLogicColumnByCipherColumn("cipherColumn"));
+            assertThat(encryptTable.getLogicColumnByCipherColumn("cipherColumn"), is("logicColumn"));
         }
         @Test
@@ Expand Down @@