s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove uses of junit, closes #2133

Browse Source
This commit is contained in:
Antonin Delpeuch 2019-08-23 14:09:11 +01:00
parent 46acc21a43
commit 29f3cef3ec
36 changed files with 52 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/wikidata/tests/src/org/openrefine/wikidata/commands/LoginCommandTest.java
View File

@ -1,6 +1,6 @@
package org.openrefine.wikidata.commands;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/commands/PreviewWikibaseSchemaCommandTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.commands;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import static org.mockito.Mockito.when;
import static org.openrefine.wikidata.testing.TestingData.jsonFromFile;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SaveWikibaseSchemaCommandTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.commands;
import static org.junit.Assert.assertTrue;
import static org.testng.Assert.assertTrue;
import static org.mockito.Mockito.when;
import static org.openrefine.wikidata.testing.TestingData.jsonFromFile;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/commands/SchemaCommandTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.commands;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import static org.mockito.Mockito.when;
import java.io.IOException;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/editing/EditBatchProcessorTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.editing;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/editing/NewItemLibraryTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.editing;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import java.util.Collections;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/editing/ReconEntityRewriterTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.editing;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import org.openrefine.wikidata.testing.TestingData;
import org.openrefine.wikidata.updates.ItemUpdate;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QSValuePrinterTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.exporters;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.math.BigDecimal;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/exporters/QuickStatementsExporterTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.exporters;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.io.StringWriter;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperationTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.operations;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.LineNumberReader;

4
extensions/wikidata/tests/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperationTest.java
View File

@ -23,8 +23,8 @@
******************************************************************************/
package org.openrefine.wikidata.operations;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import java.io.LineNumberReader;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningStoreTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.qa;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import org.openrefine.wikidata.testing.JacksonSerializationTest;
import org.testng.annotations.BeforeMethod;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/qa/QAWarningTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.qa;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import org.openrefine.wikidata.testing.JacksonSerializationTest;
import org.testng.annotations.Test;

4
extensions/wikidata/tests/src/org/openrefine/wikidata/qa/scrutinizers/ScrutinizerTest.java
View File

@ -23,8 +23,8 @@
******************************************************************************/
package org.openrefine.wikidata.qa.scrutinizers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import java.util.Arrays;
import java.util.Set;

4
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/ExpressionContextTest.java
View File

@ -23,8 +23,8 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

4
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLanguageConstantTest.java
View File

@ -23,8 +23,8 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import org.openrefine.wikidata.testing.JacksonSerializationTest;
import org.testng.annotations.Test;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbLocationConstantTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.text.ParseException;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbNameDescExprTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.util.Collections;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbQuantityExprTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.math.BigDecimal;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WbStatementExprTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.Arrays;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/WikibaseSchemaTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.schema;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.ArrayList;

8
extensions/wikidata/tests/src/org/openrefine/wikidata/schema/entityvalues/ReconEntityIdValueTest.java
View File

@ -23,10 +23,10 @@
******************************************************************************/
package org.openrefine.wikidata.schema.entityvalues;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
import java.util.Collections;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/testing/JacksonSerializationTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.testing;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;

8
extensions/wikidata/tests/src/org/openrefine/wikidata/updates/ItemUpdateTest.java
View File

@ -23,10 +23,10 @@
******************************************************************************/
package org.openrefine.wikidata.updates;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertTrue;
import java.io.IOException;
import java.util.Arrays;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/PointerExtractorTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.updates.scheduler;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.math.BigDecimal;
import java.util.Collections;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/QuickStatementsUpdateSchedulerTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.updates.scheduler;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/UpdateSchedulerTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.updates.scheduler;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.Collections;

2
extensions/wikidata/tests/src/org/openrefine/wikidata/updates/scheduler/WikibaseAPIUpdateSchedulerTest.java
View File

@ -23,7 +23,7 @@
******************************************************************************/
package org.openrefine.wikidata.updates.scheduler;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.util.Arrays;
import java.util.List;

18
main/pom.xml
View File

@ -458,24 +458,6 @@
<version>2.23.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>1.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>1.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>

