Skip to content
This repository has been archived by the owner on Aug 8, 2019. It is now read-only.

Commit

Permalink
Update depreciated call to __FILE__
Browse files Browse the repository at this point in the history
Now __ENV__.file
  • Loading branch information
nessamurmur committed Mar 5, 2014
1 parent 52e0e88 commit 9fbfc81
Show file tree
Hide file tree
Showing 33 changed files with 86 additions and 86 deletions.
38 changes: 19 additions & 19 deletions test/acceptances/bulk_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Acceptances.BulkTest do
use ExUnit.Case
Expand All @@ -7,7 +7,7 @@ defmodule Acceptances.BulkTest do
test :create do
settings = Tirexs.ElasticSearch.Config.new()

Tirexs.ElasticSearch.delete("bear_test", settings)
Tirexs.ElasticSearch.delete("bear_test", settings)

Tirexs.Bulk.store [index: "bear_test", refresh: false], settings do
create id: 1, title: "bar1", description: "foo bar test"
Expand All @@ -30,28 +30,28 @@ defmodule Acceptances.BulkTest do
assert body["count"] == 11
end

test :update do
settings = Tirexs.ElasticSearch.Config.new()
Tirexs.ElasticSearch.delete("bear_test", settings)
test :update do
settings = Tirexs.ElasticSearch.Config.new()
Tirexs.ElasticSearch.delete("bear_test", settings)

Tirexs.Bulk.store [index: "bear_test", refresh: false], settings do
create id: 1, title: "bar1", description: "foo bar test"
create id: 2, title: "bar2", description: "foo bar test"
end
Tirexs.Bulk.store [index: "bear_test", refresh: false], settings do
create id: 1, title: "bar1", description: "foo bar test"
create id: 2, title: "bar2", description: "foo bar test"
end

Tirexs.Manage.refresh("bear_test", settings)
{_, _, body} = Tirexs.ElasticSearch.get("bear_test/_count", settings)
assert body["count"] == 2
Tirexs.Manage.refresh("bear_test", settings)
{_, _, body} = Tirexs.ElasticSearch.get("bear_test/_count", settings)
assert body["count"] == 2

Tirexs.Bulk.store [index: "bear_test", type: "document", id: 1, retry_on_conflict: 3], settings do
update doc: [title: "updated_title"]
end
Tirexs.Bulk.store [index: "bear_test", type: "document", id: 1, retry_on_conflict: 3], settings do
update doc: [title: "updated_title"]
end

Tirexs.Manage.refresh("bear_test", settings)
Tirexs.Manage.refresh("bear_test", settings)

{_, _, body} = Tirexs.ElasticSearch.get("bear_test/document/1", settings)
{_, _, body} = Tirexs.ElasticSearch.get("bear_test/document/1", settings)

# IO.puts inspect(body) #To do implement for 0.90.1
# IO.puts inspect(body) #To do implement for 0.90.1

end
end
end
4 changes: 2 additions & 2 deletions test/acceptances/elastic_search_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Acceptances.ElasticSearchTest do

Expand Down Expand Up @@ -134,4 +134,4 @@ defmodule Acceptances.ElasticSearchTest do
assert Enum.first(result.hits)["_source"]["id"] == 2

end
end
end
6 changes: 3 additions & 3 deletions test/acceptances/loader_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Acceptances.LoaderTest do
use ExUnit.Case
Expand All @@ -9,7 +9,7 @@ defmodule Acceptances.LoaderTest do

test :load_dsl_file do
settings = Tirexs.ElasticSearch.Config.new()

Tirexs.Loader.load_all(@path)

assert exist?("test_dsl_index", settings) == true
Expand All @@ -35,4 +35,4 @@ defmodule Acceptances.LoaderTest do
search_file_path = Path.join([File.cwd!, "examples"])
Tirexs.Loader.load(search_file_path <> "/search.exs")
end
end
end
4 changes: 2 additions & 2 deletions test/acceptances/manage_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Acceptances.ManageTest do
use ExUnit.Case
Expand Down Expand Up @@ -133,4 +133,4 @@ defmodule Acceptances.ManageTest do
assert body["_source"]["name"] == "new_name"
end

end
end
4 changes: 2 additions & 2 deletions test/acceptances/percolator_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Tirexs.PerlocatorTest do
use ExUnit.Case
import Tirexs.Percolator
Expand All @@ -23,4 +23,4 @@ defmodule Tirexs.PerlocatorTest do

