Repository: camel Updated Branches: refs/heads/camel-2.12.x 90fac6609 -> 83e80c5ed refs/heads/master 8653f41a1 -> 932f4098f
Removed test that cause CI servers to fail Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd40f683 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd40f683 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd40f683 Branch: refs/heads/master Commit: cd40f68370b32caeb3f258739eac9b3ec16dbfa8 Parents: 8653f41 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Mar 11 08:56:04 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Mar 11 08:56:04 2014 +0100 ---------------------------------------------------------------------- components/camel-csv/pom.xml | 6 - .../camel/dataformat/csv/CsvIteratorTest.java | 111 ------------------- 2 files changed, 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cd40f683/components/camel-csv/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml index 2904163..c55bfde 100644 --- a/components/camel-csv/pom.xml +++ b/components/camel-csv/pom.xml @@ -57,12 +57,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.googlecode.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>${jmockit-version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/cd40f683/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java deleted file mode 100644 index fedc5a3..0000000 --- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvIteratorTest.java +++ /dev/null @@ -1,111 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.dataformat.csv; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Arrays; -import java.util.List; -import java.util.NoSuchElementException; - -import mockit.Expectations; -import mockit.Injectable; -import org.apache.commons.csv.CSVParser; -import org.junit.Assert; -import org.junit.Test; - -public class CsvIteratorTest { - - public static final String HDD_CRASH = "HDD crash"; - - @Test - public void closeIfError(@Injectable final InputStreamReader reader, @Injectable final CSVParser parser) throws IOException { - new Expectations() { - { - parser.getLine(); - result = new String[]{"1"}; - - parser.getLine(); - result = new String[]{"2"}; - - parser.getLine(); - result = new IOException(HDD_CRASH); - - // The reader will be closed when there is nothing left - reader.close(); - } - }; - - @SuppressWarnings("resource") - CsvIterator<List<String>> iterator = new CsvIterator<List<String>>(parser, reader, CsvLineConverters.getListConverter()); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(Arrays.asList("1"), iterator.next()); - Assert.assertTrue(iterator.hasNext()); - - try { - iterator.next(); - Assert.fail("exception expected"); - } catch (IllegalStateException e) { - Assert.assertEquals(HDD_CRASH, e.getCause().getMessage()); - } - - Assert.assertFalse(iterator.hasNext()); - - try { - iterator.next(); - Assert.fail("exception expected"); - } catch (NoSuchElementException e) { - // okay - } - } - - @Test - public void normalCycle(@Injectable final InputStreamReader reader, @Injectable final CSVParser parser) throws IOException { - new Expectations() { - { - parser.getLine(); - result = new String[]{"1"}; - - parser.getLine(); - result = new String[]{"2"}; - - parser.getLine(); - result = null; - - // The reader will be closed when there is nothing left - reader.close(); - } - }; - - @SuppressWarnings("resource") - CsvIterator<List<String>> iterator = new CsvIterator<List<String>>(parser, reader, CsvLineConverters.getListConverter()); - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(Arrays.asList("1"), iterator.next()); - - Assert.assertTrue(iterator.hasNext()); - Assert.assertEquals(Arrays.asList("2"), iterator.next()); - - Assert.assertFalse(iterator.hasNext()); - - try { - iterator.next(); - Assert.fail("exception expected"); - } catch (NoSuchElementException e) { - // okay - } - } -}