2
main/tests/server/src/com/google/refine/exporters/sql/SqlExporterTests.java
View File

@ -33,7 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package com.google.refine.exporters.sql;
import static org.junit.Assert.assertNotEquals;
import static org.testng.Assert.assertNotEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

13
main/tests/server/src/com/google/refine/expr/functions/strings/SmartSplitTests.java
View File

@ -26,7 +26,7 @@
******************************************************************************/
package com.google.refine.expr.functions.strings;
import static org.junit.Assert.assertArrayEquals;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import java.util.Properties;
@ -36,7 +36,6 @@ import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import com.google.refine.expr.EvalError;
import com.google.refine.expr.functions.strings.SmartSplit;
import com.google.refine.grel.ControlFunctionRegistry;
import com.google.refine.grel.Function;
import com.google.refine.util.TestUtils;
@ -66,7 +65,7 @@ public class SmartSplitTests {
String testString = "teststring1,teststring2,teststring3,teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString);
assertArrayEquals(expected, actual);
assertEquals(expected, actual);
}
@Test
@ -74,7 +73,7 @@ public class SmartSplitTests {
String testString = "teststring1 teststring2 teststring3 teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString);
assertArrayEquals(expected, actual);
assertEquals(expected, actual);
}
@Test
@ -82,7 +81,7 @@ public class SmartSplitTests {
String testString = "teststring1#teststring2#teststring3#teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, '#');
assertArrayEquals(expected, actual);
assertEquals(expected, actual);
}
@Test
@ -90,7 +89,7 @@ public class SmartSplitTests {
String testString = "teststring1 teststring2 teststring3 teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, ' ');
assertArrayEquals(expected, actual);
assertEquals(expected, actual);
}
@Test
@ -98,7 +97,7 @@ public class SmartSplitTests {
String testString = "teststring1#@$teststring2#@$teststring3#@$teststring4";
String[] expected = { "teststring1", "teststring2", "teststring3", "teststring4" };
String[] actual = (String[]) invoke("smartSplit", testString, "#@$");
assertArrayEquals(expected, actual);
assertEquals(expected, actual);
}
/**

2
main/tests/server/src/com/google/refine/expr/util/JsonValueConverterTests.java
View File

@ -29,12 +29,10 @@ package com.google.refine.expr.util;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.util.Arrays;
import org.testng.annotations.Test;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.refine.expr.util.JsonValueConverter;
import com.google.refine.util.ParsingUtilities;
public class JsonValueConverterTests {

2
main/tests/server/src/com/google/refine/model/CellTests.java
View File

@ -30,7 +30,7 @@ import java.time.format.DateTimeFormatter;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import static org.junit.Assert.assertNull;
import static org.testng.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

2
main/tests/server/src/com/google/refine/model/changes/DataExtensionChangeTest.java
View File

@ -26,7 +26,7 @@
******************************************************************************/
package com.google.refine.model.changes;
import static org.junit.Assert.assertEquals;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
import java.io.InputStream;

4
main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java
View File

@ -26,8 +26,8 @@
******************************************************************************/
package com.google.refine.operations.recon;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import java.io.IOException;
import java.util.Collections;

8
main/tests/server/src/com/google/refine/util/TestUtils.java
View File

@ -26,8 +26,8 @@
******************************************************************************/
package com.google.refine.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
import java.io.File;
import java.io.IOException;
@ -35,7 +35,6 @@ import java.io.LineNumberReader;
import java.io.StringReader;
import java.io.StringWriter;
import com.fasterxml.jackson.core.JsonFactory.Feature;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
@ -46,7 +45,6 @@ import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.google.refine.util.ParsingUtilities;
public class TestUtils {
@ -86,7 +84,7 @@ public class TestUtils {
if (!jsonA.equals(jsonB)) {
jsonDiff(expected, actual);
}
assertEquals(jsonA, jsonB);
assertTrue(jsonA.equals(jsonB));
} catch(Exception e) {
fail("\""+expected+"\" and \""+actual+"\" are not equal as JSON strings.");
}