Skip to content

Commit 4ddc721

Browse files
committed
AP-23571: Fix tests to reflect data type renamings
AP-23571 (Data types to have user-friendly names (e.g. \)
1 parent 7b9a474 commit 4ddc721

11 files changed

+13
-33
lines changed

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLBitVectorToBitTensorConverterFactoryTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import org.junit.Test;
99
import org.knime.core.data.vector.bitvector.BitVectorValue;
1010
import org.knime.core.data.vector.bitvector.DenseBitVector;
11+
import org.knime.core.data.vector.bitvector.DenseBitVectorCell;
1112
import org.knime.core.data.vector.bitvector.DenseBitVectorCellFactory;
1213
import org.knime.dl.core.DLTensor;
1314
import org.knime.dl.core.data.DLReadableBitBuffer;
1415
import org.knime.dl.core.data.DLWritableBitBuffer;
15-
import org.knime.dl.core.data.convert.DLBitVectorToBitTensorConverterFactory;
16-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
1716

1817
/**
1918
* @author Benjamin Wilhelm, KNIME GmbH, Konstanz, Germany
@@ -45,7 +44,7 @@ public void testConvert() {
4544
@Test
4645
public void testGetName() {
4746
final DLBitVectorToBitTensorConverterFactory factory = new DLBitVectorToBitTensorConverterFactory();
48-
assertEquals("Bit vector", factory.getName());
47+
assertEquals(DenseBitVectorCell.TYPE.toPrettyString(), factory.getName());
4948
}
5049

5150
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLByteVectorToByteTensorConverterFactoryTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
import org.junit.Test;
99
import org.knime.core.data.vector.bytevector.ByteVectorValue;
1010
import org.knime.core.data.vector.bytevector.DenseByteVector;
11+
import org.knime.core.data.vector.bytevector.DenseByteVectorCell;
1112
import org.knime.core.data.vector.bytevector.DenseByteVectorCellFactory;
1213
import org.knime.dl.core.DLTensor;
1314
import org.knime.dl.core.data.DLReadableUnsignedByteBuffer;
1415
import org.knime.dl.core.data.DLWritableUnsignedByteBuffer;
15-
import org.knime.dl.core.data.convert.DLByteVectorToByteTensorConverterFactory;
16-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
1716

1817
import com.google.common.primitives.UnsignedBytes;
1918

@@ -49,7 +48,7 @@ public void testConvert() {
4948
@Test
5049
public void testGetName() {
5150
final DLByteVectorToByteTensorConverterFactory factory = new DLByteVectorToByteTensorConverterFactory();
52-
assertEquals("Byte vector", factory.getName());
51+
assertEquals(DenseByteVectorCell.TYPE.toPrettyString(), factory.getName());
5352
}
5453

5554
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLDoubleTensorToDoubleCellConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.knime.dl.core.DLTensor;
1616
import org.knime.dl.core.data.DLReadableDoubleBuffer;
1717
import org.knime.dl.core.data.DLWritableDoubleBuffer;
18-
import org.knime.dl.core.data.convert.DLDoubleTensorToDoubleCellConverterFactory;
19-
import org.knime.dl.core.data.convert.DLTensorToDataCellConverter;
2018

2119
/**
2220
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -59,7 +57,7 @@ public void testGetDestCount() {
5957
@Test
6058
public void testGetName() {
6159
final DLDoubleTensorToDoubleCellConverterFactory factory = new DLDoubleTensorToDoubleCellConverterFactory();
62-
assertEquals("Number (double)", factory.getName());
60+
assertEquals(DoubleCell.TYPE.toPrettyString(), factory.getName());
6361
}
6462

6563
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLDoubleValueToDoubleTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import org.knime.dl.core.DLTensor;
1717
import org.knime.dl.core.data.DLReadableDoubleBuffer;
1818
import org.knime.dl.core.data.DLWritableDoubleBuffer;
19-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
20-
import org.knime.dl.core.data.convert.DLDoubleValueToDoubleTensorConverterFactory;
2119
import org.knime.dl.testing.DLTestUtil;
2220

2321
/**
@@ -67,7 +65,7 @@ public void testGetDestCount() {
6765
@Test
6866
public void testGetName() {
6967
final DLDoubleValueToDoubleTensorConverterFactory factory = new DLDoubleValueToDoubleTensorConverterFactory();
70-
assertEquals("Number (double)", factory.getName());
68+
assertEquals(DoubleCell.TYPE.toPrettyString(), factory.getName());
7169
}
7270

7371
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLDoubleValueToFloatTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.knime.dl.core.DLTensor;
1818
import org.knime.dl.core.data.DLReadableFloatBuffer;
1919
import org.knime.dl.core.data.DLWritableFloatBuffer;
20-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
21-
import org.knime.dl.core.data.convert.DLDoubleValueToFloatTensorConverterFactory;
2220

2321
/**
2422
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -65,7 +63,7 @@ public void testGetDestCount() {
6563
@Test
6664
public void testGetName() {
6765
final DLDoubleValueToFloatTensorConverterFactory factory = new DLDoubleValueToFloatTensorConverterFactory();
68-
assertEquals("Number (double)", factory.getName());
66+
assertEquals(DoubleCell.TYPE.toPrettyString(), factory.getName());
6967
}
7068

7169
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLIntTensorToIntCellConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.knime.dl.core.DLTensor;
1515
import org.knime.dl.core.data.DLReadableIntBuffer;
1616
import org.knime.dl.core.data.DLWritableIntBuffer;
17-
import org.knime.dl.core.data.convert.DLIntTensorToIntCellConverterFactory;
18-
import org.knime.dl.core.data.convert.DLTensorToDataCellConverter;
1917

2018
/**
2119
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -61,7 +59,7 @@ public void testGetDestCount() {
6159
@Test
6260
public void testGetName() {
6361
final DLIntTensorToIntCellConverterFactory factory = new DLIntTensorToIntCellConverterFactory();
64-
assertEquals("Number (integer)", factory.getName());
62+
assertEquals(IntCell.TYPE.toPrettyString(), factory.getName());
6563
}
6664

6765
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLIntValueToFloatTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.knime.dl.core.DLTensor;
1818
import org.knime.dl.core.data.DLReadableFloatBuffer;
1919
import org.knime.dl.core.data.DLWritableFloatBuffer;
20-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
21-
import org.knime.dl.core.data.convert.DLIntValueToFloatTensorConverterFactory;
2220

2321
/**
2422
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -66,7 +64,7 @@ public void testGetDestCount() {
6664
@Test
6765
public void testGetName() {
6866
final DLIntValueToFloatTensorConverterFactory factory = new DLIntValueToFloatTensorConverterFactory();
69-
assertEquals("Number (integer)", factory.getName());
67+
assertEquals(IntCell.TYPE.toPrettyString(), factory.getName());
7068
}
7169

7270
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLIntValueToIntTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import org.knime.dl.core.DLTensor;
1717
import org.knime.dl.core.data.DLReadableIntBuffer;
1818
import org.knime.dl.core.data.DLWritableIntBuffer;
19-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
20-
import org.knime.dl.core.data.convert.DLIntValueToIntTensorConverterFactory;
2119

2220
/**
2321
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -68,7 +66,7 @@ public void testGetDestCount() {
6866
@Test
6967
public void testGetName() {
7068
final DLIntValueToIntTensorConverterFactory factory = new DLIntValueToIntTensorConverterFactory();
71-
assertEquals("Number (integer)", factory.getName());
69+
assertEquals(IntCell.TYPE.toPrettyString(), factory.getName());
7270
}
7371

7472
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLLongTensorToLongCellConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import org.knime.dl.core.DLTensor;
1515
import org.knime.dl.core.data.DLReadableLongBuffer;
1616
import org.knime.dl.core.data.DLWritableLongBuffer;
17-
import org.knime.dl.core.data.convert.DLLongTensorToLongCellConverterFactory;
18-
import org.knime.dl.core.data.convert.DLTensorToDataCellConverter;
1917

2018
/**
2119
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -61,7 +59,7 @@ public void testGetDestCount() {
6159
@Test
6260
public void testGetName() {
6361
final DLLongTensorToLongCellConverterFactory factory = new DLLongTensorToLongCellConverterFactory();
64-
assertEquals("Number (long)", factory.getName());
62+
assertEquals(LongCell.TYPE.toPrettyString(), factory.getName());
6563
}
6664

6765
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLLongValueToDoubleTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.knime.dl.core.DLTensor;
1818
import org.knime.dl.core.data.DLReadableDoubleBuffer;
1919
import org.knime.dl.core.data.DLWritableDoubleBuffer;
20-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
21-
import org.knime.dl.core.data.convert.DLLongValueToDoubleTensorConverterFactory;
2220

2321
/**
2422
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -68,7 +66,7 @@ public void testGetDestCount() {
6866
@Test
6967
public void testGetName() {
7068
final DLLongValueToDoubleTensorConverterFactory factory = new DLLongValueToDoubleTensorConverterFactory();
71-
assertEquals("Number (long)", factory.getName());
69+
assertEquals(LongCell.TYPE.toPrettyString(), factory.getName());
7270
}
7371

7472
@Test

org.knime.dl.core.tests/src/org/knime/dl/core/data/convert/DLLongValueToLongTensorConverterFactoryTest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
import org.knime.dl.core.DLTensor;
1717
import org.knime.dl.core.data.DLReadableLongBuffer;
1818
import org.knime.dl.core.data.DLWritableLongBuffer;
19-
import org.knime.dl.core.data.convert.DLDataValueToTensorConverter;
20-
import org.knime.dl.core.data.convert.DLLongValueToLongTensorConverterFactory;
2119

2220
/**
2321
* @author Lukas Siedentop, KNIME GmbH, Konstanz, Germany
@@ -67,7 +65,7 @@ public void testGetDestCount() {
6765
@Test
6866
public void testGetName() {
6967
final DLLongValueToLongTensorConverterFactory factory = new DLLongValueToLongTensorConverterFactory();
70-
assertEquals("Number (long)", factory.getName());
68+
assertEquals(LongCell.TYPE.toPrettyString(), factory.getName());
7169
}
7270

7371
@Test

0 commit comments

Comments
 (0)