                         (:resource-events basic)
                         report-hash)]
         (response-equal? response expected munge-event-values)))
-
-    ;; NOTE: more exhaustive testing for these queries can be found in
-    ;; `com.puppetlabs.puppetdb.test.query.event`
-    (testing "should support querying resource events by timestamp"
-      (let [start-time  "2011-01-01T12:00:01-03:00"
-            end-time    "2011-01-01T12:00:03-03:00"]
-        (testing "should support single term timestamp queries"
-          (let [response (get-response ["<" "timestamp" end-time])
-                expected (expected-resource-events-response
-                            (filter #(< (to-long (:timestamp %)) (to-long end-time))
-                              (:resource-events basic))
-                            report-hash)]
-            (response-equal? response expected munge-event-values)))
-        (testing "should support compound timestamp queries"
-          (let [response (get-response ["and" [">" "timestamp" start-time]
-                                              ["<" "timestamp" end-time]])
-                expected (expected-resource-events-response
-                            (filter #(and (< (to-long (:timestamp %)) (to-long end-time))
-                                          (> (to-long (:timestamp %)) (to-long start-time)))
-                              (:resource-events basic))
-                            report-hash)]
-            (response-equal? response expected munge-event-values)))))
 
 
     (testing "query exceeding event-query-limit"

        (fn []
          (let [response (get-response ["=" "report" report-hash] {"limit" 500})
                expected (expected-resource-events-response
                            (:resource-events basic)
                            report-hash)]
            (response-equal? response expected munge-event-values)))))))

  (set (map #(expected-resource-event-response % report-hash) resource-events)))

(deftest query-by-report
  (let [basic         (:basic reports)
        report-hash   (store-example-report! basic (now))
        basic-events  (get-events-map basic)]

    ;; TODO: test invalid requests

