rename the NodeEventType to NodeEventTypeEnum

This commit is contained in:
DigitalSonic
2020-01-22 16:51:16 +08:00
parent 82adaad442
commit e03511cdaa
6 changed files with 18 additions and 20 deletions
@@ -1,7 +1,6 @@
package com.alibaba.druid.pool.ha.node;
import org.junit.Test;
import sun.java2d.SurfaceDataProxy;
import java.util.List;
import java.util.Observable;
@@ -28,7 +27,7 @@ public class FileNodeListenerTest {
assertTrue(arg instanceof NodeEvent[]);
NodeEvent[] events = (NodeEvent[]) arg;
assertEquals(1, events.length);
assertEquals(NodeEventType.ADD, events[0].getType());
assertEquals(NodeEventTypeEnum.ADD, events[0].getType());
assertEquals("prefix1.foo", events[0].getNodeName());
assertEquals("jdbc:derby:memory:foo1;create=true", events[0].getUrl());
}
@@ -64,7 +63,7 @@ public class FileNodeListenerTest {
assertEquals(1, list.size());
NodeEvent event = list.get(0);
assertEquals(NodeEventType.ADD, event.getType());
assertEquals(NodeEventTypeEnum.ADD, event.getType());
assertEquals("prefix1.foo", event.getNodeName());
assertEquals("jdbc:derby:memory:foo1;create=true", event.getUrl());
}
@@ -24,7 +24,7 @@ public class NodeEventTest {
list = NodeEvent.getEventListFromProperties(p1, p2);
assertEquals(1, list.size());
NodeEvent event = list.get(0);
assertEquals(NodeEventType.DELETE, event.getType());
assertEquals(NodeEventTypeEnum.DELETE, event.getType());
assertEquals("foo", event.getNodeName());
assertEquals("foo_url", event.getUrl());
assertEquals("foo_username", event.getUsername());
@@ -33,7 +33,7 @@ public class NodeEventTest {
list = NodeEvent.getEventListFromProperties(p2, p1);
assertEquals(1, list.size());
event = list.get(0);
assertEquals(NodeEventType.ADD, event.getType());
assertEquals(NodeEventTypeEnum.ADD, event.getType());
assertEquals("foo", event.getNodeName());
assertEquals("foo_url", event.getUrl());
assertEquals("foo_username", event.getUsername());
@@ -10,7 +10,6 @@ import org.junit.Test;
import javax.sql.DataSource;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import static org.junit.Assert.*;
@@ -39,14 +38,14 @@ public class PoolUpdaterTest {
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
event.setType(NodeEventType.DELETE);
event.setType(NodeEventTypeEnum.DELETE);
updater.update(new FileNodeListener(), new NodeEvent[] { event });
validateDeleteNode();
event = new NodeEvent();
event.setNodeName("foo");
event.setType(NodeEventType.ADD);
event.setType(NodeEventTypeEnum.ADD);
updater.update(new FileNodeListener(), new NodeEvent[] { event });
assertFalse(updater.getNodesToDel().contains("foo"));
assertFalse(haDataSource.isInBlackList("foo"));
@@ -115,7 +114,7 @@ public class PoolUpdaterTest {
public void testDeleteNode_notExisted() {
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
event.setType(NodeEventType.DELETE);
event.setType(NodeEventTypeEnum.DELETE);
updater.deleteNode(event);
assertTrue(updater.getNodesToDel().isEmpty());
assertFalse(haDataSource.isInBlackList("foo"));
@@ -127,7 +126,7 @@ public class PoolUpdaterTest {
NodeEvent event = new NodeEvent();
event.setNodeName("foo");
event.setType(NodeEventType.DELETE);
event.setType(NodeEventTypeEnum.DELETE);
updater.deleteNode(event);
validateDeleteNode();
}
@@ -142,7 +141,7 @@ public class PoolUpdaterTest {
NodeEvent event = new NodeEvent();
event.setNodeName(name);
event.setUrl(url);
event.setType(NodeEventType.ADD);
event.setType(NodeEventTypeEnum.ADD);
updater.addNode(event);
}
}