diff --git a/system-int-test/test/cmr/system_int_test/bootstrap/rebalance_collections_test.clj b/system-int-test/test/cmr/system_int_test/bootstrap/rebalance_collections_test.clj index 89b7b9e3d8..22d6f359cf 100644 --- a/system-int-test/test/cmr/system_int_test/bootstrap/rebalance_collections_test.clj +++ b/system-int-test/test/cmr/system_int_test/bootstrap/rebalance_collections_test.clj @@ -29,9 +29,9 @@ (deftest ^:oracle rebalance-collection-error-test (s/only-with-real-database (let [coll1 (d/ingest "PROV1" (dc/collection {:entry-title "coll1"}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "gran1"}) {:validate-keywords false}) + _ (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "gran1"})) coll2 (d/ingest "PROV1" (dc/collection {:entry-title "coll2"}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule coll2 {:granule-ur "gran2"}) {:validate-keywords false})] + _ (d/ingest "PROV1" (dg/granule coll2 {:granule-ur "gran2"}))] (index/wait-until-indexed) (testing "no permission for start-rebalance-collection" (is (= {:status 401 @@ -149,7 +149,7 @@ (defn ingest-granule-for-coll [coll n] (let [granule-ur (str (:entry-title coll) "_gran_" n)] - (d/ingest (:provider-id coll) (dg/granule coll {:granule-ur granule-ur}) {:validate-keywords false}))) + (d/ingest (:provider-id coll) (dg/granule coll {:granule-ur granule-ur})))) (defn inc-provider-holdings-for-coll "Increments the number of granules expected for a collection in the expected provider holdings" diff --git a/system-int-test/test/cmr/system_int_test/bootstrap/virtual_products_test.clj b/system-int-test/test/cmr/system_int_test/bootstrap/virtual_products_test.clj index 2e25832f32..7ef8adbf26 100644 --- a/system-int-test/test/cmr/system_int_test/bootstrap/virtual_products_test.clj +++ b/system-int-test/test/cmr/system_int_test/bootstrap/virtual_products_test.clj @@ -117,8 +117,7 @@ granule-ur (svm/sample-source-granule-urs [provider-id entry-title])] (vp/ingest-source-granule provider-id - (dg/granule source-coll {:granule-ur granule-ur}) - :validate-keywords false))) + (dg/granule source-coll {:granule-ur granule-ur})))) all-expected-granule-urs (concat (mapcat vp/source-granule->virtual-granule-urs source-granules) (map :granule-ur source-granules))] (index/wait-until-indexed) @@ -170,8 +169,7 @@ granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (vp/ingest-source-granule "LP_ALIAS" (dg/granule ast-coll {:granule-ur granule-ur - :project-refs ["proj1"]}) - :validate-keywords false) + :project-refs ["proj1"]})) virtual-granule-urs (vp/source-granule->virtual-granule-urs ast-l1a-gran) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) virtual-granule-urs)] (index/wait-until-indexed) @@ -223,8 +221,7 @@ granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (vp/ingest-source-granule "LPDAAC_ECS" (dg/granule ast-coll {:granule-ur granule-ur - :project-refs ["proj1"]}) - :validate-keywords false) + :project-refs ["proj1"]})) virtual-granule-urs (vp/source-granule->virtual-granule-urs ast-l1a-gran) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) virtual-granule-urs)] (index/wait-until-indexed) @@ -265,8 +262,7 @@ "LPDAAC_ECS" (dg/granule ast-coll {:granule-ur (format "SC:AST_L1A.003:%d" n) - :revision-id 5}) - :validate-keywords false))) + :revision-id 5})))) _ (bootstrap-and-index) v-granules (mapcat #(:refs (search/find-refs :granule diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj index d5ba32e778..974d2cdd33 100644 --- a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj +++ b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_ingest_test.clj @@ -309,8 +309,8 @@ ;; ingest the collections/granules for test _ (data-core/ingest-umm-spec-collection "PROV1" coll1-1 {:format :dif :validate-keywords false}) coll3 (data-core/ingest-umm-spec-collection "PROV1" coll1-3 {:format :dif :validate-keywords false}) - gran1 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll3 (:concept-id coll3) {:granule-ur "Granule1"}) {:validate-keywords false}) - gran2 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll3 (:concept-id coll3) {:granule-ur "Granule2"}) {:validate-keywords false})] + gran1 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll3 (:concept-id coll3) {:granule-ur "Granule1"})) + gran2 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll3 (:concept-id coll3) {:granule-ur "Granule2"}))] (index/wait-until-indexed) (testing "update the collection with a different entry-id is OK" @@ -446,12 +446,12 @@ (let [coll1 (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {:EntryTitle "E1" :ShortName "S1"}) {:validate-keywords false}) - gran1 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll1 (:concept-id coll1)) {:validate-keywords false}) - gran2 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll1 (:concept-id coll1)) {:validate-keywords false}) + gran1 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll1 (:concept-id coll1))) + gran2 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll1 (:concept-id coll1))) coll2 (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {:EntryTitle "E2":ShortName "S2"}) {:validate-keywords false}) - gran3 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll2 (:concept-id coll2)) {:validate-keywords false})] + gran3 (data-core/ingest "PROV1" (granule/granule-with-umm-spec-collection coll2 (:concept-id coll2)))] (index/wait-until-indexed) ;; delete collection diff --git a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_update_test.clj b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_update_test.clj index 4a6cb591d4..5098519b08 100644 --- a/system-int-test/test/cmr/system_int_test/ingest/collection/collection_update_test.clj +++ b/system-int-test/test/cmr/system_int_test/ingest/collection/collection_update_test.clj @@ -464,11 +464,11 @@ :ShortName "S3" :Projects (data-umm-cmn/projects "USGS_SOFIA")}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p1"]}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p2" "p3"]}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p3"]}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:project-refs ["p4"]}) {:validate-keywords false}) - _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll3 "C1-PROV1" {:project-refs ["USGS_SOFIA"]}) {:validate-keywords false})] + _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p1"]})) + _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p2" "p3"]})) + _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:project-refs ["p3"]})) + _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:project-refs ["p4"]})) + _ (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll3 "C1-PROV1" {:project-refs ["USGS_SOFIA"]}))] (cache-util/refresh-cache (url/refresh-humanizer-alias-cache-url) (transmit-config/echo-system-token)) (index/wait-until-indexed) @@ -532,9 +532,8 @@ :SpatialExtent (when spatial-params (data-umm-c/spatial spatial-params))}) {:validate-keywords false})) make-gran (fn [coll spatial] - (d/ingest "PROV1" - (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:spatial-coverage (when spatial (dg/spatial spatial))}) - {:validate-keywords false})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:spatial-coverage + (when spatial (dg/spatial spatial))}))) ;; Geodetic test collections coll-geodetic-no-grans (make-coll "coll-geodetic-no-grans" {:gsr "GEODETIC"}) @@ -791,12 +790,12 @@ :Platforms (data-umm-cmn/platforms "p4" "Terra")}) {:validate-keywords false})] ;; CMR-3926 We need to make sure granules with no platfrom ref do not inherit their parent collection's instrument - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1") {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "p1")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "p2" "AM-1")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "AM-1")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs (dg/platform-refs "p4")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs (dg/platform-refs "Terra")}) {:validate-keywords false}) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1")) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "p1")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "p2" "AM-1")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs (dg/platform-refs "AM-1")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs (dg/platform-refs "p4")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs (dg/platform-refs "Terra")})) (cache-util/refresh-cache (url/refresh-humanizer-alias-cache-url) (transmit-config/echo-system-token)) (index/wait-until-indexed) @@ -850,9 +849,9 @@ :Version "V1" :TilingIdentificationSystems (data-umm-c/tiling-identification-systems "CALIPSO" "MISR" "WRS-1" "WRS-2")}) {:validate-keywords false})] - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "MISR")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "MISR")}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "CALIPSO")}) {:validate-keywords false}) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "MISR")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "MISR")})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:two-d-coordinate-system (dg/two-d "CALIPSO")})) (index/wait-until-indexed) (testing "Update collection successful cases" (are3 @@ -912,12 +911,12 @@ :Platforms [(data-umm-cmn/platform-with-instrument-and-childinstruments "p2" "i2" "s1" "GPS RECEIVERS")]}) {:validate-keywords false})] ;; CMR-3926 We need to make sure granules with no instrument ref or sensor ref do not inherit their parent collection's instrument or sensor - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1") {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "i1")]}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "i2" "GPS")]}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "GPS")]}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-ref-and-sensor-refs "p2" "i2" "s1")]}) {:validate-keywords false}) - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-ref-and-sensor-refs "p2" "i2" "GPS RECEIVERS")]}) {:validate-keywords false}) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1")) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "i1")]})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "i2" "GPS")]})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-refs "p1-1" "GPS")]})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-ref-and-sensor-refs "p2" "i2" "s1")]})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 "C1-PROV1" {:platform-refs [(dg/platform-ref-with-instrument-ref-and-sensor-refs "p2" "i2" "GPS RECEIVERS")]})) (index/wait-until-indexed) (cache-util/refresh-cache (url/refresh-humanizer-alias-cache-url) (transmit-config/echo-system-token)) (testing "Update collection successful cases" @@ -1001,12 +1000,12 @@ (dg/psa "DTS" ["2012-01-01T01:02:03Z"])]} coll (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection collection-map) {:validate-keywords false}) - gran (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" granule-map) {:validate-keywords false})] + gran (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" granule-map))] (are3 [coll-map gran-map] (let [response (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection coll-map) {:validate-keywords false}) - response2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" gran-map) {:validate-keywords false}) + response2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll "C1-PROV1" gran-map)) {:keys [status errors]} response] (is (= [200 nil] [status errors])) (is (= [201 nil] [(:status response2) (:errors response2)]))) diff --git a/system-int-test/test/cmr/system_int_test/ingest/granule/granule_ingest_test.clj b/system-int-test/test/cmr/system_int_test/ingest/granule/granule_ingest_test.clj index b53d18dee6..878abe39c3 100644 --- a/system-int-test/test/cmr/system_int_test/ingest/granule/granule_ingest_test.clj +++ b/system-int-test/test/cmr/system_int_test/ingest/granule/granule_ingest_test.clj @@ -51,16 +51,13 @@ ;; Create granules associated with the collection fields. gran1 (data-core/ingest "PROV1" (update-in (granule/granule-with-umm-spec-collection new-coll (:concept-id new-coll)) [:collection-ref] - dissoc :ShortName :Version) - {:validate-keywords false}) + dissoc :ShortName :Version)) gran2 (data-core/ingest "PROV1" (update-in (granule/granule-with-umm-spec-collection new-coll (:concept-id new-coll)) [:collection-ref] - dissoc :EntryTitle) - {:validate-keywords false}) + dissoc :EntryTitle)) gran3 (data-core/ingest "PROV1" (update-in (granule/granule-with-umm-spec-collection new-coll (:concept-id new-coll)) [:collection-ref] - dissoc :ShortName :Version :EntryTitle) - {:validate-keywords false})] + dissoc :ShortName :Version :EntryTitle))] (index/wait-until-indexed) ;; Make sure the granules reference the correct collection (is (= (:concept-id new-coll) @@ -95,15 +92,15 @@ coll2 (:concept-id coll2) {:native-id "gran-native1-1"})) - {:keys [concept-id revision-id]} (ingest/ingest-concept gran1 {:validate-keywords false}) - {:keys [status errors]} (ingest/ingest-concept gran2 {:allow-failure? true :validate-keywords false})] + {:keys [concept-id revision-id]} (ingest/ingest-concept gran1) + {:keys [status errors]} (ingest/ingest-concept gran2 {:allow-failure? true})] (is (= 422 status)) (is (= [(format "Granule's parent collection cannot be changed, was [%s], now [%s]." (:concept-id coll1) (:concept-id coll2))] errors)) (testing "Ingest granule with the same native id as a deleted granule in another collection is OK" (ingest/delete-concept gran1) - (let [{:keys [status]} (ingest/ingest-concept gran2 {:allow-failure? true :validate-keywords false})] + (let [{:keys [status]} (ingest/ingest-concept gran2 {:allow-failure? true})] (is (= 200 status)) ;; revision 1 granule's parent collection is coll1 (is (= (:concept-id coll1) @@ -134,14 +131,14 @@ (testing "ingest of a new granule" (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) - {:keys [concept-id revision-id]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [concept-id revision-id]} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (mdb/concept-exists-in-mdb? concept-id revision-id)) (is (= 1 revision-id)))) (testing "ingest of a new granule with a revision id" (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (assoc (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) :revision-id 5) - {:keys [concept-id revision-id]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [concept-id revision-id]} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (mdb/concept-exists-in-mdb? concept-id 5)) (is (= 5 revision-id))))) @@ -153,7 +150,7 @@ supplied-concept-id "G1-PROV1" granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id supplied-concept-id})) - {:keys [concept-id revision-id]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [concept-id revision-id]} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (mdb/concept-exists-in-mdb? concept-id revision-id)) (is (= supplied-concept-id concept-id)) @@ -166,7 +163,7 @@ (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) n 4 granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1"})) - created-granules (doall (take n (repeatedly n #(ingest/ingest-concept granule {:validate-keywords false}))))] + created-granules (doall (take n (repeatedly n #(ingest/ingest-concept granule))))] (index/wait-until-indexed) (is (apply = (map :concept-id created-granules))) (is (= (range 1 (inc n)) (map :revision-id created-granules)))))) @@ -176,7 +173,7 @@ (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) granule-with-empty-body (assoc granule :metadata "") - {:keys [status errors]} (ingest/ingest-concept granule-with-empty-body {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule-with-empty-body)] (index/wait-until-indexed) (is (= 400 status)) (is (re-find #"Request content is too short." (first errors))))) @@ -187,7 +184,7 @@ (testing "json response" (let [granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) - response (ingest/ingest-concept granule {:accept-format :json :raw? true :validate-keywords false}) + response (ingest/ingest-concept granule {:accept-format :json :raw? true}) {:keys [concept-id revision-id]} (ingest/parse-ingest-body :json response)] (index/wait-until-indexed) (is (= 201 (:status response))) @@ -196,7 +193,7 @@ (testing "xml response" (let [granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) - response (ingest/ingest-concept granule {:accept-format :xml :raw? true :validate-keywords false}) + response (ingest/ingest-concept granule {:accept-format :xml :raw? true}) {:keys [status concept-id revision-id]} (ingest/parse-ingest-body :xml response)] (index/wait-until-indexed) (is (= 201 (:status response))) @@ -210,7 +207,7 @@ (let [umm-granule (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1" :granule-ur "Gran1"}) granule (data-core/item->concept umm-granule) - response (ingest/ingest-concept granule {:accept-format :json :raw? true :validate-keywords false}) + response (ingest/ingest-concept granule {:accept-format :json :raw? true}) status (:status response) {:keys [errors]} (ingest/parse-ingest-body :json response)] (is (= [422 ["Collection with Entry Title [Coll1] referenced in granule [Gran1] provider [PROV1] does not exist."]] @@ -219,7 +216,7 @@ (let [umm-granule (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1" :granule-ur "Gran1"}) granule (data-core/item->concept umm-granule) - response (ingest/ingest-concept granule {:accept-format :xml :raw? true :validate-keywords false}) + response (ingest/ingest-concept granule {:accept-format :xml :raw? true}) status (:status response) {:keys [errors]} (ingest/parse-ingest-body :xml response)] (is (= [422 ["Collection with Entry Title [Coll1] referenced in granule [Gran1] provider [PROV1] does not exist."]] @@ -230,14 +227,14 @@ (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false})] (testing "json response" (let [granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1"})) - _ (ingest/ingest-concept granule {:validate-keywords false}) + _ (ingest/ingest-concept granule) response (ingest/delete-concept granule {:accept-format :json :raw? true})] (index/wait-until-indexed) (is (= {:concept-id "G1-PROV1" :revision-id 2} (select-keys (ingest/parse-ingest-body :json response) [:concept-id :revision-id]))))) (testing "xml response" (let [granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G2-PROV1"})) - _ (ingest/ingest-concept granule {:validate-keywords false}) + _ (ingest/ingest-concept granule) response (ingest/delete-concept granule {:accept-format :xml :raw? true})] (index/wait-until-indexed) (is (= {:concept-id "G2-PROV1" :revision-id 2} @@ -248,7 +245,7 @@ result in revision id 1 greater than max revision id of the concept prior to the delete" (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1"})) - ingest-result (ingest/ingest-concept granule {:validate-keywords false}) + ingest-result (ingest/ingest-concept granule) delete-result (ingest/delete-concept granule) ingest-revision-id (:revision-id ingest-result) delete-revision-id (:revision-id delete-result)] @@ -257,7 +254,7 @@ (testing "Deleting existing concept with a revision-id should respect the revision id" (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G2-PROV1"})) - _ (ingest/ingest-concept granule {:validate-keywords false}) + _ (ingest/ingest-concept granule) delete-result (ingest/delete-concept granule {:revision-id 5}) delete-revision-id (:revision-id delete-result)] (index/wait-until-indexed) @@ -280,7 +277,7 @@ granule (data-core/item->concept (assoc (granule/granule-with-umm-spec-collection collection (:concept-id collection)) :format "application/echo10+xml; charset=utf-8")) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (= 201 status)))) @@ -288,7 +285,7 @@ (deftest missing-content-type-ingest-test (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) - response (ingest/ingest-concept (assoc granule :format "") {:accept-format :json :raw? true :validate-keywords false}) + response (ingest/ingest-concept (assoc granule :format "") {:accept-format :json :raw? true}) status (:status response) {:keys [errors]} (ingest/parse-ingest-body :json response)] (index/wait-until-indexed) @@ -299,7 +296,7 @@ (deftest invalid-content-type-ingest-test (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection))) - response (ingest/ingest-concept (assoc granule :format "blah") {:accept-format :json :raw? true :validate-keywords false}) + response (ingest/ingest-concept (assoc granule :format "blah") {:accept-format :json :raw? true}) status (:status response) {:keys [errors]} (ingest/parse-ingest-body :json response)] (index/wait-until-indexed) @@ -311,7 +308,7 @@ (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) granule (data-core/item->concept (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:concept-id "G1-PROV1"})) - ingest-result (ingest/ingest-concept granule {:validate-keywords false}) + ingest-result (ingest/ingest-concept granule) delete1-result (ingest/delete-concept granule) delete2-result (ingest/delete-concept granule)] (index/wait-until-indexed) @@ -329,7 +326,7 @@ :granule-ur "Gran1"}) granule (data-core/item->concept umm-granule) _ (ingest/delete-concept (data-core/item->concept collection :echo10)) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (= [422 ["Collection with Entry Title [Coll1] referenced in granule [Gran1] provider [PROV1] does not exist."]] [status errors])) @@ -340,7 +337,7 @@ (let [collection (data-core/ingest-umm-spec-collection "PROV1" (data-umm-c/collection {}) {:validate-keywords false}) umm-granule (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:native-id "Name/With/Slashes"}) granule (data-core/item->concept umm-granule) - {:keys [concept-id revision-id] :as response} (ingest/ingest-concept granule {:validate-keywords false}) + {:keys [concept-id revision-id] :as response} (ingest/ingest-concept granule) ingested-concept (mdb/get-concept concept-id)] (index/wait-until-indexed) (is (= 201 (:status response))) @@ -359,7 +356,7 @@ (string/replace "2010-12-12T12:00:00" "A") ;; this is to cause validation error for iso-smap format (string/replace "gmd:DS_Series" "XXXX"))) - {:keys [status errors]} (ingest/ingest-concept invalid-granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept invalid-granule)] (is (= [400 validation-errors] [status errors]) (prn-str errors))) "ECHO10 invalid datetime format" @@ -384,7 +381,7 @@ (let [granule (-> (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:granule-ur "Gran1"}) (assoc :collection-ref (umm-g/map->CollectionRef attrs)) (data-core/item->concept :iso-smap)) - {:keys [status] :as response} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status] :as response} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (#{200 201} status) (pr-str response))) @@ -405,7 +402,7 @@ granule (-> (granule/granule-with-umm-spec-collection collection (:concept-id collection) {:granule-ur "Gran1"}) (assoc :collection-ref collection-ref) (data-core/item->concept :iso-smap)) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (is (= [422 expected-errors] [status errors]))) "Missing everything" @@ -448,7 +445,7 @@ (granule/granule-with-umm-spec-collection (json/parse-string cddis-umm true) coll-concept-id {:concept-id gran-concept-id})) - ingest-granule-response (ingest/ingest-concept granule {:validate-keywords false}) + ingest-granule-response (ingest/ingest-concept granule) _ (index/wait-until-indexed) coll-content-type (-> (search/retrieve-concept coll-concept-id 1 {:url-extension "native"}) :headers @@ -473,13 +470,11 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata))] (is (= 422 status)))) (testing "Valid orbit" (let [{:keys [status]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap valid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap valid-gran-metadata))] (is (= 201 status)))))) (deftest CMR-9013-invalid-orbit-data @@ -490,8 +485,7 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata))] (is (= 422 status)) (is (= [{:errors ["[Orbit] must be provided when the parent collection's GranuleSpatialRepresentation is ORBIT"], :path ["SpatialCoverage" "Orbit"]}] @@ -505,8 +499,7 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata))] (is (= 422 status)) (is (= ["Spatial validation error: Unsupported gmd:description inside gmd:EX_GeographicDescription - The supported ones are: OrbitParameters and OrbitCalculatedSpatialDomains"] (:errors (first errors)))))))) @@ -525,8 +518,7 @@ (ingest/ingest-concept (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap invalid-gran-metadata))] (is (= 422 status)) (is (= expected-errors errors)))))) @@ -538,8 +530,7 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :iso-smap valid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :iso-smap valid-gran-metadata))] (is (= 201 status)) (is (= nil errors)))))) @@ -557,8 +548,7 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :echo10 invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :echo10 invalid-gran-metadata))] (is (= 422 status)) (is (= expected-errors errors)))))) @@ -570,8 +560,7 @@ (ingest/concept :collection "PROV1" "foo" :iso19115 coll-metadata) {:validate-keywords false}) (let [{:keys [status errors]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :echo10 invalid-gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :echo10 invalid-gran-metadata))] (is (= 201 status)) (is (= nil errors)))))) @@ -603,7 +592,7 @@ {:granule-ur "gran2" :data-provider-timestamps {:delete-time (t/plus (tk/now) (t/seconds 90))}}) - response (data-core/ingest "PROV1" granule {:format :umm-json :validate-keywords false})] + response (data-core/ingest "PROV1" granule {:format :umm-json})] (is (= 201 (:status response))) (index/wait-until-indexed) (data-core/assert-refs-match [response] (search/find-refs :granule {})) @@ -629,7 +618,7 @@ {:granule-ur "Gran1" :collection-ref (umm-g/map->CollectionRef attrs)}) (data-core/item->concept :umm-json)) - {:keys [status] :as response} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status] :as response} (ingest/ingest-concept granule)] (index/wait-until-indexed) (is (#{200 201} status) (pr-str response))) @@ -651,7 +640,7 @@ collection (:concept-id collection) {:granule-ur "Gran1" :collection-ref collection-ref}) (data-core/item->concept :umm-json)) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (is (= expected-status status)) (is (= expected-errors errors))) @@ -701,7 +690,7 @@ :identifier-type "a type of identifier"]})}) (data-core/item->concept {:format :umm-json :version "1.6.6"})) - {:keys [status] :as response} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status] :as response} (ingest/ingest-concept granule)] (is (#{200 201} status) (pr-str response)))) (testing "Ingest UMM-G granule with invalid UMM-G version" @@ -712,7 +701,7 @@ :collection-ref (umm-g/map->CollectionRef {:entry-title "correct"})}) (data-core/item->concept {:format :umm-json :version "1.1"})) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (is (= 400 status)) (is (= ["Invalid UMM JSON schema version: 1.1"] errors)))) @@ -724,7 +713,7 @@ :collection-ref (umm-g/map->CollectionRef {:entry-title "correct"})}) (data-core/item->concept :umm-json)) granule-with-empty-body (assoc granule :metadata "") - {:keys [status errors]} (ingest/ingest-concept granule-with-empty-body {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule-with-empty-body)] (is (= 400 status)) (is (= ["Request content is too short."] errors)))) @@ -735,7 +724,7 @@ {:granule-ur "" :collection-ref (umm-g/map->CollectionRef {:entry-title "correct"})}) (data-core/item->concept :umm-json)) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (is (= 400 status)) (is (= ["#/GranuleUR: expected minLength: 1, actual: 0"] errors)))) @@ -749,7 +738,7 @@ attrs)] :collection-ref (umm-g/map->CollectionRef {:entry-title "correct"})}) (data-core/item->concept :umm-json)) - {:keys [status errors]} (ingest/ingest-concept granule {:validate-keywords false})] + {:keys [status errors]} (ingest/ingest-concept granule)] (is (= 400 status)) (is (= expected-errors errors))) diff --git a/system-int-test/test/cmr/system_int_test/ingest/granule/granule_parent_dependency_test.clj b/system-int-test/test/cmr/system_int_test/ingest/granule/granule_parent_dependency_test.clj index 092c06c103..f989fcdbb2 100644 --- a/system-int-test/test/cmr/system_int_test/ingest/granule/granule_parent_dependency_test.clj +++ b/system-int-test/test/cmr/system_int_test/ingest/granule/granule_parent_dependency_test.clj @@ -191,7 +191,7 @@ (are3 [exp-errors gran] (is (= exp-errors (flatten (map (fn [error] (:errors error)) - (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true :validate-keywords false})))))) + (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true})))))) "gran-Terra-coll1 success test" [] @@ -335,7 +335,7 @@ (are3 [exp-errors gran] (is (= exp-errors (flatten (map (fn [error] (:errors error)) - (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true :validate-keywords false})))))) + (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true})))))) "A granule ingested in collection A with OldName is permitted" [] @@ -460,7 +460,7 @@ (are3 [exp-errors gran] (is (= exp-errors (flatten (map (fn [error] (:errors error)) - (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true :validate-keywords false})))))) + (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true})))))) "A granule ingested in collection A with OldName is permitted" [] @@ -548,7 +548,7 @@ (are3 [exp-errors gran] (is (= exp-errors (flatten (map (fn [error] (:errors error)) - (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true :validate-keywords false})))))) + (:errors (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true})))))) "ECHO10 collection" [] gran-for-echo10-coll @@ -622,7 +622,7 @@ coll (data-umm-c/collection coll-data) _ (d/ingest-umm-spec-collection "PROV1" coll {:format :echo10 :validate-keywords false}) gran (dg/granule-with-umm-spec-collection coll (:concept-id coll) gran-data) - _ (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true :validate-keywords false})] + _ (d/ingest "PROV1" gran {:format :echo10 :allow-failure? true})] (index/wait-until-indexed) (are [exp-errors metadata-format] @@ -651,8 +651,7 @@ {:validate-keywords false}) gran-metadata (slurp (io/resource "iso-samples/nsidc-cmr-3177-granule.xml")) {:keys [status]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata))] (is (= 201 status))))) (deftest iso-smap-collection-echo10-granule @@ -664,8 +663,7 @@ {:validate-keywords false}) gran-metadata (slurp (io/resource "iso-samples/cmr-4125-granule.xml")) {:keys [status]} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata) - {:validate-keywords false})] + (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata))] (is (= 201 status))))) ;; Test specific to an issue ingesting an echo10 granule with a polygon in spatial data with @@ -699,7 +697,7 @@ coll1 (data-umm-c/collection coll-data1) _ (d/ingest-umm-spec-collection "PROV1" coll1 {:format :iso19115 :validate-keywords false}) gran1 (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) gran-data1) - granule-result (d/ingest "PROV1" gran1 {:format :echo10 :allow-failure? true :validate-keywords false})] + granule-result (d/ingest "PROV1" gran1 {:format :echo10 :allow-failure? true})] ;; The test is checking that the exception does not occur ;; 422 status is the expected behavior (is (= 422 (:status granule-result))) diff --git a/system-int-test/test/cmr/system_int_test/ingest/misc/ingest_lifecycle_integration_test.clj b/system-int-test/test/cmr/system_int_test/ingest/misc/ingest_lifecycle_integration_test.clj index 35a8129853..037fbfd2c8 100644 --- a/system-int-test/test/cmr/system_int_test/ingest/misc/ingest_lifecycle_integration_test.clj +++ b/system-int-test/test/cmr/system_int_test/ingest/misc/ingest_lifecycle_integration_test.clj @@ -89,7 +89,7 @@ (assert-valid granule) ;; Granule is valid sent with parent collection (assert-granule-with-parent-collection-valid granule coll) - (let [response (d/ingest "PROV1" (dissoc granule :revision-id) {:validate-keywords false})] + (let [response (d/ingest "PROV1" (dissoc granule :revision-id))] (is (#{200 201} (:status response))) response)) diff --git a/system-int-test/test/cmr/system_int_test/search/acls/granule_test.clj b/system-int-test/test/cmr/system_int_test/search/acls/granule_test.clj index abc9d1c9d4..273690b09f 100644 --- a/system-int-test/test/cmr/system_int_test/search/acls/granule_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/acls/granule_test.clj @@ -40,7 +40,7 @@ (let [prov (:provider-id coll) attribs (merge {:granule-ur (str "gran" n)} attribs)] - (d/ingest prov (dg/granule coll attribs) {:validate-keywords false})))) + (d/ingest prov (dg/granule coll attribs))))) (comment (do diff --git a/system-int-test/test/cmr/system_int_test/search/acls/temporal_collection_granule_test.clj b/system-int-test/test/cmr/system_int_test/search/acls/temporal_collection_granule_test.clj index f1c50d0472..e443c8b70a 100644 --- a/system-int-test/test/cmr/system_int_test/search/acls/temporal_collection_granule_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/acls/temporal_collection_granule_test.clj @@ -84,19 +84,19 @@ ;; Create collections (let [coll1 (single-date-coll 1 :echo10) - gran1 (d/ingest "PROV1" (dg/granule coll1) {:validate-keywords false}) + gran1 (d/ingest "PROV1" (dg/granule coll1)) coll2 (range-date-coll 2 3 :dif) - gran2 (d/ingest "PROV1" (dg/granule coll2) {:validate-keywords false}) + gran2 (d/ingest "PROV1" (dg/granule coll2)) coll3 (single-date-coll 4 :iso19115) - gran3 (d/ingest "PROV1" (dg/granule coll3) {:validate-keywords false}) + gran3 (d/ingest "PROV1" (dg/granule coll3)) coll4 (range-date-coll 5 6 :iso19115) - gran4 (d/ingest "PROV1" (dg/granule coll4) {:validate-keywords false}) + gran4 (d/ingest "PROV1" (dg/granule coll4)) coll5 (range-date-coll 3 nil :iso-smap) ;; no end date - gran5 (d/ingest "PROV1" (dg/granule coll5) {:validate-keywords false}) + gran5 (d/ingest "PROV1" (dg/granule coll5)) coll6 (single-date-coll 8 :iso-smap) - gran6 (d/ingest "PROV1" (dg/granule coll6) {:validate-keywords false}) + gran6 (d/ingest "PROV1" (dg/granule coll6)) coll7 (single-date-coll 9 :echo10) - gran7 (d/ingest "PROV1" (dg/granule coll7) {:validate-keywords false}) + gran7 (d/ingest "PROV1" (dg/granule coll7)) all-coll-concept-ids (map :concept-id [coll1 coll2 coll3 coll4 coll5 coll6 coll7]) all-gran-concept-ids (map :concept-id [gran1 gran2 gran3 gran4 gran5 gran6 gran7]) diff --git a/system-int-test/test/cmr/system_int_test/search/collection/collection_search_format_test.clj b/system-int-test/test/cmr/system_int_test/search/collection/collection_search_format_test.clj index 8b16fdc1e8..3190f42266 100644 --- a/system-int-test/test/cmr/system_int_test/search/collection/collection_search_format_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/collection/collection_search_format_test.clj @@ -430,12 +430,12 @@ ; ingested and found (deftest dif-with-spatial (let [c1 (d/ingest "PROV1" (dc/collection-dif {:spatial-coverage nil}) {:format :dif :validate-keywords false}) - g1 (d/ingest "PROV1" (dg/granule c1) {:validate-keywords false}) + g1 (d/ingest "PROV1" (dg/granule c1)) ;; A collection with a granule spatial representation c2 (d/ingest "PROV1" (dc/collection-dif {:spatial-coverage (dc/spatial {:gsr :geodetic})}) {:format :dif :validate-keywords false}) - g2 (d/ingest "PROV1" (dg/granule c2 {:spatial-coverage (dg/spatial (m/mbr -160 45 -150 35))}) {:validate-keywords false}) + g2 (d/ingest "PROV1" (dg/granule c2 {:spatial-coverage (dg/spatial (m/mbr -160 45 -150 35))})) ;; A collections with a granule spatial representation and spatial data @@ -445,7 +445,7 @@ :sr :geodetic :geometries [(m/mbr -10 9 0 -10)]})}) {:format :dif :validate-keywords false}) - g3 (d/ingest "PROV1" (dg/granule c3 {:spatial-coverage (dg/spatial m/whole-world)}) {:validate-keywords false})] + g3 (d/ingest "PROV1" (dg/granule c3 {:spatial-coverage (dg/spatial m/whole-world)}))] (index/wait-until-indexed) (testing "spatial search for dif collections" diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_campaign_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_campaign_search_test.clj index cf9c75a7e0..11afadc746 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_campaign_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_campaign_search_test.clj @@ -17,14 +17,11 @@ (data-umm-c/collection {:Projects (data-umm-cmn/projects "ABC" "XYZ" "PDQ" "RST")}) {:validate-keywords false}) gran1 (d/ingest "PROV1" - (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule1" :project-refs ["ABC"]}) - {:validate-keywords false}) + (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule1" :project-refs ["ABC"]})) gran2 (d/ingest "PROV1" - (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule2" :project-refs ["ABC" "XYZ"]}) - {:validate-keywords false}) + (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule2" :project-refs ["ABC" "XYZ"]})) gran3 (d/ingest "PROV1" - (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule3" :project-refs ["PDQ" "RST"]}) - {:validate-keywords false})] + (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule3" :project-refs ["PDQ" "RST"]}))] (index/wait-until-indexed) (testing "search by campaign" diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_counts_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_counts_search_test.clj index f61cb342fa..1c936a95cc 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_counts_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_counts_search_test.clj @@ -75,7 +75,7 @@ ([coll shape temporal-attribs provider] (let [spatial-attribs (when shape {:spatial-coverage (dg/spatial shape)}) gran-attribs (merge {} spatial-attribs temporal-attribs)] - (d/ingest provider (dg/granule coll gran-attribs) {:validate-keywords false})))) + (d/ingest provider (dg/granule coll gran-attribs))))) (defn- make-orbit-gran "Creates a granule which has spatial metadata defined by orbital parameters." diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_orbit_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_orbit_search_test.clj index e451513544..d1c6aae214 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_orbit_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_orbit_search_test.clj @@ -36,8 +36,7 @@ dg/spatial orbit nil)} - other-attribs)) - {:validate-keywords false})))) + other-attribs)))))) (deftest orbit-bug-CMR-4722 (let [coll (d/ingest-concept-with-metadata-file "CMR-4722/OMSO2.003-collection.xml" diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_platform_instrument_sensor_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_platform_instrument_sensor_search_test.clj index f36630e1e2..d284b205c4 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_platform_instrument_sensor_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_platform_instrument_sensor_search_test.clj @@ -30,15 +30,15 @@ pr7 (dg/platform-ref {:short-name "PLATform-X"}) coll1 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 1 {:Platforms [p1 p2 p3 p4]}) {:validate-keywords false}) coll2 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 2 {:Platforms [p0 p5 p6 p7]}) {:validate-keywords false}) - gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1]}) {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1 pr2]}) {:validate-keywords false}) - gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr2]}) {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr3]}) {:validate-keywords false}) - gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr4]}) {:validate-keywords false}) - gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {}) {:validate-keywords false}) - gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr5]}) {:validate-keywords false}) - gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr6]}) {:validate-keywords false}) - gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr7]}) {:validate-keywords false})] + gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1]})) + gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1 pr2]})) + gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr2]})) + gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr3]})) + gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr4]})) + gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {})) + gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr5]})) + gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr6]})) + gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr7]}))] (index/wait-until-indexed) @@ -132,16 +132,16 @@ pr8 (dg/platform-ref {:short-name "platform-8" :instrument-refs [ir7]}) coll1 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 1 {:ShortName "SHORT1" :Platforms [p1 p2 p3 p4 p5]}) {:validate-keywords false}) coll2 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 2 {:Platforms [p0 p6 p7 p8]}) {:validate-keywords false}) - gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran1" :platform-refs [pr1]}) {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran2" :platform-refs [pr1 pr2]}) {:validate-keywords false}) - gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran3" :platform-refs [pr2]}) {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran4" :platform-refs [pr3]}) {:validate-keywords false}) - gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran5" :platform-refs [pr4]}) {:validate-keywords false}) - gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran6" :platform-refs [pr5]}) {:validate-keywords false}) - gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran7" }) {:validate-keywords false}) - gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran8" :platform-refs [pr6]}) {:validate-keywords false}) - gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran9" :platform-refs [pr7]}) {:validate-keywords false}) - gran10 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran10" :platform-refs [pr8]}) {:validate-keywords false})] + gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran1" :platform-refs [pr1]})) + gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran2" :platform-refs [pr1 pr2]})) + gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran3" :platform-refs [pr2]})) + gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran4" :platform-refs [pr3]})) + gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran5" :platform-refs [pr4]})) + gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "gran6" :platform-refs [pr5]})) + gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran7" })) + gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran8" :platform-refs [pr6]})) + gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran9" :platform-refs [pr7]})) + gran10 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:granule-ur "gran10" :platform-refs [pr8]}))] (index/wait-until-indexed) @@ -267,17 +267,17 @@ pr9 (dg/platform-ref {:short-name "platform-9" :instrument-refs [ir8]}) coll1 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 1 {:Platforms [p1 p2 p3 p4 p5 p6]}) {:validate-keywords false}) coll2 (d/ingest-umm-spec-collection "PROV1" (data-umm-c/collection 2 {:Platforms [p0 p7 p8 p9]}) {:validate-keywords false}) - gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1]}) {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1 pr2]}) {:validate-keywords false}) - gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr2]}) {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr3]}) {:validate-keywords false}) - gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr4]}) {:validate-keywords false}) - gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr5]}) {:validate-keywords false}) - gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr6]}) {:validate-keywords false}) - gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {}) {:validate-keywords false}) - gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr7]}) {:validate-keywords false}) - gran10 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr8]}) {:validate-keywords false}) - gran11 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr9]}) {:validate-keywords false})] + gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1]})) + gran2 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr1 pr2]})) + gran3 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr2]})) + gran4 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr3]})) + gran5 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr4]})) + gran6 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr5]})) + gran7 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:platform-refs [pr6]})) + gran8 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {})) + gran9 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr7]})) + gran10 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr8]})) + gran11 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll2 (:concept-id coll2) {:platform-refs [pr9]}))] (index/wait-until-indexed) diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_psa_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_psa_search_test.clj index 901418d578..e9014fdd36 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_psa_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_psa_search_test.clj @@ -63,17 +63,17 @@ psa3 (dc/psa {:name "ts" :data-type :time-string}) psa4 (dc/psa {:name "ds" :data-type :date-string}) coll (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3 psa4]}) {:validate-keywords false}) - gran1 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "bool" [true])]}) {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "bool" [false])]}) {:validate-keywords false}) + gran1 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "bool" [true])]})) + gran2 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "bool" [false])]})) - gran3 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "dts" ["2012-01-01T01:02:03Z"])]}) {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "dts" ["2012-01-02T01:02:03Z"])]}) {:validate-keywords false}) + gran3 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "dts" ["2012-01-01T01:02:03Z"])]})) + gran4 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "dts" ["2012-01-02T01:02:03Z"])]})) - gran5 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ts" ["01:02:03Z"])]}) {:validate-keywords false}) - gran6 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ts" ["01:02:04Z"])]}) {:validate-keywords false}) + gran5 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ts" ["01:02:03Z"])]})) + gran6 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ts" ["01:02:04Z"])]})) - gran7 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ds" ["2012-01-01"])]}) {:validate-keywords false}) - gran8 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ds" ["2012-01-02"])]}) {:validate-keywords false})] + gran7 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ds" ["2012-01-01"])]})) + gran8 (d/ingest "PROV1" (dg/granule coll {:product-specific-attributes [(dg/psa "ds" ["2012-01-02"])]}))] (index/wait-until-indexed) (testing "granule psa search by string value" @@ -105,22 +105,17 @@ coll1 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2]}) {:validate-keywords false}) gran1 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" ["ab" "bc"]) - (dg/psa "bravo" ["cd" "bf"])]}) - {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" ["ab"])]}) - {:validate-keywords false}) + (dg/psa "bravo" ["cd" "bf"])]})) + gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" ["ab"])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa2 psa3]}) {:validate-keywords false}) - gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "bravo" ["aa" "bf"])]}) - {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" ["az"])]}) - {:validate-keywords false}) + gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "bravo" ["aa" "bf"])]})) + gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" ["az"])]})) coll3 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa4]}) {:validate-keywords false}) - gran5 (d/ingest "PROV1" (dg/granule coll3 {:product-specific-attributes [(dg/psa "case" ["UP"])]}) - {:validate-keywords false})] + gran5 (d/ingest "PROV1" (dg/granule coll3 {:product-specific-attributes [(dg/psa "case" ["UP"])]}))] (index/wait-until-indexed) (testing "search by value" (are [items v options] @@ -284,18 +279,14 @@ psa3 (dc/psa {:name "charlie" :data-type :float :value 45}) coll1 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2]}) {:validate-keywords false}) gran1 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" [10.5 123]) - (dg/psa "bravo" [-12])]}) - {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" [10.5 123])]}) - {:validate-keywords false}) + (dg/psa "bravo" [-12])]})) + gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" [10.5 123])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" [14]) - (dg/psa "bravo" [13.7 123])]}) - {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" [14])]}) - {:validate-keywords false})] + (dg/psa "bravo" [13.7 123])]})) + gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" [14])]}))] (index/wait-until-indexed) (testing "search by value" @@ -377,17 +368,13 @@ psa3 (dc/psa {:name "charlie" :data-type :int :value 45}) coll1 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2]}) {:validate-keywords false}) gran1 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" [10 123]) - (dg/psa "bravo" [-12])]}) - {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" [10 123])]}) - {:validate-keywords false}) + (dg/psa "bravo" [-12])]})) + gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" [10 123])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" [14]) - (dg/psa "bravo" [13 123])]}) - {:validate-keywords false}) - gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" [14])]}) - {:validate-keywords false})] + (dg/psa "bravo" [13 123])]})) + gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" [14])]}))] (index/wait-until-indexed) (testing "search by value" @@ -480,24 +467,20 @@ [(dg/psa "alpha" [(d/make-datetime 10) (d/make-datetime 123)]) (dg/psa "bravo" - [(d/make-datetime 0)])]}) - {:validate-keywords false}) + [(d/make-datetime 0)])]})) gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" - [(d/make-datetime 10) (d/make-datetime 123)])]}) - {:validate-keywords false}) + [(d/make-datetime 10) (d/make-datetime 123)])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" [(d/make-datetime 14)]) (dg/psa "bravo" - [(d/make-datetime 13) (d/make-datetime 123)])]}) - {:validate-keywords false}) + [(d/make-datetime 13) (d/make-datetime 123)])]})) gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" - [(d/make-datetime 14)])]}) - {:validate-keywords false})] + [(d/make-datetime 14)])]}))] (index/wait-until-indexed) (testing "search by value" @@ -597,24 +580,20 @@ [(dg/psa "alpha" [(d/make-time 10) (d/make-time 23)]) (dg/psa "bravo" - [(d/make-time 0)])]}) - {:validate-keywords false}) + [(d/make-time 0)])]})) gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" - [(d/make-time 10) (d/make-time 23)])]}) - {:validate-keywords false}) + [(d/make-time 10) (d/make-time 23)])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" [(d/make-time 14)]) (dg/psa "bravo" - [(d/make-time 13) (d/make-time 23)])]}) - {:validate-keywords false}) + [(d/make-time 13) (d/make-time 23)])]})) gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" - [(d/make-time 14)])]}) - {:validate-keywords false})] + [(d/make-time 14)])]}))] (index/wait-until-indexed) (testing "search by value" @@ -714,24 +693,20 @@ [(dg/psa "alpha" [(d/make-date 10) (d/make-date 23)]) (dg/psa "bravo" - [(d/make-date 0)])]}) - {:validate-keywords false}) + [(d/make-date 0)])]})) gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "bravo" - [(d/make-date 10) (d/make-date 23)])]}) - {:validate-keywords false}) + [(d/make-date 10) (d/make-date 23)])]})) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) gran3 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" [(d/make-date 14)]) (dg/psa "bravo" - [(d/make-date 13) (d/make-date 23)])]}) - {:validate-keywords false}) + [(d/make-date 13) (d/make-date 23)])]})) gran4 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "charlie" - [(d/make-date 14)])]}) - {:validate-keywords false})] + [(d/make-date 14)])]}))] (index/wait-until-indexed) (testing "search by value" @@ -831,22 +806,18 @@ psa6 (dc/psa {:name "sigma" :data-type :string}) coll1 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa1 psa2 psa3]}) {:validate-keywords false}) coll2 (d/ingest "PROV1" (dc/collection {:product-specific-attributes [psa4 psa5 psa6]}) {:validate-keywords false}) - gran1 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" ["atlantic"])]}) {:validate-keywords false}) - gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "beta" ["wind"])]}) {:validate-keywords false}) + gran1 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" ["atlantic"])]})) + gran2 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "beta" ["wind"])]})) gran3 (d/ingest "PROV1" (dg/granule coll1 {:product-specific-attributes [(dg/psa "alpha" ["pacific"]) - (dg/psa "gamma" ["01:02:03Z"])]}) - {:validate-keywords false}) + (dg/psa "gamma" ["01:02:03Z"])]})) gran4 (d/ingest "PROV1" (dg/granule coll2 - {:product-specific-attributes [(dg/psa "delta" ["rain"])]}) - {:validate-keywords false}) + {:product-specific-attributes [(dg/psa "delta" ["rain"])]})) - gran5 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" ["01:02:03Z"])]}) - {:validate-keywords false}) + gran5 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "alpha" ["01:02:03Z"])]})) gran6 (d/ingest "PROV1" (dg/granule coll2 {:product-specific-attributes [(dg/psa "delta" ["cloud"]) - (dg/psa "sigma" ["ocean"])]}) - {:validate-keywords false})] + (dg/psa "sigma" ["ocean"])]}))] (index/wait-until-indexed) (testing "granule psa search by names" diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_retrieval_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_retrieval_test.clj index c5215f1f56..e27ff0e4ee 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_retrieval_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_retrieval_test.clj @@ -26,18 +26,16 @@ gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule1" - :project-refs ["ABC"]}) - {:validate-keywords false}) + :project-refs ["ABC"]})) gran1 (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule1" - :project-refs ["KLM"]}) - {:validate-keywords false}) + :project-refs ["KLM"]})) umm-gran (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1) {:granule-ur "Granule1" :project-refs ["XYZ"]}) - gran1 (d/ingest "PROV1" umm-gran {:validate-keywords false}) - del-gran (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1)) {:validate-keywords false}) + gran1 (d/ingest "PROV1" umm-gran) + del-gran (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll1 (:concept-id coll1))) umm-gran (-> umm-gran (assoc-in [:collection-ref :short-name] nil) (assoc-in [:collection-ref :version-id] nil) diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_search_format_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_search_format_test.clj index 89b96d8c40..764a9620d3 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_search_format_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_search_format_test.clj @@ -66,8 +66,7 @@ (let [c1-echo (d/ingest "PROV1" (dc/collection) {:format :echo10 :validate-keywords false}) g1-echo (d/ingest "PROV1" (dg/granule c1-echo {:granule-ur "g1" :producer-gran-id "p1"}) - {:format :echo10 - :validate-keywords false})] + {:format :echo10})] (index/wait-until-indexed) (let [params {:concept-id (:concept-id g1-echo)} options {:accept nil @@ -114,7 +113,7 @@ echo10-gran (d/item->concept granule :echo10) iso19115-gran (d/item->concept granule :iso19115) umm-g-gran (d/item->concept granule :umm-json) - umm-g-gran-concept-id (:concept-id (ingest/ingest-concept umm-g-gran {:validate-keywords false}))] + umm-g-gran-concept-id (:concept-id (ingest/ingest-concept umm-g-gran))] (index/wait-until-indexed) (testing "Search UMM-G various formats" (util/are3 [format-key granule-concept-id expected-granule accept url-extension] @@ -153,13 +152,13 @@ (let [c1-echo (d/ingest "PROV1" (dc/collection) {:format :echo10 :validate-keywords false}) c2-smap (d/ingest "PROV2" (dc/collection) {:format :iso-smap :validate-keywords false}) g1-echo (d/ingest "PROV1" (dg/granule c1-echo {:granule-ur "g1" - :producer-gran-id "p1"}) {:format :echo10 :validate-keywords false}) + :producer-gran-id "p1"}) {:format :echo10}) g2-echo (d/ingest "PROV1" (dg/granule c1-echo {:granule-ur "g2" - :producer-gran-id "p2"}) {:format :echo10 :validate-keywords false}) + :producer-gran-id "p2"}) {:format :echo10}) g1-smap (d/ingest "PROV2" (dg/granule c2-smap {:granule-ur "g3" - :producer-gran-id "p3"}) {:format :iso-smap :validate-keywords false}) + :producer-gran-id "p3"}) {:format :iso-smap}) g2-smap (d/ingest "PROV2" (dg/granule c2-smap {:granule-ur "g4" - :producer-gran-id "p2"}) {:format :iso-smap :validate-keywords false}) + :producer-gran-id "p2"}) {:format :iso-smap}) ;; An item ingested with and XML preprocessing line to ensure this is tested item (assoc (dg/granule c1-echo {:granule-ur "g5" :producer-gran-id "p5"}) @@ -397,8 +396,7 @@ :day-night "DAY" :size 100 :cloud-cover 50 - :related-urls [ru1 ru2 ru3]}) - {:validate-keywords false}) + :related-urls [ru1 ru2 ru3]})) gran2 (d/ingest "PROV1" (dg/granule coll2 {:granule-ur "Granule2" :beginning-date-time "2011-01-01T12:00:00Z" :ending-date-time "2011-01-11T12:00:00Z" @@ -406,16 +404,14 @@ :day-night "NIGHT" :size 80 :cloud-cover 30 - :related-urls [ru1]}) - {:validate-keywords false}) + :related-urls [ru1]})) gran3 (d/ingest "PROV1" (dg/granule coll2 {:granule-ur "Granule3" :beginning-date-time "2012-01-01T12:00:00Z" :ending-date-time "2012-01-11T12:00:00Z" :producer-gran-id "Granule #3" :day-night "NIGHT" :size 80 - :cloud-cover 30}) - {:validate-keywords false})] + :cloud-cover 30}))] (index/wait-until-indexed) @@ -536,7 +532,7 @@ :equator-crossing-date-time "2011-01-01T12:00:00.000Z"}]}) gran4 (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule4" :spatial-coverage (dg/spatial (p/point 1 2))}) - {:format :iso-smap :validate-keywords false}) + {:format :iso-smap}) ;; Granule #5 is added for CMR-1115, where a granule with orbit spatial but no ;; OrbitCalculatedSpatialDomains will not have polygon info in its atom/json representation. gran5 (make-gran coll3 {:granule-ur "OrbitGranuleWithoutOrbitCalculatedSpatialDomains" @@ -634,7 +630,7 @@ :spatial-coverage (dc/spatial {:gsr :no-spatial})}) {:validate-keywords false}) make-gran (fn [coll attribs] - (d/ingest "PROV1" (dg/granule coll attribs) {:validate-keywords false})) + (d/ingest "PROV1" (dg/granule coll attribs))) gran-echo (make-gran coll1 {:granule-ur "Granule1" :beginning-date-time "2010-01-01T12:00:00Z" @@ -647,14 +643,14 @@ gran-smap (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule2" :related-urls [ru1 ru2 ru3]}) - {:format :iso-smap :validate-keywords false}) + {:format :iso-smap}) gran-umm (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule3" :related-urls [ru1 ru2 ru3]}) - {:format :umm-json :validate-keywords false}) + {:format :umm-json}) gran-no-ru (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule4"}) - {:format :umm-json :validate-keywords false})] + {:format :umm-json})] (index/wait-until-indexed) @@ -724,20 +720,17 @@ :beginning-date-time "2010-01-01T12:00:00.000Z" :ending-date-time "2010-01-11T12:00:00.000Z" :spatial-coverage gran-spatial - :cloud-cover 10.0}) - {:validate-keywords false}) + :cloud-cover 10.0})) gran2 (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule2" :beginning-date-time "2011-02-01T12:00:00.000Z" :ending-date-time "2011-02-11T12:00:00.000Z" :spatial-coverage gran-spatial - :cloud-cover 20.0}) - {:validate-keywords false}) + :cloud-cover 20.0})) gran3 (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule3" :beginning-date-time "2012-01-01T12:00:00.000Z" :ending-date-time "2012-01-11T12:00:00.000Z" :spatial-coverage gran-spatial - :cloud-cover 30.0}) - {:validate-keywords false})] + :cloud-cover 30.0}))] (index/wait-until-indexed) @@ -997,8 +990,7 @@ {:validate-keywords false}) gran-metadata (slurp (io/resource "stac-test/G1327299284-LPDAAC_ECS.xml")) {gran-concept-id :concept-id} (ingest/ingest-concept - (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata) - {:validate-keywords false}) + (ingest/concept :granule "PROV1" "foo" :echo10 gran-metadata)) expected (-> "stac-test/granule_stac.json" io/resource slurp @@ -1047,8 +1039,7 @@ gran1 (d/ingest "PROV1" (dg/granule coll1 {:granule-ur "Granule1" :beginning-date-time "2010-01-01T12:00:00.000Z" :ending-date-time "2010-01-11T12:00:00.000Z" - :cloud-cover 10.0}) - {:validate-keywords false}) + :cloud-cover 10.0})) gran-concept-id (:concept-id gran1) expected-gran-err-msg (format "Granule [%s] without spatial info is not supported in STAC" gran-concept-id)] @@ -1118,29 +1109,25 @@ "PROV1" "aa" :echo10 - (slurp (io/resource "stac-test/G2485638210-LPCLOUD-aa.echo10"))) - {:validate-keywords false}) + (slurp (io/resource "stac-test/G2485638210-LPCLOUD-aa.echo10")))) {root-gran-concept-id :concept-id} (ingest/ingest-concept (ingest/concept :granule "PROV1" "root" :echo10 - (slurp (io/resource "stac-test/G2485638210-LPCLOUD-root.echo10"))) - {:validate-keywords false}) + (slurp (io/resource "stac-test/G2485638210-LPCLOUD-root.echo10")))) {neither-gran-concept-id :concept-id} (ingest/ingest-concept (ingest/concept :granule "PROV1" "neither" :echo10 - (slurp (io/resource "stac-test/G2485638210-LPCLOUD-neither.echo10"))) - {:validate-keywords false}) + (slurp (io/resource "stac-test/G2485638210-LPCLOUD-neither.echo10")))) {both-gran-concept-id :concept-id} (ingest/ingest-concept (ingest/concept :granule "PROV1" "both" :echo10 - (slurp (io/resource "stac-test/G2485638210-LPCLOUD-both.echo10"))) - {:validate-keywords false})] + (slurp (io/resource "stac-test/G2485638210-LPCLOUD-both.echo10"))))] (index/wait-until-indexed) (testing "combined cloud cover is STAC format aa only" diff --git a/system-int-test/test/cmr/system_int_test/search/granule/granule_sorting_search_test.clj b/system-int-test/test/cmr/system_int_test/search/granule/granule_sorting_search_test.clj index 90a0562ffe..36ff31a784 100644 --- a/system-int-test/test/cmr/system_int_test/search/granule/granule_sorting_search_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/granule/granule_sorting_search_test.clj @@ -71,7 +71,7 @@ (data-umm-c/collection {:Projects (data-umm-cmn/projects "c10" "c20" "c30" "c40" "c50" "c41" "c51")}) {:validate-keywords false}) make-gran (fn [& campaigns] - (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll (:concept-id coll) {:project-refs campaigns}) {:validate-keywords false})) + (d/ingest "PROV1" (dg/granule-with-umm-spec-collection coll (:concept-id coll) {:project-refs campaigns}))) g1 (make-gran "c10" "c41") g2 (make-gran "c20" "c51") g3 (make-gran "c30") @@ -207,8 +207,7 @@ coll (:concept-id coll) {:platform-refs (map #(dg/platform-ref {:short-name %}) - platforms)}) - {:validate-keywords false})) + platforms)}))) g1 (make-gran "c10" "c41") g2 (make-gran "c20" "c51") g3 (make-gran "c30") @@ -235,8 +234,7 @@ [(dg/platform-ref {:short-name "platform" :instrument-refs (map #(dg/instrument-ref {:short-name %}) - instruments)})]}) - {:validate-keywords false})) + instruments)})]}))) g1 (make-gran "c10" "c41") g2 (make-gran "c20" "c51") g3 (make-gran "c30") @@ -274,8 +272,7 @@ :instrument-refs [(dg/instrument-ref {:short-name "instrument" :sensor-refs (map #(dg/sensor-ref {:short-name %}) - sensors)})]})]}) - {:validate-keywords false})) + sensors)})]})]}))) g1 (make-gran "c10" "c41") g2 (make-gran "c20" "c51") g3 (make-gran "c30") diff --git a/system-int-test/test/cmr/system_int_test/search/misc/harvesting_test.clj b/system-int-test/test/cmr/system_int_test/search/misc/harvesting_test.clj index 73fe1919db..99fdbc63ed 100644 --- a/system-int-test/test/cmr/system_int_test/search/misc/harvesting_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/misc/harvesting_test.clj @@ -29,38 +29,32 @@ g1-echo (data2-core/ingest "PROV1" (data2-granule/granule coll1-echo {:granule-ur "g1" :producer-gran-id "p1"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) _ (dev-system-util/freeze-time! "2011-01-01T10:00:00Z") g2-echo (data2-core/ingest "PROV1" (data2-granule/granule coll1-echo {:granule-ur "g2" :producer-gran-id "p2"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) _ (dev-system-util/freeze-time! "2012-01-01T10:00:00Z") g3-echo (data2-core/ingest "PROV1" (data2-granule/granule coll1-echo {:granule-ur "g3" :producer-gran-id "p3"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) _ (dev-system-util/freeze-time! "2013-01-01T10:00:00Z") g4-echo (data2-core/ingest "PROV1" (data2-granule/granule coll1-echo {:granule-ur "g4" :producer-gran-id "p4"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) _ (dev-system-util/freeze-time! "2014-01-01T10:00:00Z") g5-echo (data2-core/ingest "PROV1" (data2-granule/granule coll1-echo {:granule-ur "g5" :producer-gran-id "p5"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) _ (dev-system-util/freeze-time! "2015-01-01T10:00:00Z") g6-echo (data2-core/ingest "PROV1" (data2-granule/granule coll2-echo {:granule-ur "g6" :producer-gran-id "p6"}) - {:format :echo10 - :validate-keywords false}) + {:format :echo10}) coll1-grans [g1-echo g2-echo g3-echo g4-echo g5-echo]] (index/wait-until-indexed) diff --git a/system-int-test/test/cmr/system_int_test/search/misc/provider_holdings_test.clj b/system-int-test/test/cmr/system_int_test/search/misc/provider_holdings_test.clj index e8f223e013..b81d2ce8b6 100644 --- a/system-int-test/test/cmr/system_int_test/search/misc/provider_holdings_test.clj +++ b/system-int-test/test/cmr/system_int_test/search/misc/provider_holdings_test.clj @@ -72,14 +72,14 @@ (let [coll (nth prov1-colls n) granule-count (nth prov1-granule-counts n)] (dotimes [m granule-count] - (d/ingest "PROV1" (dg/granule coll) {:validate-keywords false})))) + (d/ingest "PROV1" (dg/granule coll))))) ;; Create provider 2 granules (dotimes [n prov2-collection-count] (let [coll (nth prov2-colls n) granule-count (nth prov2-granule-counts n)] (dotimes [m granule-count] - (d/ingest "PROV2" (dg/granule coll) {:validate-keywords false})))) + (d/ingest "PROV2" (dg/granule coll))))) (index/wait-until-indexed) diff --git a/system-int-test/test/cmr/system_int_test/virtual_product/translation_test.clj b/system-int-test/test/cmr/system_int_test/virtual_product/translation_test.clj index ccc05402b4..5fd49c133f 100644 --- a/system-int-test/test/cmr/system_int_test/virtual_product/translation_test.clj +++ b/system-int-test/test/cmr/system_int_test/virtual_product/translation_test.clj @@ -65,14 +65,12 @@ "LPDAAC_ECS" (granule/granule ast-coll - {:granule-ur "SC:AST_L1A.003:2006227720"}) - :validate-keywords false) + {:granule-ur "SC:AST_L1A.003:2006227720"})) alias-ast-gran (virtual-product-util/ingest-source-granule "LP_ALIAS" (granule/granule alias-ast-coll - {:granule-ur "SC:AST_L1A.003:2006227720"}) - :validate-keywords false) + {:granule-ur "SC:AST_L1A.003:2006227720"})) prov-ast-coll (data-core/ingest "PROV" (collection/collection {:entry-title ast-entry-title}) @@ -80,8 +78,8 @@ prov-ast-gran (data-core/ingest "PROV" (granule/granule prov-ast-coll - {:granule-ur "SC:AST_L1A.003:2006227720"}) - {:validate-keywords false}) + {:granule-ur "SC:AST_L1A.003:2006227720"})) + lpdaac-non-ast-coll (data-core/ingest "LPDAAC_ECS" (collection/collection {:entry-title "non virtual entry title"}) @@ -89,20 +87,19 @@ lpdaac-non-ast-gran (data-core/ingest "LPDAAC_ECS" (granule/granule lpdaac-non-ast-coll - {:granule-ur "granule-ur2"}) - {:validate-keywords false}) + {:granule-ur "granule-ur2"})) prov-coll (data-core/ingest "PROV" (collection/collection {:entry-title "some other entry title"}) {:validate-keywords false}) prov-gran1 (data-core/ingest "PROV" (granule/granule prov-coll - {:granule-ur "granule-ur3"}) - {:validate-keywords false}) + {:granule-ur "granule-ur3"})) + prov-gran2 (data-core/ingest "PROV" (granule/granule prov-coll - {:granule-ur "granule-ur4"}) - {:validate-keywords false}) + {:granule-ur "granule-ur4"})) + _ (index/wait-until-indexed) [source-granule alias-source-granule] (map granule->entry [ast-gran alias-ast-gran]) @@ -277,8 +274,7 @@ provider-id (granule/granule source-coll - {:granule-ur granule-ur}) - :validate-keywords false))) + {:granule-ur granule-ur})))) _ (index/wait-until-indexed) virt-gran-entries-by-src (into {} (map #(vector % (get-virtual-entries-by-source %)) src-grans)) all-virt-entries (mapcat second virt-gran-entries-by-src) @@ -297,8 +293,7 @@ (data-core/ingest "PROV" (granule/granule coll - {:granule-ur (str "SC:MIL2ASAE.002:2505203" i)}) - {:validate-keywords false})))) + {:granule-ur (str "SC:MIL2ASAE.002:2505203" i)}))))) ;; This test is added for CMR-3508 to show that we can now handle translation of more than ;; 10 (default search page size) granules on a single collection during the translation diff --git a/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_test.clj b/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_test.clj index bc86439aed..51191ebcf3 100644 --- a/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_test.clj +++ b/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_test.clj @@ -48,8 +48,7 @@ granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (vp/ingest-source-granule "LPDAAC_ECS" (dg/granule ast-coll {:granule-ur granule-ur - :project-refs ["proj1"]}) - :validate-keywords false) + :project-refs ["proj1"]})) expected-granule-urs (vp/source-granule->virtual-granule-urs ast-l1a-gran) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) expected-granule-urs)] (index/wait-until-indexed) @@ -85,8 +84,7 @@ (let [ast-l1a-gran-r2 (vp/ingest-source-granule "LPDAAC_ECS" (assoc ast-l1a-gran :project-refs ["proj2" "proj3"] - :revision-id nil) - :validate-keywords false)] + :revision-id nil))] (index/wait-until-indexed) (testing "find none by original project" (is (= 0 (:hits (search/find-refs :granule {:project "proj1"}))))) @@ -107,8 +105,7 @@ (testing "Recreate source granule" (let [ast-l1a-gran-r4 (vp/ingest-source-granule "LPDAAC_ECS" - (dissoc ast-l1a-gran :revision-id :concept-id) - :validate-keywords false)] + (dissoc ast-l1a-gran :revision-id :concept-id))] (index/wait-until-indexed) (testing "Find all granules" (vp/assert-matching-granule-urs @@ -130,8 +127,7 @@ granule-ur (svm/sample-source-granule-urs [provider-id entry-title])] (vp/ingest-source-granule provider-id - (dg/granule source-coll {:granule-ur granule-ur}) - :validate-keywords false))) + (dg/granule source-coll {:granule-ur granule-ur})))) all-expected-granule-urs (concat (mapcat vp/source-granule->virtual-granule-urs source-granules) (map :granule-ur source-granules))] (index/wait-until-indexed) @@ -182,7 +178,7 @@ vp-colls (vp/ingest-virtual-collections [ast-coll] {:validate-keywords false}) granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (dg/granule ast-coll {:granule-ur granule-ur}) - ingest-result (vp/ingest-source-granule "LPDAAC_ECS" (assoc ast-l1a-gran :revision-id 5) :validate-keywords false) + ingest-result (vp/ingest-source-granule "LPDAAC_ECS" (assoc ast-l1a-gran :revision-id 5)) _ (index/wait-until-indexed) vp-granule-ids (mapcat #(map :id (:refs (search/find-refs :granule {:entry-title (:entry-title %) @@ -190,7 +186,7 @@ ;; check revision ids are in sync after ingest/update operations (assert-virtual-gran-revision-id vp-colls 5) - (vp/ingest-source-granule "LPDAAC_ECS" (assoc ast-l1a-gran :revision-id 10) :validate-keywords false) + (vp/ingest-source-granule "LPDAAC_ECS" (assoc ast-l1a-gran :revision-id 10)) (index/wait-until-indexed) (assert-virtual-gran-revision-id vp-colls 10) @@ -213,8 +209,7 @@ vp-colls (vp/ingest-virtual-collections [ast-coll] {:validate-keywords false}) granule-ur "SC:AST_L1A.003:2006227710" ast-l1a-gran (vp/ingest-source-granule "LP_ALIAS" - (dg/granule ast-coll {:granule-ur granule-ur}) - :validate-keywords false) + (dg/granule ast-coll {:granule-ur granule-ur})) expected-virtual-granule-urs (vp/source-granule->virtual-granule-urs (assoc ast-l1a-gran :provider-id "LPDAAC_ECS")) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) expected-virtual-granule-urs)] @@ -252,8 +247,7 @@ granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (vp/ingest-source-granule "LPDAAC_ECS" (dg/granule ast-coll {:granule-ur granule-ur}) - :client-id "ECHO" - :validate-keywords false) + :client-id "ECHO") expected-granule-urs (vp/source-granule->virtual-granule-urs ast-l1a-gran) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) expected-granule-urs)] (index/wait-until-indexed) @@ -292,8 +286,7 @@ :related-urls source-related-urls :data-granule {:day-night "UNSPECIFIED" :production-date-time "2013-07-27T07:43:14.000Z" - :size 40}}) - :validate-keywords false) + :size 40}})) _ (index/wait-until-indexed) virt-gran-umm (first (get-virtual-granule-umms src-granule-ur)) expected-related-urls (map #(umm-c/map->RelatedURL %) expected-related-url-maps)] @@ -354,8 +347,7 @@ granule-ur (svm/sample-source-granule-urs [provider-id entry-title])] (vp/ingest-source-granule provider-id - (dg/granule source-coll {:granule-ur granule-ur}) - :validate-keywords false))) + (dg/granule source-coll {:granule-ur granule-ur})))) expected-source-granules (remove #(contains? disabled-source-colls (get-in % [:collection-ref :entry-title])) source-granules) diff --git a/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_token_ingest_test.clj b/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_token_ingest_test.clj index d97117c941..cc2bdaa5d9 100644 --- a/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_token_ingest_test.clj +++ b/system-int-test/test/cmr/system_int_test/virtual_product/virtual_product_token_ingest_test.clj @@ -32,9 +32,8 @@ vp-colls (vp/ingest-virtual-collections [ast-coll] {:token provider-admin-update-token :validate-keywords false}) granule-ur "SC:AST_L1A.003:2006227720" ast-l1a-gran (vp/ingest-source-granule "LPDAAC_ECS" - (dg/granule ast-coll {:granule-ur granule-ur}) - :token provider-admin-update-token - :validate-keywords false) + (dg/granule ast-coll {:granule-ur granule-ur}) + :token provider-admin-update-token) expected-granule-urs (vp/source-granule->virtual-granule-urs ast-l1a-gran) all-expected-granule-urs (cons (:granule-ur ast-l1a-gran) expected-granule-urs)] (index/wait-until-indexed)