(junit) Repackage JUnit tests

quince-science · Jul 5, 2024 · 4f59edc · 4f59edc
1 parent 2fb1b81
commit 4f59edc
Show file tree

Hide file tree

Showing 77 changed files with 150 additions and 294 deletions.
diff --git a/...k/ac/exeter/QuinCe/TestBase/BaseTest.java → ...k/ac/exeter/QuinCe/TestBase/BaseTest.java b/...k/ac/exeter/QuinCe/TestBase/BaseTest.java → ...k/ac/exeter/QuinCe/TestBase/BaseTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 

diff --git a/...ter/QuinCe/TestBase/MockFacesContext.java → ...ter/QuinCe/TestBase/MockFacesContext.java b/...ter/QuinCe/TestBase/MockFacesContext.java → ...ter/QuinCe/TestBase/MockFacesContext.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import javax.faces.context.FacesContext;
 

diff --git a/...eter/QuinCe/TestBase/TestBaseSession.java → ...eter/QuinCe/TestBase/TestBaseSession.java b/...eter/QuinCe/TestBase/TestBaseSession.java → ...eter/QuinCe/TestBase/TestBaseSession.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import java.time.LocalDateTime;
 import java.util.Collections;

diff --git a/...er/QuinCe/TestBase/TestLineException.java → ...er/QuinCe/TestBase/TestLineException.java b/...er/QuinCe/TestBase/TestLineException.java → ...er/QuinCe/TestBase/TestLineException.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 /**
  * An {@link Exception} that a test can throw if it encounters an error while

diff --git a/.../QuinCe/TestBase/TestResourceManager.java → .../QuinCe/TestBase/TestResourceManager.java b/.../QuinCe/TestBase/TestResourceManager.java → .../QuinCe/TestBase/TestResourceManager.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import java.io.File;
 

diff --git a/...ter/QuinCe/TestBase/TestSetException.java → ...ter/QuinCe/TestBase/TestSetException.java b/...ter/QuinCe/TestBase/TestSetException.java → ...ter/QuinCe/TestBase/TestSetException.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 /**
  * Exception class to wrap errors encountered while setting up test sets

diff --git a/...c/exeter/QuinCe/TestBase/TestSetLine.java → ...c/exeter/QuinCe/TestBase/TestSetLine.java b/...c/exeter/QuinCe/TestBase/TestSetLine.java → ...c/exeter/QuinCe/TestBase/TestSetLine.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;

diff --git a/...c/exeter/QuinCe/TestBase/TestSetTest.java → ...c/exeter/QuinCe/TestBase/TestSetTest.java b/...c/exeter/QuinCe/TestBase/TestSetTest.java → ...c/exeter/QuinCe/TestBase/TestSetTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.TestBase;
+package uk.ac.exeter.QuinCe.TestBase;
 
 import java.io.BufferedReader;
 import java.io.File;

diff --git a/...eter/QuinCe/User/UserDBCodeCheckTest.java → ...eter/QuinCe/User/UserDBCodeCheckTest.java b/...eter/QuinCe/User/UserDBCodeCheckTest.java → ...eter/QuinCe/User/UserDBCodeCheckTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.User;
+package uk.ac.exeter.QuinCe.User;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -8,11 +8,9 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.TestLineException;
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetLine;
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetTest;
-import uk.ac.exeter.QuinCe.User.User;
-import uk.ac.exeter.QuinCe.User.UserDB;
+import uk.ac.exeter.QuinCe.TestBase.TestLineException;
+import uk.ac.exeter.QuinCe.TestBase.TestSetLine;
+import uk.ac.exeter.QuinCe.TestBase.TestSetTest;
 
 /**
  * Complex combination tests for the

diff --git a/.../uk/ac/exeter/QuinCe/User/UserDBTest.java → .../uk/ac/exeter/QuinCe/User/UserDBTest.java b/.../uk/ac/exeter/QuinCe/User/UserDBTest.java → .../uk/ac/exeter/QuinCe/User/UserDBTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.User;
+package uk.ac.exeter.QuinCe.User;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -12,11 +12,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.User.NoSuchUserException;
-import uk.ac.exeter.QuinCe.User.User;
-import uk.ac.exeter.QuinCe.User.UserDB;
-import uk.ac.exeter.QuinCe.User.UserPreferences;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.utils.MissingParamException;
 
 /**

diff --git a/...uinCe/data/Dataset/ColumnHeadingTest.java → ...uinCe/data/Dataset/ColumnHeadingTest.java b/...uinCe/data/Dataset/ColumnHeadingTest.java → ...uinCe/data/Dataset/ColumnHeadingTest.java
@@ -1,13 +1,12 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset;
+package uk.ac.exeter.QuinCe.data.Dataset;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.data.Dataset.ColumnHeading;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 
 public class ColumnHeadingTest extends BaseTest {
 

diff --git a/...et/ControsPco2MeasurementLocatorTest.java → ...et/ControsPco2MeasurementLocatorTest.java b/...et/ControsPco2MeasurementLocatorTest.java → ...et/ControsPco2MeasurementLocatorTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset;
+package uk.ac.exeter.QuinCe.data.Dataset;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -11,12 +11,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ControsPco2ReducerTest;
-import uk.ac.exeter.QuinCe.data.Dataset.ControsPco2MeasurementLocator;
-import uk.ac.exeter.QuinCe.data.Dataset.DataSet;
-import uk.ac.exeter.QuinCe.data.Dataset.DataSetDB;
-import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
+import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ControsPco2ReducerTest;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.InstrumentDB;
 import uk.ac.exeter.QuinCe.web.system.ResourceManager;

diff --git a/...orsInterpolateMapEntryBigDecimalTest.java → ...orsInterpolateMapEntryBigDecimalTest.java b/...orsInterpolateMapEntryBigDecimalTest.java → ...orsInterpolateMapEntryBigDecimalTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -13,9 +13,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetLine;
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetTest;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.Calculators;
+import uk.ac.exeter.QuinCe.TestBase.TestSetLine;
+import uk.ac.exeter.QuinCe.TestBase.TestSetTest;
 
 @TestInstance(Lifecycle.PER_CLASS)
 public class CalculatorsInterpolateMapEntryBigDecimalTest extends TestSetTest {

diff --git a/...ataset/DataReduction/CalculatorsTest.java → ...ataset/DataReduction/CalculatorsTest.java b/...ataset/DataReduction/CalculatorsTest.java → ...ataset/DataReduction/CalculatorsTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -7,8 +7,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.Calculators;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 
 public class CalculatorsTest extends BaseTest {
 

diff --git a/...DataReduction/ControsPco2ReducerTest.java → ...DataReduction/ControsPco2ReducerTest.java b/...DataReduction/ControsPco2ReducerTest.java → ...DataReduction/ControsPco2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -17,8 +17,6 @@
 import uk.ac.exeter.QuinCe.data.Dataset.DataSetDataDB;
 import uk.ac.exeter.QuinCe.data.Dataset.DatasetMeasurements;
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ControsPco2Reducer;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.InstrumentDB;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;

diff --git a/...DataReduction/DataReducerFactoryTest.java → ...DataReduction/DataReducerFactoryTest.java b/...DataReduction/DataReducerFactoryTest.java → ...DataReduction/DataReducerFactoryTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -17,11 +17,7 @@
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mockito;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.CalculationParameter;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReducer;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReducerFactory;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionException;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.InstrumentDB;
 import uk.ac.exeter.QuinCe.data.Instrument.InstrumentException;

diff --git a/...ataset/DataReduction/DataReducerTest.java → ...ataset/DataReduction/DataReducerTest.java b/...ataset/DataReduction/DataReducerTest.java → ...ataset/DataReduction/DataReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -9,7 +9,7 @@
 
 import org.junit.jupiter.api.BeforeEach;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.Flag;

diff --git a/...ction/DataReductionRecordCompareTest.java → ...ction/DataReductionRecordCompareTest.java b/...ction/DataReductionRecordCompareTest.java → ...ction/DataReductionRecordCompareTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -11,10 +11,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetLine;
-import junit.uk.ac.exeter.QuinCe.TestBase.TestSetTest;
+import uk.ac.exeter.QuinCe.TestBase.TestSetLine;
+import uk.ac.exeter.QuinCe.TestBase.TestSetTest;
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 
 /**

diff --git a/...ataReduction/DataReductionRecordTest.java → ...ataReduction/DataReductionRecordTest.java b/...ataReduction/DataReductionRecordTest.java → ...ataReduction/DataReductionRecordTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -12,10 +12,8 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionException;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.Flag;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 

diff --git a/...DataReduction/NoReductionReducerTest.java → ...DataReduction/NoReductionReducerTest.java b/...DataReduction/NoReductionReducerTest.java → ...DataReduction/NoReductionReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -14,8 +14,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.NoReductionReducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.SensorType;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;

diff --git a/.../ProOceanusAtmosphericCO2ReducerTest.java → .../ProOceanusAtmosphericCO2ReducerTest.java b/.../ProOceanusAtmosphericCO2ReducerTest.java → .../ProOceanusAtmosphericCO2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -11,8 +11,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ProOceanusAtmosphericCO2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 

diff --git a/...ction/ProOceanusMarineCO2ReducerTest.java → ...ction/ProOceanusMarineCO2ReducerTest.java b/...ction/ProOceanusMarineCO2ReducerTest.java → ...ction/ProOceanusMarineCO2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -11,8 +11,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ProOceanusMarineCO2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 

diff --git a/...tion/ReadOnlyDataReductionRecordTest.java → ...tion/ReadOnlyDataReductionRecordTest.java b/...tion/ReadOnlyDataReductionRecordTest.java → ...tion/ReadOnlyDataReductionRecordTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -12,9 +12,7 @@
 import org.apache.commons.lang3.NotImplementedException;
 import org.junit.jupiter.api.Test;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionException;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.ReadOnlyDataReductionRecord;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.Flag;
 
 /**

diff --git a/...rwayAtmospheric12_13Pco2ReducerTest2.java → ...rwayAtmospheric12_13Pco2ReducerTest2.java b/...rwayAtmospheric12_13Pco2ReducerTest2.java → ...rwayAtmospheric12_13Pco2ReducerTest2.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,9 +15,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.UnderwayAtmospheric12_13Pco2Reducer;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.UnderwayMarine12_13Pco2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 import uk.ac.exeter.QuinCe.web.system.ResourceManager;

diff --git a/...n/UnderwayAtmosphericPco2ReducerTest.java → ...n/UnderwayAtmosphericPco2ReducerTest.java b/...n/UnderwayAtmosphericPco2ReducerTest.java → ...n/UnderwayAtmosphericPco2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -11,8 +11,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.UnderwayAtmosphericPco2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 

diff --git a/...n/UnderwayMarine12_13Pco2ReducerTest.java → ...n/UnderwayMarine12_13Pco2ReducerTest.java b/...n/UnderwayMarine12_13Pco2ReducerTest.java → ...n/UnderwayMarine12_13Pco2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -15,8 +15,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.UnderwayMarine12_13Pco2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 import uk.ac.exeter.QuinCe.web.system.ResourceManager;

diff --git a/...uction/UnderwayMarinePco2ReducerTest.java → ...uction/UnderwayMarinePco2ReducerTest.java b/...uction/UnderwayMarinePco2ReducerTest.java → ...uction/UnderwayMarinePco2ReducerTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
+package uk.ac.exeter.QuinCe.data.Dataset.DataReduction;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -11,8 +11,6 @@
 
 import uk.ac.exeter.QuinCe.data.Dataset.Measurement;
 import uk.ac.exeter.QuinCe.data.Dataset.MeasurementValue;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.DataReductionRecord;
-import uk.ac.exeter.QuinCe.data.Dataset.DataReduction.UnderwayMarinePco2Reducer;
 import uk.ac.exeter.QuinCe.data.Instrument.Instrument;
 import uk.ac.exeter.QuinCe.data.Instrument.SensorDefinition.Variable;
 

diff --git a/...uinCe/data/Dataset/DataSetDataDBTest.java → ...uinCe/data/Dataset/DataSetDataDBTest.java b/...uinCe/data/Dataset/DataSetDataDBTest.java → ...uinCe/data/Dataset/DataSetDataDBTest.java
@@ -1,4 +1,4 @@
-package junit.uk.ac.exeter.QuinCe.data.Dataset;
+package uk.ac.exeter.QuinCe.data.Dataset;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -14,12 +14,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import junit.uk.ac.exeter.QuinCe.TestBase.BaseTest;
-import uk.ac.exeter.QuinCe.data.Dataset.DataSetDataDB;
-import uk.ac.exeter.QuinCe.data.Dataset.DatasetSensorValues;
-import uk.ac.exeter.QuinCe.data.Dataset.InvalidSensorValueException;
-import uk.ac.exeter.QuinCe.data.Dataset.SensorValue;
-import uk.ac.exeter.QuinCe.data.Dataset.SensorValuesList;
+import uk.ac.exeter.QuinCe.TestBase.BaseTest;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.Flag;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.RoutineFlag;
 import uk.ac.exeter.QuinCe.data.Dataset.QC.SensorValues.AutoQCResult;