Skip to content

646 string test test ends with periodically fails #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reuster986 merged 4 commits into from
Feb 11, 2021
Merged

646 string test test ends with periodically fails #666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c676fc0
Fixed Strings.endswith bug where it fails to pick up last match if th…
hokiegeek2 Feb 10, 2021
6c8f0bb
Fixed test_ends_with error due to incorrect param pdarray #646
hokiegeek2 Feb 10, 2021
c63de0b
Fixed another unit test #646
hokiegeek2 Feb 10, 2021
285e6ee
Wrapped up remaining test fixes #646
hokiegeek2 Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SegmentedArray.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ module SegmentedArray {
// Position where substr aligns with end of segment must be a hit
// -1 for null byte
hits[oD.interior(-(oD.size-1))] = truth[oa[oD.interior(oD.size-1)] - substr.numBytes - 1];
hits[oD.high] = truth[D.high];
hits[oD.high] = truth[D.high-1];
Copy link
Collaborator

@reuster986 reuster986 Feb 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hokiegeek2 Great catch!

}
if v {
t.stop();
Expand Down
56 changes: 35 additions & 21 deletions tests/string_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ def rslide(triple, delim):
ltest, rtest = rmunge(triples, inc, part)
assert((ltest == ls.to_ndarray()).all() and (rtest == rs.to_ndarray()).all())

def run_test_stick(strings, test_strings, base_words, delim):
def run_test_stick(strings, test_strings, base_words, delim, N):
test_strings2 = np.random.choice(base_words.to_ndarray(), N, replace=True)
strings2 = ak.array(test_strings2)
stuck = strings.stick(strings2, delimiter=delim).to_ndarray()
Expand Down Expand Up @@ -332,9 +332,10 @@ def test_groupby(self):
run_test_groupby(self.strings, self.cat, self.akset)

def test_index(self):
run_test_index(self.strings, self.test_strings, self.cat, range(-len(self.gremlins), 0))
run_test_index(self.gremlins_strings, self.gremlins_test_strings, self.gremlins_cat,
run_test_index(self.strings, self.test_strings, self.cat,
range(-len(self.gremlins), 0))
run_test_index(self.gremlins_strings, self.gremlins_test_strings,
self.gremlins_cat, range(-len(self.gremlins), 0))

def test_slice(self):
run_test_slice(self.strings, self.test_strings, self.cat)
Expand All @@ -350,15 +351,27 @@ def test_starts_with(self):

def test_ends_with(self):
run_test_ends_with(self.strings, self.test_strings, self.delim)

# Test gremlins delimiters
run_test_ends_with(self.gremlins_strings, self.gremlins_test_strings, ' ')
run_test_ends_with(self.gremlins_strings, self.gremlins_test_strings, '"')
with self.assertRaises(AssertionError):
self.assertFalse(run_test_ends_with(self.gremlins_strings,
self.gremlins_test_strings, ''))

def test_ends_with_delimiter_match(self):
strings = ak.array(['string{} '.format(i) for i in range(0,5)])
self.assertTrue((strings.endswith(' ').to_ndarray()).all())

# Test for expected errors for gremlins delimiters
with self.assertRaises(AttributeError):
run_test_ends_with(self.gremlins_strings, self.test_strings, ' ')
with self.assertRaises(AttributeError):
run_test_ends_with(self.gremlins_strings, self.test_strings, '')
with self.assertRaises(AttributeError):
run_test_ends_with(self.gremlins_strings, self.test_strings, '"')
strings = ak.array(['string{}"'.format(i) for i in range(0,5)])
self.assertTrue((strings.endswith('"').to_ndarray()).all())

strings = ak.array(['string{}$'.format(i) for i in range(0,5)])
self.assertTrue((strings.endswith('$').to_ndarray()).all())

strings = ak.array(['string{}yyz'.format(i) for i in range(0,5)])
self.assertTrue((strings.endswith('z').to_ndarray()).all())

def test_error_handling(self):
stringsOne = ak.random_strings_uniform(1, 10, UNIQUE,
characters='printable')
Expand Down Expand Up @@ -403,21 +416,22 @@ def test_error_handling(self):
def test_peel(self):
run_test_peel(self.strings, self.test_strings, self.delim)

# Test for expected errors for gremlins delimiters
# Test gremlins delimiters
with self.assertRaises(ValueError):
run_test_peel(self.gremlins_strings, self.gremlins_test_strings, '')
# Passing in '"' or ' ' as a delimiter causes the Arkouda server to hang
run_test_peel(self.gremlins_strings, self.gremlins_test_strings, '"')
run_test_peel(self.gremlins_strings, self.gremlins_test_strings, ' ')

def test_stick(self):
run_test_stick(self.strings, self.test_strings, self.base_words, self.delim)

# Test for expected errors for gremlins delimiters
with self.assertRaises(RuntimeError):
run_test_stick(self.gremlins_strings, self.gremlins_test_strings, self.base_words, ' ')
with self.assertRaises(RuntimeError):
run_test_stick(self.gremlins_strings, self.gremlins_test_strings, self.base_words, '')
with self.assertRaises(RuntimeError):
run_test_stick(self.gremlins_strings, self.gremlins_test_strings, self.base_words, '"')
run_test_stick(self.strings, self.test_strings, self.base_words, self.delim, 100)
# Test gremlins delimiters
run_test_stick(self.gremlins_strings, self.gremlins_test_strings,
self.gremlins_base_words, ' ', 103)
run_test_stick(self.gremlins_strings, self.gremlins_test_strings,
self.gremlins_base_words, '', 103)
run_test_stick(self.gremlins_strings, self.gremlins_test_strings,
self.gremlins_base_words, '"', 103)

def test_str_output(self):
strings = ak.array(['string {}'.format(i) for i in range (0,101)])
Expand Down