From 0f570d22a98ac162b28cf1ae07e872d22687bb6e Mon Sep 17 00:00:00 2001 From: "Nazarov, Rodion" Date: Fri, 6 Oct 2023 18:41:12 +0200 Subject: [PATCH] [Upd] Rename test files. --- .../spipes/modules/TabularModuleTest.java | 9 ++++----- ...xls.ttl => countries-xls-model-output.ttl} | 0 ...ies.tsv => duplicate-column-countries.tsv} | 0 ...tput.ttl => merged-cells-model-output.ttl} | 0 .../{merged.xls => merged-cells.xls} | Bin 26624 -> 26624 bytes 5 files changed, 4 insertions(+), 5 deletions(-) rename s-pipes-modules/module-tabular/src/test/resources/{countries-model-output-xls.ttl => countries-xls-model-output.ttl} (100%) rename s-pipes-modules/module-tabular/src/test/resources/{duplicate_column_countries.tsv => duplicate-column-countries.tsv} (100%) rename s-pipes-modules/module-tabular/src/test/resources/{merged-xls-model-output.ttl => merged-cells-model-output.ttl} (100%) rename s-pipes-modules/module-tabular/src/test/resources/{merged.xls => merged-cells.xls} (99%) diff --git a/s-pipes-modules/module-tabular/src/test/java/cz/cvut/spipes/modules/TabularModuleTest.java b/s-pipes-modules/module-tabular/src/test/java/cz/cvut/spipes/modules/TabularModuleTest.java index c00ba048..c65ca9c6 100644 --- a/s-pipes-modules/module-tabular/src/test/java/cz/cvut/spipes/modules/TabularModuleTest.java +++ b/s-pipes-modules/module-tabular/src/test/java/cz/cvut/spipes/modules/TabularModuleTest.java @@ -11,7 +11,6 @@ import cz.cvut.spipes.util.StreamResourceUtils; import org.apache.jena.rdf.model.*; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -77,7 +76,7 @@ void executeWithSimpleTransformationXls() throws URISyntaxException, IOException ExecutionContext outputContext = module.executeSelf(); - Model expectedModel = ModelFactory.createDefaultModel().read(getFilePath("countries-model-output-xls.ttl").toString()); + Model expectedModel = ModelFactory.createDefaultModel().read(getFilePath("countries-xls-model-output.ttl").toString()); assertIsomorphic(outputContext.getDefaultModel(),expectedModel); } @@ -87,14 +86,14 @@ void executeWithSimpleTransformationMergedXls() throws URISyntaxException, IOExc module.setSourceResource( StreamResourceUtils.getStreamResource( "http://test-file", - getFilePath("merged.xls")) + getFilePath("merged-cells.xls")) ); module.setSourceResourceFormat(ResourceFormat.EXCEL); module.setProcessSpecificSheetInXLSFile(1); ExecutionContext outputContext = module.executeSelf(); - Model expectedModel = ModelFactory.createDefaultModel().read(getFilePath("merged-xls-model-output.ttl").toString()); + Model expectedModel = ModelFactory.createDefaultModel().read(getFilePath("merged-cells-model-output.ttl").toString()); assertIsomorphic(outputContext.getDefaultModel(),expectedModel); } @@ -117,7 +116,7 @@ void executeWithDuplicateColumnsThrowsResourceNotUniqueException() throws URISyntaxException, IOException { module.setSourceResource(StreamResourceUtils.getStreamResource( "http://test-file-2", - getFilePath("duplicate_column_countries.tsv")) + getFilePath("duplicate-column-countries.tsv")) ); ResourceNotUniqueException exception = assertThrows( diff --git a/s-pipes-modules/module-tabular/src/test/resources/countries-model-output-xls.ttl b/s-pipes-modules/module-tabular/src/test/resources/countries-xls-model-output.ttl similarity index 100% rename from s-pipes-modules/module-tabular/src/test/resources/countries-model-output-xls.ttl rename to s-pipes-modules/module-tabular/src/test/resources/countries-xls-model-output.ttl diff --git a/s-pipes-modules/module-tabular/src/test/resources/duplicate_column_countries.tsv b/s-pipes-modules/module-tabular/src/test/resources/duplicate-column-countries.tsv similarity index 100% rename from s-pipes-modules/module-tabular/src/test/resources/duplicate_column_countries.tsv rename to s-pipes-modules/module-tabular/src/test/resources/duplicate-column-countries.tsv diff --git a/s-pipes-modules/module-tabular/src/test/resources/merged-xls-model-output.ttl b/s-pipes-modules/module-tabular/src/test/resources/merged-cells-model-output.ttl similarity index 100% rename from s-pipes-modules/module-tabular/src/test/resources/merged-xls-model-output.ttl rename to s-pipes-modules/module-tabular/src/test/resources/merged-cells-model-output.ttl diff --git a/s-pipes-modules/module-tabular/src/test/resources/merged.xls b/s-pipes-modules/module-tabular/src/test/resources/merged-cells.xls similarity index 99% rename from s-pipes-modules/module-tabular/src/test/resources/merged.xls rename to s-pipes-modules/module-tabular/src/test/resources/merged-cells.xls index d0b3d5d7f02b8c559042a2bf38e7fdc849edb1ab..ec508483b3f88ec8b7a78f24a67a468154bbe205 100644 GIT binary patch delta 20 bcmZp;z}RqsaYIfT>x8rR9+sO6)A|_!T<-{B delta 20 ccmZp;z}RqsaYIfT>xLVr6O1+&ru8!d0Ap|oDF6Tf