Skip to content
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

Fixed TODO to improve unordered string comparision #186

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed TODO to improve unordered string comparision #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 15 additions & 10 deletions nondex-test/src/test/java/edu/illinois/nondex/core/AbstractCollectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ a copy of this software and associated documentation files (the

package edu.illinois.nondex.core;

import java.util.Arrays;

import edu.illinois.nondex.shuffling.ControlNondeterminism;

import org.junit.Assert;
Expand All @@ -46,7 +48,7 @@ protected void assertParameterized(T ds, Object derived, String str) {
case FULL:
String tempStr = derived.toString();
Assert.assertNotEquals("FULL is improperly running", str, tempStr);
this.assertEqualstUnordered("Does not match permutation", str, tempStr);
this.assertEqualsUnordered("Does not match permutation", str, tempStr);
Copy link
Contributor

Choose a reason for hiding this comment

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

Any idea why they ever called it Equalst? Was it a misspelling or some joke about EqualsString? Does the Git log show anything useful?

Copy link
Author

Choose a reason for hiding this comment

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

Hello Professor, I checked the git blame and from that I can infer that it was initially called as such. this was the first time when the function was commited/created
d4f6e03#diff-b6d9573a5585dde09208a701b942a04b7e8017e4916381997baa33cf6d32edabR38

break;
case ONE:
Assert.assertEquals("ONE is improperly running", str, derived.toString());
Expand All @@ -56,16 +58,19 @@ protected void assertParameterized(T ds, Object derived, String str) {
}
}

protected void assertEqualstUnordered(String msg, String expected, String actual) {
Assert.assertEquals(msg + ": " + expected + " =/= " + actual, expected.length(), actual.length());
String trimmed = expected.substring(1, expected.length() - 1);
String[] elems = trimmed.split(",");
// TODO(gyori): fix and make this more robust. It does not check duplicates, substrings, etc.
for (int i = 0; i < elems.length; i++) {
elems[i] = elems[i].trim();
Assert.assertTrue(msg + ": " + trimmed + " =/= " + actual, actual.contains(elems[i]));
}
private String[] trimAndSplitStrings(String msg) {
String trimmed = msg.substring(1, msg.length() - 1);
String[] elems = trimmed.split(", ");
return elems;
}

protected void assertEqualsUnordered(String msg, String expected, String actual) {
String trimmed = expected.substring(1, expected.length() - 1);
String[] actualTokenized = this.trimAndSplitStrings(actual);
String[] expectedTokenized = this.trimAndSplitStrings(expected);

Arrays.sort(actualTokenized);
Arrays.sort(expectedTokenized);
Assert.assertArrayEquals(msg + ": " + trimmed + " =/= " + actual, expectedTokenized, actualTokenized);
}
}
8 changes: 4 additions & 4 deletions nondex-test/src/test/java/edu/illinois/nondex/core/ConcurrentHashMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void testKeySet() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", keySet.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other",
this.assertEqualsUnordered("The strings are not a permutation of each other",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", keySet.toString());

}
Expand Down Expand Up @@ -127,7 +127,7 @@ public void testValuesParameterized() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other",
this.assertEqualsUnordered("The strings are not a permutation of each other",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());

String str = values.toString();
Expand All @@ -141,7 +141,7 @@ public void testEntrySet() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0=0, 2=2, 3=3, 4=4, 5=5, 6=6, 7=7, 8=8, 9=9}", entrySet.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other",
this.assertEqualsUnordered("The strings are not a permutation of each other",
"{0=0, 1=1, 2=2, 3=3, 4=4, 5=5, 6=6, 7=7, 8=8, 9=9}", entrySet.toString());
}

Expand All @@ -161,7 +161,7 @@ public void testElements() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", enumerated.toString());
this.assertEqualstUnordered("The collection does not containt the elements asserted",
this.assertEqualsUnordered("The collection does not containt the elements asserted",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", enumerated.toString());
}
}
16 changes: 11 additions & 5 deletions nondex-test/src/test/java/edu/illinois/nondex/core/HashMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void smokeTest() {

String str = map.toString();
Assert.assertNotEquals("You are not running FULL nondex", str, map.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other", str, map.toString());
this.assertEqualsUnordered("The strings are not a permutation of each other", str, map.toString());
}

@Test
Expand All @@ -99,7 +99,7 @@ public void testKeySet() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", keySet.toString());
this.assertEqualstUnordered("The strings are not a permuation of each other",
this.assertEqualsUnordered("The strings are not a permuation of each other",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", keySet.toString());

}
Expand All @@ -119,7 +119,7 @@ public void testValues() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other",
this.assertEqualsUnordered("The strings are not a permutation of each other",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());
}

Expand All @@ -130,7 +130,7 @@ public void testValuesParametrized() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());
this.assertEqualstUnordered("The strings are not a permuation of each other",
this.assertEqualsUnordered("The strings are not a permuation of each other",
"{0, 1, 2, 3, 4, 5, 6, 7, 8, 9}", values.toString());

String str = values.toString();
Expand All @@ -144,10 +144,16 @@ public void testEntrySet() {

Assert.assertNotEquals("You are likely running an unchanged JVM",
"{0=0, 2=2, 3=3, 4=4, 5=5, 6=6, 7=7, 8=8, 9=9}", entrySet.toString());
this.assertEqualstUnordered("The strings are not a permutation of each other",
this.assertEqualsUnordered("The strings are not a permutation of each other",
"{0=0, 1=1, 2=2, 3=3, 4=4, 5=5, 6=6, 7=7, 8=8, 9=9}", entrySet.toString());
}

@Test(expected = AssertionError.class)
public void testAssertEqualsUnorderedFailsWithDuplicates() {
this.assertEqualsUnordered("the strings are not a permutation of each other",
"{0=0, 0=0, 1=1, 2=2, 3=3}", "{0=0, 1=1, 2=2, 3=3}");
}

@Test
public void testEntrySetParametrized() {
Map<Integer, Integer> map = this.createResizedDS();
Expand Down