[shardingsphere] branch master updated: Fix issue#8440 (#8454)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 8900ecd  Fix issue#8440 (#8454)
8900ecd is described below

commit 8900ecd1dcfd98e0bdf9bb8824cbc81a3ad83ba1
Author: huanghao495430759 <34...@users.noreply.github.com>
AuthorDate: Wed Dec 2 12:21:48 2020 +0800

    Fix issue#8440 (#8454)
    
    
    
    * Add test case for PostgreSQLCommand #8440
    
    * remove unnecessary comment and blank line.
    
    * fix:ExecuteResult cannot be converted to UpdateResult.
    
    * fix maven CI error :incompatible types: Collection<ExecuteResult> cannot be converted to Collection<UpdateResult>
    
    * fix maven CI error :incompatible types: Collection<ExecuteResult> cannot be converted to Collection<UpdateResult>
    
    * revert commit
    
    * fix:Unused import in UpdateResponseHeaderTest.class.
    
    Co-authored-by: huanghao-jk <hu...@360jinrong.net>
---
 .../header/update/UpdateResponseHeaderTest.java    | 56 ++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeaderTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeaderTest.java
new file mode 100644
index 0000000..be1d0ab
--- /dev/null
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeaderTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.proxy.backend.response.header.update;
+
+import org.apache.shardingsphere.infra.executor.sql.execute.result.update.UpdateResult;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Mockito.mock;
+
+public final class UpdateResponseHeaderTest {
+
+    @Test
+    public void assertPropertiesWhenExecuteResultOfEmptyList() {
+        UpdateResponseHeader updateResponseHeader = new UpdateResponseHeader(mock(SQLStatement.class));
+        assertThat(updateResponseHeader.getLastInsertId(), is(0L));
+        assertThat(updateResponseHeader.getUpdateCount(), is(0L));
+        updateResponseHeader.mergeUpdateCount();
+        assertThat(updateResponseHeader.getUpdateCount(), is(0L));
+    }
+
+    @Test
+    public void assertPropertiesWhenExecuteResultOfNotEmptyList() {
+        UpdateResponseHeader updateResponseHeader = new UpdateResponseHeader(mock(SQLStatement.class), getExecuteUpdateResults());
+        assertThat(updateResponseHeader.getLastInsertId(), is(4L));
+        assertThat(updateResponseHeader.getUpdateCount(), is(1L));
+        updateResponseHeader.mergeUpdateCount();
+        assertThat(updateResponseHeader.getUpdateCount(), is(4L));
+    }
+
+    private Collection<UpdateResult> getExecuteUpdateResults() {
+        UpdateResult updateResult1 = new UpdateResult(1, 2L);
+        UpdateResult updateResult2 = new UpdateResult(3, 4L);
+        return Arrays.asList(updateResult1, updateResult2);
+    }
+}