# IO.puts inspect(body)
end
end
end
4 changes: 2 additions & 2 deletions test/acceptances/scroll_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Acceptances.ScrollTest do
use ExUnit.Case
Expand Down Expand Up @@ -38,4 +38,4 @@ defmodule Acceptances.ScrollTest do
assert body._scroll_id != nil
end

end
end
4 changes: 2 additions & 2 deletions test/acceptances/warmer_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Acceptances.WarmerTest do
use ExUnit.Case
import Tirexs.Search.Warmer
Expand Down Expand Up @@ -28,4 +28,4 @@ defmodule Acceptances.WarmerTest do
assert body["bear_test"]["warmers"] == [{"warmer_1",[{"types",[]},{"source",[{"query",[{"match_all",[]}]},{"facets",[{"facet_1",[{"terms",[{"field","field"}]}]}]}]}]}]
Tirexs.ElasticSearch.delete("bear_test", settings)
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/aliases_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Tirexs.AliasesTest do
use ExUnit.Case
import Tirexs.Manage.Aliases
Expand Down Expand Up @@ -31,4 +31,4 @@ defmodule Tirexs.AliasesTest do
# settings = Tirexs.ElasticSearch.Config.new()
# Tirexs.ElasticSearch.post("_aliases", JSEX.encode(aliases), settings)
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/bulk_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Tirexs.BulkTest do

Expand Down Expand Up @@ -31,4 +31,4 @@ defmodule Tirexs.BulkTest do

assert get_type_from_document(document) == "my_type"
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/analyzer_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.AnalyzerTest do
use ExUnit.Case
Expand All @@ -17,4 +17,4 @@ defmodule Tirexs.Index.AnalyzerTest do
assert index[:settings] == [analysis: [analyzer: [msg_search_analyzer: [tokenizer: "keyword", filter: ["lowercase"]], msg_index_analyzer: [tokenizer: "keyword", filter: ["lowercase","substring"]]]], index: []]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/blocks_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.BlocksTest do
use ExUnit.Case
Expand All @@ -17,4 +17,4 @@ defmodule Tirexs.Index.BlocksTest do
assert index[:settings] == [index: [blocks: [read_only: true, read: true, write: false, metadata: true]]]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/cache_tests.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.CacheTest do
use ExUnit.Case
Expand All @@ -15,4 +15,4 @@ defmodule Tirexs.Index.CacheTest do
assert index[:settings] == [index: [cache: [filter: [max_size: -1, expire: -1]]]]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/filter_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.FilterTest do
use ExUnit.Case
Expand All @@ -17,4 +17,4 @@ defmodule Tirexs.Index.FilterTest do
assert index[:settings] == [analysis: [filter: [substring: [type: "nGram", min_gram: 2, max_gram: 32], snow_en: [type: "snowball", language: "English"]]], index: []]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/settings_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.SettingsTest do
use ExUnit.Case
Expand Down Expand Up @@ -56,4 +56,4 @@ defmodule Tirexs.Index.SettingsTest do

end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/tokenizer_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.TokenizerTest do
use ExUnit.Case
Expand All @@ -16,4 +16,4 @@ defmodule Tirexs.Index.TokenizerTest do
assert index[:settings] == [analysis: [tokenizer: ["dot-tokenizer": [type: "path_hierarchy", delimiter: "."]]], index: []]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/index/translog_tests.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Index.TranslogTest do
use ExUnit.Case
Expand All @@ -17,4 +17,4 @@ defmodule Tirexs.Index.TranslogTest do
assert index[:settings] == [index: [translog: [flush_threshold_ops: "", flush_threshold_size: 2002, flush_threshold_period: 1, disable_flush: true]]]
end

end
end
12 changes: 6 additions & 6 deletions test/tirexs/logger_test.exs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Tirexs.LoggerTest do
use ExUnit.Case

test :to_curl do
assert Tirexs.Logger.to_curl([d: 4]) == :ok
assert Tirexs.Logger.to_curl(JSEX.encode!([d: 4])) == :ok
end
end
test :to_curl do
assert Tirexs.Logger.to_curl([d: 4]) == :ok
assert Tirexs.Logger.to_curl(JSEX.encode!([d: 4])) == :ok
end
end
2 changes: 1 addition & 1 deletion test/tirexs/mapping_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file

