Skip to content

Commit

Permalink
chore: cleanup
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniel Kubányi <[email protected]>
  • Loading branch information
@dkubanyi
dkubanyi committed Jun 14, 2024
1 parent cc2fe0f commit c323037
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 72 deletions.
11 changes: 3 additions & 8 deletions gretl/src/test/java/ch/so/agi/gretl/steps/Gpkg2ShpStepTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertEquals;

import java.io.File;
import java.util.Date;
import java.util.List;

import ch.so.agi.gretl.testutil.TestUtil;
import org.geotools.data.FileDataStore;
import org.geotools.data.FileDataStoreFinder;
Expand All @@ -15,8 +9,9 @@
import org.junit.rules.TemporaryFolder;
import org.opengis.feature.type.AttributeDescriptor;

import ch.so.agi.gretl.logging.GretlLogger;
import ch.so.agi.gretl.logging.LogEnvironment;
import java.io.File;

import static org.junit.Assert.assertEquals;

public class Gpkg2ShpStepTest {

Expand Down
21 changes: 9 additions & 12 deletions gretl/src/test/java/ch/so/agi/gretl/steps/JsonImportStepTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

import java.io.File;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;

import ch.so.agi.gretl.api.Connector;
import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.*;
import org.junit.rules.TemporaryFolder;
import org.testcontainers.containers.PostgisContainerProvider;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.wait.strategy.Wait;

import ch.so.agi.gretl.api.Connector;
import ch.so.agi.gretl.logging.GretlLogger;
import ch.so.agi.gretl.logging.LogEnvironment;
import ch.so.agi.gretl.testutil.TestUtil;
import java.io.File;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

public class JsonImportStepTest {

Expand Down
13 changes: 6 additions & 7 deletions gretl/src/test/java/ch/so/agi/gretl/steps/MetaPublisherStepTestFile2LocalTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertTrue;
import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import static org.junit.Assert.assertTrue;

public class MetaPublisherStepTestFile2LocalTest {

Expand Down
18 changes: 7 additions & 11 deletions gretl/src/test/java/ch/so/agi/gretl/steps/OgdMetaPublisherStepTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertTrue;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import ch.ehi.basics.settings.Settings;
import ch.so.agi.gretl.testutil.TestUtil;
import org.apache.hadoop.conf.Configuration;
import org.interlis2.validator.Validator;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import ch.ehi.basics.settings.Settings;
import ch.so.agi.gretl.logging.GretlLogger;
import ch.so.agi.gretl.logging.LogEnvironment;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import static org.junit.Assert.assertTrue;

public class OgdMetaPublisherStepTest {

Expand Down
35 changes: 11 additions & 24 deletions gretl/src/test/java/ch/so/agi/gretl/steps/S3UploadStepTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,25 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertTrue;
import ch.so.agi.gretl.testutil.S3Test;
import ch.so.agi.gretl.testutil.S3TestHelper;
import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.*;

import java.io.BufferedReader;
import java.io.File;
import java.io.InputStreamReader;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;

import ch.so.agi.gretl.testutil.S3TestHelper;
import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;

import ch.so.agi.gretl.testutil.S3Test;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.core.ResponseInputStream;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectResponse;
import software.amazon.awssdk.services.s3.model.ListObjectsRequest;
import software.amazon.awssdk.services.s3.model.ListObjectsResponse;
import software.amazon.awssdk.services.s3.model.S3Exception;
import software.amazon.awssdk.services.s3.model.S3Object;
import static org.junit.Assert.assertTrue;

public class S3UploadStepTest {

Expand Down
15 changes: 5 additions & 10 deletions gretl/src/test/java/ch/so/agi/gretl/steps/XslTransformerStepTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
package ch.so.agi.gretl.steps;

import static org.junit.Assert.assertTrue;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;

import ch.so.agi.gretl.testutil.TestUtil;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import ch.so.agi.gretl.logging.GretlLogger;
import ch.so.agi.gretl.logging.LogEnvironment;
import net.sf.saxon.s9api.SaxonApiException;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;

import static org.junit.Assert.assertTrue;

public class XslTransformerStepTest {

Expand Down

0 comments on commit c323037

Please sign in to comment.