Misc refactoring and made all the tests in the SmartSplitTests class independent by replacing BeforeSuite with BeforeTest
This commit is contained in:
parent
ca572a6a2d
commit
f4be9f5fe1
@ -2,9 +2,11 @@ package com.google.refine.tests.expr.functions.strings;
|
|||||||
|
|
||||||
import static org.junit.Assert.assertArrayEquals;
|
import static org.junit.Assert.assertArrayEquals;
|
||||||
import static org.testng.Assert.assertTrue;
|
import static org.testng.Assert.assertTrue;
|
||||||
|
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import org.testng.annotations.AfterSuite;
|
|
||||||
import org.testng.annotations.BeforeSuite;
|
import org.testng.annotations.AfterTest;
|
||||||
|
import org.testng.annotations.BeforeTest;
|
||||||
import org.testng.annotations.Test;
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
import com.google.refine.expr.EvalError;
|
import com.google.refine.expr.EvalError;
|
||||||
@ -16,29 +18,28 @@ import com.google.refine.tests.util.TestUtils;
|
|||||||
public class SmartSplitTests {
|
public class SmartSplitTests {
|
||||||
|
|
||||||
private static Properties bindings;
|
private static Properties bindings;
|
||||||
private static String FUNCTION_NAME = "smartSplit";
|
|
||||||
|
|
||||||
@BeforeSuite
|
@BeforeTest
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
bindings = new Properties();
|
bindings = new Properties();
|
||||||
}
|
}
|
||||||
|
|
||||||
@AfterSuite
|
@AfterTest
|
||||||
public void tearDown() {
|
public void tearDown() {
|
||||||
bindings = null;
|
bindings = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSmartSplitInvalidParams() {
|
public void testSmartSplitInvalidParams() {
|
||||||
assertTrue(invoke(FUNCTION_NAME) instanceof EvalError);
|
assertTrue(invoke("smartSplit") instanceof EvalError);
|
||||||
assertTrue(invoke(FUNCTION_NAME, "teststring1", 1, "teststring2", 2) instanceof EvalError);
|
assertTrue(invoke("smartSplit", "teststring1", 1, "teststring2", 2) instanceof EvalError);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSmartSplitGuessComma() {
|
public void testSmartSplitGuessComma() {
|
||||||
String testString = "teststring1,teststring2,teststring3,teststring4";
|
String testString = "teststring1,teststring2,teststring3,teststring4";
|
||||||
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
||||||
String[] actual = (String[]) invoke(FUNCTION_NAME, testString);
|
String[] actual = (String[]) invoke("smartSplit", testString);
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -46,7 +47,7 @@ public class SmartSplitTests {
|
|||||||
public void testSmartSplitGuessTab() {
|
public void testSmartSplitGuessTab() {
|
||||||
String testString = "teststring1 teststring2 teststring3 teststring4";
|
String testString = "teststring1 teststring2 teststring3 teststring4";
|
||||||
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
||||||
String[] actual = (String[]) invoke(FUNCTION_NAME, testString);
|
String[] actual = (String[]) invoke("smartSplit", testString);
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ public class SmartSplitTests {
|
|||||||
public void testSmartSplitCharSepGiven() {
|
public void testSmartSplitCharSepGiven() {
|
||||||
String testString = "teststring1#teststring2#teststring3#teststring4";
|
String testString = "teststring1#teststring2#teststring3#teststring4";
|
||||||
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
||||||
String[] actual = (String[]) invoke(FUNCTION_NAME, testString, '#');
|
String[] actual = (String[]) invoke("smartSplit", testString, '#');
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -62,7 +63,7 @@ public class SmartSplitTests {
|
|||||||
public void testSmartSplitCharSepSpace() {
|
public void testSmartSplitCharSepSpace() {
|
||||||
String testString = "teststring1 teststring2 teststring3 teststring4";
|
String testString = "teststring1 teststring2 teststring3 teststring4";
|
||||||
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
||||||
String[] actual = (String[]) invoke(FUNCTION_NAME, testString, ' ');
|
String[] actual = (String[]) invoke("smartSplit", testString, ' ');
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -70,7 +71,7 @@ public class SmartSplitTests {
|
|||||||
public void testSmartSplitStringSepGiven() {
|
public void testSmartSplitStringSepGiven() {
|
||||||
String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4";
|
String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4";
|
||||||
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
|
||||||
String[] actual = (String[]) invoke(FUNCTION_NAME, testString, "#@$");
|
String[] actual = (String[]) invoke("smartSplit", testString, "#@$");
|
||||||
assertArrayEquals(expected, actual);
|
assertArrayEquals(expected, actual);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user