defmodule Tirexs.MappingsTest do
use ExUnit.Case
Expand Down
4 changes: 2 additions & 2 deletions test/tirexs/percolator_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Tirexs.PerlocatorTest do
use ExUnit.Case
import Tirexs.Percolator
Expand Down Expand Up @@ -36,4 +36,4 @@ defmodule Tirexs.PerlocatorTest do
assert percolator == [doc: [field1: "value1"], query: [term: [field1: "value1"]]]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/query/bool_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file
defmodule Tirexs.Query.Bool.Test do
use ExUnit.Case
import Tirexs.Query
Expand Down Expand Up @@ -42,4 +42,4 @@ defmodule Tirexs.Query.Bool.Test do

assert query == [query: [bool: [must: [[match: [artist: [query: "Madonna", operator: "and"]]],[match: [title: [query: "My", operator: "and"]]],[match: [color_tune: [query: "red,orange"]]],[match: [genre: [query: "Alternative/Indie,Christian/Gospel"]]],[range: [release_year: [from: 1950, to: 2013]]],[range: [energy_mood: [from: 0, to: 30]]]], should: [[match: [genre: [query: "Alternative/Indie,Christian/Gospel"]]],[range: [release_year: [from: 1950, to: 2013]]]], must_not: [[match: [genre: [query: "Alternative/Indie,Christian/Gospel"]]]]]]]
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/query/boosting_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file
defmodule Tirexs.Query.Bool.Boosting.Test do
use ExUnit.Case
import Tirexs.Query
Expand Down Expand Up @@ -31,4 +31,4 @@ defmodule Tirexs.Query.Bool.Boosting.Test do
end
assert query == [query: [boosting: [positive: [match: [value: [query: "field"]]], negative: [match: [value: [query: "field"]]], negative_boost: 2]]]
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/query/dis_max_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file
defmodule Tirexs.Query.Bool.DisMax.Test do
use ExUnit.Case
import Tirexs.Query
Expand All @@ -14,4 +14,4 @@ defmodule Tirexs.Query.Bool.DisMax.Test do
end
assert query == [query: [dis_max: [queries: [[term: [age: 34]],[term: [age: 35]]]]]]
end
end
end
4 changes: 2 additions & 2 deletions test/tirexs/query/filter_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file

defmodule Tirexs.Query.FilterTest do
use ExUnit.Case
Expand Down Expand Up @@ -432,4 +432,4 @@ defmodule Tirexs.Query.FilterTest do

assert search == [search: [query: [term: [tag: "wow"]], filter: [and: [filters: [[query: [term: [id: "1"]]],[query: [term: [id: "4"]]]]]]]]
end
end
end
2 changes: 1 addition & 1 deletion test/tirexs/query_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Tirexs.QueryTest do
use ExUnit.Case
import Tirexs.Query
Expand Down
4 changes: 2 additions & 2 deletions test/tirexs/river/couchdb_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file
defmodule Tirexs.River.CouchDb.Test do
use ExUnit.Case
use Tirexs.River
Expand Down Expand Up @@ -34,4 +34,4 @@ defmodule Tirexs.River.CouchDb.Test do
assert river[:couchdb] == [ignore_attachments: true, host: "localhost", port: 5984, db: "labeled", filter: "elastic/only", script: "ctx._type = ctx.doc.type"]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/river_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../test_helper.exs", __FILE__
Code.require_file "../../test_helper.exs", __ENV__.file
defmodule Tirexs.RiverTest do
use ExUnit.Case
use Tirexs.River
Expand All @@ -22,4 +22,4 @@ defmodule Tirexs.RiverTest do
assert river[:index] == [bulk_size: 100, bulk_timeout: "1ms", index: "test"]
end

end
end
4 changes: 2 additions & 2 deletions test/tirexs/search/facets_test.exs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Code.require_file "../../../test_helper.exs", __FILE__
Code.require_file "../../../test_helper.exs", __ENV__.file
defmodule Tirexs.Search.FacetsTest do
use ExUnit.Case
import Tirexs.Search.Facets
Expand Down Expand Up @@ -127,4 +127,4 @@ defmodule Tirexs.Search.FacetsTest do
assert facets == [facets: [facet1: [terms_stats: [key_field: "name", value_field: "count"], facet_filter: [term: [name: "blue"]], nested: "obj"]]]
end

end
end
Loading

0 comments on commit 9fbfc81

Please sign in to comment.