Merge pull request #282 from iixlabs/develop

fix the wrong argument for query events from RDS
Netflix · Oct 28, 2016 · de83213 · de83213
2 parents d446da3 + 0ae5c51
commit de83213
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/src/main/java/com/netflix/simianarmy/aws/RDSRecorder.java b/src/main/java/com/netflix/simianarmy/aws/RDSRecorder.java
@@ -152,8 +152,8 @@ public List<Event> findEvents(MonkeyType monkeyType, Map<String, String> query,
     public List<Event> findEvents(MonkeyType monkeyType, EventType eventType, Map<String, String> query, Date after) {
         ArrayList<Object> args = new ArrayList<>();
         StringBuilder sqlquery = new StringBuilder(
-                String.format("select * from %s where region = ?", table, region));
-        args.add(table);
+                String.format("select * from %s where region = ?", table));
+        args.add(region);
 
         if (monkeyType != null) {
         	sqlquery.append(String.format(" and %s = ?", FIELD_MONKEY_TYPE));

diff --git a/src/test/java/com/netflix/simianarmy/aws/TestRDSRecorder.java b/src/test/java/com/netflix/simianarmy/aws/TestRDSRecorder.java
@@ -29,6 +29,7 @@
 import java.util.Map;
 
 import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Matchers;
 import org.mockito.Mockito;
 import org.springframework.jdbc.core.JdbcTemplate;
@@ -43,8 +44,10 @@
 // CHECKSTYLE IGNORE MagicNumberCheck
 public class TestRDSRecorder extends RDSRecorder {
 
+    private static final String REGION = "us-west-1";
+
     public TestRDSRecorder() {
-    	super(mock(JdbcTemplate.class), "recordertable", "us-west-1");
+    	super(mock(JdbcTemplate.class), "recordertable", REGION);
     }
 
     public enum Type implements MonkeyType {
@@ -120,8 +123,17 @@ public void testFindEvent() {
         events.add(evt1);
         events.add(evt2);
 		when(recorder.getJdbcTemplate().query(Matchers.anyString(), 
-         		                            Matchers.any(Object[].class), 
-         		                            Matchers.any(RowMapper.class))).thenReturn(events);
+				Matchers.argThat(new ArgumentMatcher<Object []>(){
+					@Override
+					public boolean matches(Object argument) {
+						Object [] args = (Object [])argument;
+						Assert.assertTrue(args[0] instanceof String);
+						Assert.assertEquals((String)args[0],REGION);
+						return true;
+					}
+
+				}), 
+         		Matchers.any(RowMapper.class))).thenReturn(events);
 
         Map<String, String> query = new LinkedHashMap<String, String>();
         query.put("instanceId", "testId1");
@@ -155,8 +167,17 @@ public void testFindEventNotFound() {
         ArrayList<Event> events = new ArrayList<>();
         TestRDSRecorder recorder = new TestRDSRecorder();
 		when(recorder.getJdbcTemplate().query(Matchers.anyString(), 
-         		                            Matchers.any(Object[].class), 
-         		                            Matchers.any(RowMapper.class))).thenReturn(events);
+				Matchers.argThat(new ArgumentMatcher<Object []>(){
+					@Override
+					public boolean matches(Object argument) {
+						Object [] args = (Object [])argument;
+						Assert.assertTrue(args[0] instanceof String);
+						Assert.assertEquals((String)args[0],REGION);
+						return true;
+					}
+
+				}), 
+         		Matchers.any(RowMapper.class))).thenReturn(events);
 
 		List<Event> results = recorder.findEvents(new HashMap<String, String>(), new Date());
 		Assert.assertEquals(results.size(), 0);