tables = new ArrayList<>();
+ Charset cs = getEncodingOrDefault();
// If the path of a data file has been set.
if (super.paths != null){
for (URL url : paths) {
- Table table = createTable(url);
+ Table table = createTable(url, cs);
tables.add(table);
}
}
diff --git a/src/test/java/io/frictionlessdata/datapackage/ValidatorTest.java b/src/test/java/io/frictionlessdata/datapackage/ValidatorTest.java
index 00e54fb..e08ae89 100644
--- a/src/test/java/io/frictionlessdata/datapackage/ValidatorTest.java
+++ b/src/test/java/io/frictionlessdata/datapackage/ValidatorTest.java
@@ -4,62 +4,52 @@
import io.frictionlessdata.datapackage.exceptions.DataPackageException;
import io.frictionlessdata.tableschema.exception.ValidationException;
import io.frictionlessdata.tableschema.util.JsonUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
/**
* Test calls for JSON Validator class.
*
*/
public class ValidatorTest {
private static URL url;
-
- @Rule
- public final ExpectedException exception = ExpectedException.none();
-
- private Validator validator = null;
- @Before
- public void setup() throws MalformedURLException {
- validator = new Validator();
+ @BeforeAll
+ public static void setup() throws MalformedURLException {
url = new URL("https://raw.githubusercontent.com/frictionlessdata/datapackage-java" +
"/master/src/test/resources/fixtures/datapackages/multi-data/datapackage.json");
}
-
+
@Test
public void testValidatingInvalidJsonObject() throws IOException, DataPackageException {
JsonNode datapackageJsonObject = JsonUtil.getInstance().createNode("{\"invalid\" : \"json\"}");
-
- exception.expect(ValidationException.class);
- validator.validate(datapackageJsonObject);
+
+ assertThrows(ValidationException.class, () -> {Validator.validate(datapackageJsonObject);});
}
@Test
public void testValidatingInvalidJsonString() throws IOException, DataPackageException{
String datapackageJsonString = "{\"invalid\" : \"json\"}";
-
- exception.expect(ValidationException.class);
- validator.validate(datapackageJsonString);
+
+ assertThrows(ValidationException.class, () -> {Validator.validate(datapackageJsonString);});
}
-
+
@Test
public void testValidationWithInvalidProfileId() throws Exception {
Package dp = new Package(url, true);
String invalidProfileId = "INVALID_PROFILE_ID";
dp.setProperty("profile", invalidProfileId);
-
- exception.expectMessage("Invalid profile id: " + invalidProfileId);
- dp.validate();
+ Exception ex = assertThrows(ValidationException.class, () -> {dp.validate();});
+ Assertions.assertEquals("Invalid profile id: " + invalidProfileId, ex.getMessage());
}
-
@Test
public void testValidationWithValidProfileUrl() throws Exception {
Package dp = new Package(url, true);
@@ -69,7 +59,7 @@ public void testValidationWithValidProfileUrl() throws Exception {
dp.validate();
// No exception thrown, test passes.
- Assert.assertEquals("https://raw.githubusercontent.com/frictionlessdata/datapackage-java/" +
+ Assertions.assertEquals("https://raw.githubusercontent.com/frictionlessdata/datapackage-java/" +
"master/src/main/resources/schemas/data-package.json", dp.getProfile());
}
@@ -80,8 +70,8 @@ public void testValidationWithInvalidProfileUrl() throws Exception {
String invalidProfileUrl = "https://raw.githubusercontent.com/frictionlessdata/datapackage-java" +
"/master/src/main/resources/schemas/INVALID.json";
dp.setProperty("profile", invalidProfileUrl);
-
- exception.expectMessage("Invalid profile schema URL: " + invalidProfileUrl);
- dp.validate();
+
+ Exception ex = assertThrows(ValidationException.class, () -> {dp.validate();});
+ Assertions.assertEquals("Invalid profile schema URL: " + invalidProfileUrl, ex.getMessage());
}
}
diff --git a/src/test/java/io/frictionlessdata/datapackage/resource/ResourceTest.java b/src/test/java/io/frictionlessdata/datapackage/resource/ResourceTest.java
index 37cdf3f..0930d0a 100644
--- a/src/test/java/io/frictionlessdata/datapackage/resource/ResourceTest.java
+++ b/src/test/java/io/frictionlessdata/datapackage/resource/ResourceTest.java
@@ -220,7 +220,7 @@ public void testIterateDataWithCast() throws Exception{
@Test
public void testIterateDataFromCsvFormat() throws Exception{
String dataString = "city,year,population\nlondon,2017,8780000\nparis,2017,2240000\nrome,2017,2860000";
- Resource resource = new CSVDataResource("population", dataString);
+ Resource resource = new CSVTabularDataResource("population", dataString);
// Set the profile to tabular data resource.
resource.setProfile(Profile.PROFILE_TABULAR_DATA_RESOURCE);
diff --git a/src/test/java/io/frictionlessdata/datapackage/resource/RoundtripTest.java b/src/test/java/io/frictionlessdata/datapackage/resource/RoundtripTest.java
index bb85b37..67e0fbd 100644
--- a/src/test/java/io/frictionlessdata/datapackage/resource/RoundtripTest.java
+++ b/src/test/java/io/frictionlessdata/datapackage/resource/RoundtripTest.java
@@ -57,7 +57,7 @@ public void dogfoodingTest() throws Exception {
new File(TestUtil.getBasePath().toFile(), "/schema/population_schema.json"), true);
res.setSchema(schema);
res.setShouldSerializeToFile(true);
- res.setSerializationFormat(Resource.FORMAT_CSV);
+ res.setSerializationFormat(TableDataSource.Format.FORMAT_CSV.getLabel());
res.setDialect(Dialect.fromCsvFormat(csvFormat));
pkg.addResource(res);
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy