Merge pull request #973 in DESIGN/design from ~YAOH.WU/design:REPORT-19059 to release/10.0

* commit '2fe09845f647ced64297eff64c4c5f8c1d2b1fcb':
  REPORT-19059 环境切换同名程序数据集还是使用上一个环境的sql

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -41,7 +41,7 @@ import javax.swing.event.ChangeListener;
 import java.io.ByteArrayOutputStream;
 import java.text.Collator;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -123,6 +123,7 @@ public abstract class DesignTableDataManager {
      * @param dsNameChangedMap 改变名字的数据集
      */
     public static void fireDSChanged(Map<String, String> dsNameChangedMap) {
+        clearGlobalDs();
         if (!dsNameChangedMap.isEmpty()) {
             setDsNameChangedMap(dsNameChangedMap);
         }
@@ -334,15 +335,9 @@ public abstract class DesignTableDataManager {
 
     private static void addStoreProcedureData(java.util.Map<String, TableDataWrapper> resMap) {
         ProcedureConfig procedureConfig = ProcedureConfig.getInstance();
-        String[] namearray = new String[0];
-        @SuppressWarnings("unchecked")
-        java.util.Iterator<String> nameIt = procedureConfig.getProcedures().keySet().iterator();
-        while (nameIt.hasNext()) {
-            namearray = (String[]) ArrayUtils.add(namearray, nameIt.next());
-        }
-        Arrays.sort(namearray, Collator.getInstance(java.util.Locale.CHINA));
-
-        for (String name : namearray) {
+        List<String> names = new ArrayList<>(procedureConfig.getProcedures().keySet());
+        Collections.sort(names, Collator.getInstance(java.util.Locale.CHINA));
+        for (String name : names) {
             StoreProcedure storeProcedure = procedureConfig.getProcedure(name);
             if (globalDsCache.containsKey(name)) {
                 resMap.put(name, globalDsCache.get(name));

designer-base/src/test/java/com/fr/design/data/DesignTableDataManagerTest.java

@@ -0,0 +1,102 @@
+package com.fr.design.data;
+
+import com.fr.base.TableData;
+import com.fr.data.impl.storeproc.StoreProcedure;
+import com.fr.design.data.tabledata.wrapper.TableDataFactory;
+import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
+import com.fr.file.ProcedureConfig;
+import com.fr.file.TableDataConfig;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest({TableDataFactory.class, StoreProcedure.class, TableDataConfig.class, ProcedureConfig.class})
+@SuppressStaticInitializationFor({"com.fr.design.data.tabledata.wrapper.TableDataFactory"})
+public class DesignTableDataManagerTest {
+
+    @Test
+    public void testFireDataChange() {
+
+        DesignTableDataManager.envChange();
+
+
+        PowerMock.mockStatic(TableDataConfig.class);
+
+        TableDataConfig config = EasyMock.mock(TableDataConfig.class);
+        TableDataConfig config2 = EasyMock.mock(TableDataConfig.class);
+
+        TableData td1 = EasyMock.mock(TableData.class);
+        TableData td2 = EasyMock.mock(TableData.class);
+        TableData td3 = EasyMock.mock(TableData.class);
+        TableData td4 = EasyMock.mock(TableData.class);
+        EasyMock.expect(config.getTableData("firstData")).andReturn(td1).once();
+        EasyMock.expect(config.getTableData("secondData")).andReturn(td2).once();
+        EasyMock.expect(config2.getTableData("firstData")).andReturn(td3).once();
+        EasyMock.expect(config2.getTableData("secondData")).andReturn(td4).once();
+
+        EasyMock.expect(TableDataConfig.getInstance()).andReturn(config).once().andReturn(config2).once();
+
+        PowerMock.mockStatic(TableDataFactory.class);
+        EasyMock.expect(TableDataFactory.getSortOfChineseNameOfServerData(config))
+                .andReturn(new String[]{"firstData", "secondData"}).once();
+        EasyMock.expect(TableDataFactory.getSortOfChineseNameOfServerData(config2))
+                .andReturn(new String[]{"firstData", "secondData"}).once();
+
+
+        ProcedureConfig proConfig = EasyMock.mock(ProcedureConfig.class);
+        StoreProcedure pc1 = PowerMock.createMock(StoreProcedure.class);
+        StoreProcedure pc2 = PowerMock.createMock(StoreProcedure.class);
+        ProcedureConfig proConfig2 = EasyMock.mock(ProcedureConfig.class);
+        StoreProcedure pc3 = PowerMock.createMock(StoreProcedure.class);
+        StoreProcedure pc4 = PowerMock.createMock(StoreProcedure.class);
+
+        Map<String, StoreProcedure> procedureMap = new HashMap<>();
+        procedureMap.put("firstPRO", pc1);
+        procedureMap.put("secondPRO", pc2);
+        EasyMock.expect(proConfig.getProcedure("firstPRO")).andReturn(pc1).once();
+        EasyMock.expect(proConfig.getProcedure("secondPRO")).andReturn(pc2).once();
+
+        Map<String, StoreProcedure> procedureMap2 = new HashMap<>();
+        procedureMap2.put("firstPRO", pc3);
+        procedureMap2.put("secondPRO", pc4);
+        EasyMock.expect(proConfig2.getProcedure("firstPRO")).andReturn(pc3).once();
+        EasyMock.expect(proConfig2.getProcedure("secondPRO")).andReturn(pc4).once();
+
+        EasyMock.expect(proConfig.getProcedures()).andReturn(procedureMap).once();
+        EasyMock.expect(proConfig2.getProcedures()).andReturn(procedureMap2).once();
+
+        PowerMock.mockStatic(ProcedureConfig.class);
+        EasyMock.expect(ProcedureConfig.getInstance()).andReturn(proConfig).once().andReturn(proConfig2).once();
+
+        EasyMock.replay(proConfig, config, config2, proConfig2);
+        PowerMock.replay(TableDataFactory.class, TableDataConfig.class, ProcedureConfig.class);
+
+
+        Map<String, TableDataWrapper> map = DesignTableDataManager.getAllEditingDataSet(null);
+        Assert.assertEquals(4, map.size());
+        Assert.assertSame(pc1, map.get("firstPRO").getTableData());
+        Assert.assertSame(pc2, map.get("secondPRO").getTableData());
+        Assert.assertSame(td1, map.get("firstData").getTableData());
+        Assert.assertSame(td2, map.get("secondData").getTableData());
+
+        DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
+
+        Map<String, TableDataWrapper> map2 = DesignTableDataManager.getAllEditingDataSet(null);
+        Assert.assertEquals(4, map2.size());
+        Assert.assertSame(pc3, map2.get("firstPRO").getTableData());
+        Assert.assertSame(pc4, map2.get("secondPRO").getTableData());
+        Assert.assertSame(td3, map2.get("firstData").getTableData());
+        Assert.assertSame(td4, map2.get("secondData").getTableData());
+
+
+    }
+}