From 64ed24e082fa9f9b9efc8787b75344b4327fe5ec Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Sat, 23 Jun 2018 00:28:45 +0100 Subject: [PATCH] Small amount of tidying up code --- main/src/com/google/refine/util/StringUtils.java | 1 - .../util/ExpressionNominalValueGrouperTests.java | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/main/src/com/google/refine/util/StringUtils.java b/main/src/com/google/refine/util/StringUtils.java index 96b4255bd..9edac7f18 100644 --- a/main/src/com/google/refine/util/StringUtils.java +++ b/main/src/com/google/refine/util/StringUtils.java @@ -1,7 +1,6 @@ package com.google.refine.util; import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; public class StringUtils { /** diff --git a/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java b/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java index b9d1888e9..99c5a3715 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java +++ b/main/tests/server/src/com/google/refine/tests/browsing/util/ExpressionNominalValueGrouperTests.java @@ -53,7 +53,6 @@ import com.google.refine.model.ModelException; import com.google.refine.model.Project; import com.google.refine.model.Row; import com.google.refine.tests.RefineTest; -import com.google.refine.util.StringUtils; public class ExpressionNominalValueGrouperTests extends RefineTest { @@ -61,8 +60,6 @@ public class ExpressionNominalValueGrouperTests extends RefineTest { //Variables private static Project project; private static Properties bindings; - private static final String ENGINE_JSON_LISTFACET = "{\"facets\":[{\"type\":\"list\",\"name\":\"facet A\",\"columnName\":\"Column\",\"expression\":\"value\",\"omitBlank\":false,\"omitError\":false,\"selection\":[],\"selectBlank\":false,\"selectError\":false,\"invert\":false}],\"mode\":\"row-based\"}}"; - private static String projectid; private static OffsetDateTime dateTimeValue = OffsetDateTime.parse("2017-05-12T05:45:00+00:00", DateTimeFormatter.ISO_OFFSET_DATE_TIME); private static String dateTimeStringValue = "2017-05-12T05:45:00Z"; @@ -92,12 +89,12 @@ public class ExpressionNominalValueGrouperTests extends RefineTest { } @AfterMethod - public void TearDown() { + public void tearDown() { project = null; } @Test - public void ExpressionNominalValueGrouperStrings() throws Exception { + public void expressionNominalValueGrouperStrings() throws Exception { //populate project // Five rows of a's for (int i = 0; i < numberOfRows; i++) { @@ -126,7 +123,7 @@ public class ExpressionNominalValueGrouperTests extends RefineTest { } @Test - public void ExpressionNominalValueGrouperInts() throws Exception { + public void expressionNominalValueGrouperInts() throws Exception { //populate project for (int i = 0; i < numberOfRows; i++) { Row row = new Row(1); @@ -154,7 +151,7 @@ public class ExpressionNominalValueGrouperTests extends RefineTest { } @Test - public void ExpressionNominalValueGrouperDates() throws Exception { + public void expressionNominalValueGrouperDates() throws Exception { //populate project for (int i = 0; i < numberOfRows; i++) { Row row = new Row(1);