From fe7bf1d1f0c0252a10d9311475d817ef24d3b421 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Fri, 21 Oct 2011 16:57:52 +0000 Subject: [PATCH] Refactor to conform to method naming conventions git-svn-id: http://google-refine.googlecode.com/svn/trunk@2344 7d457c2a-affb-35e4-300a-418c747d4874 --- .../refine/tests/importers/ExcelImporterTests.java | 8 ++++---- .../refine/tests/importers/FixedWidthImporterTests.java | 8 ++++---- .../com/google/refine/tests/importers/ImporterTest.java | 4 ++-- .../google/refine/tests/importers/JsonImporterTests.java | 8 ++++---- .../refine/tests/importers/RdfTripleImporterTests.java | 4 ++-- .../refine/tests/importers/TsvCsvImporterTests.java | 8 ++++---- .../google/refine/tests/importers/XmlImporterTests.java | 9 +++++---- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java index 160aacf7d..e535925fa 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/ExcelImporterTests.java @@ -86,16 +86,16 @@ public class ExcelImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp(){ - super.SetUp(); + public void setUp(){ + super.setUp(); SUT = new ExcelImporter(); } @Override @AfterMethod - public void TearDown(){ + public void tearDown(){ SUT = null; - super.TearDown(); + super.tearDown(); } //---------------------read tests------------------------ diff --git a/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java index b030665dd..85d5b43ac 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/FixedWidthImporterTests.java @@ -33,16 +33,16 @@ public class FixedWidthImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp(){ - super.SetUp(); + public void setUp(){ + super.setUp(); SUT = new FixedWidthImporter(); } @Override @AfterMethod - public void TearDown(){ + public void tearDown(){ SUT = null; - super.TearDown(); + super.tearDown(); } //---------------------read tests------------------------ diff --git a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java b/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java index e0a6698fa..6c877f048 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java +++ b/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java @@ -31,7 +31,7 @@ abstract class ImporterTest extends RefineTest { protected JSONObject options; - public void SetUp(){ + public void setUp(){ //FIXME - should we try and use mock(Project.class); - seems unnecessary complexity servlet = new RefineServletStub(); @@ -43,7 +43,7 @@ abstract class ImporterTest extends RefineTest { options = Mockito.mock(JSONObject.class); } - public void TearDown(){ + public void tearDown(){ project = null; metadata = null; diff --git a/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java index 6cff9f14e..ae970f355 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/JsonImporterTests.java @@ -72,14 +72,14 @@ public class JsonImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp(){ - super.SetUp(); + public void setUp(){ + super.setUp(); SUT = new JsonImporter(); } @Override @AfterMethod - public void TearDown() { + public void tearDown() { SUT = null; if (inputStream != null) { try { @@ -89,7 +89,7 @@ public class JsonImporterTests extends ImporterTest { } inputStream = null; } - super.TearDown(); + super.tearDown(); } @Test diff --git a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java index 2346dc92c..154abcd66 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java @@ -58,8 +58,8 @@ public class RdfTripleImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp(){ - super.SetUp(); + public void setUp(){ + super.setUp(); SUT = new RdfTripleImporter(); JSONUtilities.safePut(options, "base-url", "http://rdf.freebase.com"); } diff --git a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java index 79c36357b..b93345fe9 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java @@ -65,16 +65,16 @@ public class TsvCsvImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp() { - super.SetUp(); + public void setUp() { + super.setUp(); SUT = new SeparatorBasedImporter(); } @Override @AfterMethod - public void TearDown(){ + public void tearDown(){ SUT = null; - super.TearDown(); + super.tearDown(); } @Test(dataProvider = "CSV-TSV-AutoDetermine") diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java index 37c0728da..6ca5f195d 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java @@ -71,14 +71,14 @@ public class XmlImporterTests extends ImporterTest { @Override @BeforeMethod - public void SetUp(){ - super.SetUp(); + public void setUp(){ + super.setUp(); SUT = new XmlImporter(); } @Override @AfterMethod - public void TearDown() { + public void tearDown() { SUT = null; if (inputStream != null) { try { @@ -88,7 +88,7 @@ public class XmlImporterTests extends ImporterTest { } inputStream = null; } - super.TearDown(); + super.tearDown(); } @Test @@ -351,6 +351,7 @@ public class XmlImporterTests extends ImporterTest { } } + @Override protected void parseOneFile(TreeImportingParserBase parser, InputStream inputStream, JSONObject options) { parseOneInputStream(parser, inputStream, options); }