From d3c5df29176098fc37be905ee4e39117c7becd83 Mon Sep 17 00:00:00 2001
From: Henry Addison <hja22@me.com>
Date: Wed, 18 May 2011 14:43:27 +0100
Subject: [PATCH] added a few more cloudwatch request metric tests

---
 .../aws/requests/cloud_watch/metric_tests.rb  | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/tests/aws/requests/cloud_watch/metric_tests.rb b/tests/aws/requests/cloud_watch/metric_tests.rb
index 6378c326b..14c7cf646 100644
--- a/tests/aws/requests/cloud_watch/metric_tests.rb
+++ b/tests/aws/requests/cloud_watch/metric_tests.rb
@@ -13,12 +13,52 @@ Shindo.tests('AWS::CloudWatch | metric requests', ['aws', 'cloudwatch']) do
             "MetricName" => String,
             "Namespace" => String
           }],
-      }, 
-      'ResponseMetadata' => {"RequestId"=> String}
+        'NextToken' => Fog::Nullable::String,
+      },
+      'ResponseMetadata' => {"RequestId"=> String},
+    }
+    @instanceId = 'i-2f3eab59'
+    @dimension_filtered_metrics_list_format = {
+      'ListMetricsResult' => {
+        'Metrics' => 
+          [{
+            'Dimensions' => 
+            [{
+              'Name' => 'InstanceId',
+              'Value' => @instanceId
+            }],
+            "MetricName" => String,
+            "Namespace" => String
+          }],
+        'NextToken' => Fog::Nullable::String,
+      },
+      'ResponseMetadata' => {"RequestId"=> String},
     }
     
     tests("#list_metrics").formats(@metrics_list_format) do
       AWS[:cloud_watch].list_metrics.body
     end
+    
+    tests("#dimension_filtered_list_metrics").formats(@dimension_filtered_metrics_list_format) do
+      AWS[:cloud_watch].list_metrics('Dimensions' => [{'Name' => 'InstanceId', 'Value' => @instanceId}]).body
+    end
+    
+    tests("#metric_name_filtered_list_metrics").returns(true) do
+      metricName = "CPUUtilization"
+      AWS[:cloud_watch].list_metrics('MetricName' => metricName).body['ListMetricsResult']['Metrics'].all? do |metric|
+        metric['MetricName'] == metricName
+      end
+    end
+    
+    tests("#namespace_filtered_list_metrics").returns(true) do
+      namespace = "AWS/EC2"
+      AWS[:cloud_watch].list_metrics('Namespace' => namespace).body['ListMetricsResult']['Metrics'].all? do |metric|
+        metric['Namespace'] == namespace
+      end
+    end
+    
+    # tests("#get_metric_statistics").formats(@metrics_statistic_format) do
+    #       AWS[:cloud_watch].get_metric_statistics.body
+    #     end
   end
 end
\ No newline at end of file