Skip to content

Commit b31f7f6

Browse files
committed
Port of TestDecimalStyle to scalatest
1 parent 729487f commit b31f7f6

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

shared/src/test/scala/org/threeten/bp/format/TestDecimalStyle.scala

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,57 +31,56 @@
3131
*/
3232
package org.threeten.bp.format
3333

34-
import org.testng.annotations.Test
35-
import org.testng.Assert.assertEquals
36-
3734
import java.util.Locale
3835

36+
import org.scalatest.FunSuite
37+
import org.threeten.bp.AssertionsHelper
3938

4039
/** Test DecimalStyle. */
41-
@Test class TestDecimalStyle {
42-
@Test def test_getAvailableLocales(): Unit = {
40+
class TestDecimalStyle extends FunSuite with AssertionsHelper {
41+
test("getAvailableLocales") {
4342
val locales: java.util.Set[Locale] = DecimalStyle.getAvailableLocales
4443
assertEquals(locales.size > 0, true)
4544
assertEquals(locales.contains(Locale.US), true)
4645
}
4746

48-
@Test def test_of_Locale(): Unit = {
47+
test("of_Locale") {
4948
val loc1: DecimalStyle = DecimalStyle.of(Locale.CANADA)
5049
assertEquals(loc1.getZeroDigit, '0')
5150
assertEquals(loc1.getPositiveSign, '+')
5251
assertEquals(loc1.getNegativeSign, '-')
5352
assertEquals(loc1.getDecimalSeparator, '.')
5453
}
5554

56-
@Test def test_STANDARD(): Unit = {
55+
test("STANDARD") {
5756
val loc1: DecimalStyle = DecimalStyle.STANDARD
5857
assertEquals(loc1.getZeroDigit, '0')
5958
assertEquals(loc1.getPositiveSign, '+')
6059
assertEquals(loc1.getNegativeSign, '-')
6160
assertEquals(loc1.getDecimalSeparator, '.')
6261
}
6362

64-
@Test def test_zeroDigit(): Unit = {
63+
test("zeroDigit") {
6564
val base: DecimalStyle = DecimalStyle.STANDARD
6665
assertEquals(base.withZeroDigit('A').getZeroDigit, 'A')
6766
}
6867

69-
@Test def test_positiveSign(): Unit = {
68+
test("positiveSign") {
7069
val base: DecimalStyle = DecimalStyle.STANDARD
7170
assertEquals(base.withPositiveSign('A').getPositiveSign, 'A')
7271
}
7372

74-
@Test def test_negativeSign(): Unit = {
73+
test("negativeSign") {
7574
val base: DecimalStyle = DecimalStyle.STANDARD
7675
assertEquals(base.withNegativeSign('A').getNegativeSign, 'A')
7776
}
7877

79-
@Test def test_decimalSeparator(): Unit = {
78+
test("decimalSeparator") {
8079
val base: DecimalStyle = DecimalStyle.STANDARD
8180
assertEquals(base.withDecimalSeparator('A').getDecimalSeparator, 'A')
8281
}
8382

84-
@Test def test_convertToDigit_base(): Unit = {
83+
test("convertToDigit_base") {
8584
val base: DecimalStyle = DecimalStyle.STANDARD
8685
assertEquals(base.convertToDigit('0'), 0)
8786
assertEquals(base.convertToDigit('1'), 1)
@@ -90,7 +89,7 @@ import java.util.Locale
9089
assertEquals(base.convertToDigit('A'), -1)
9190
}
9291

93-
@Test def test_convertToDigit_altered(): Unit = {
92+
test("convertToDigit_altered") {
9493
val base: DecimalStyle = DecimalStyle.STANDARD.withZeroDigit('A')
9594
assertEquals(base.convertToDigit('A'), 0)
9695
assertEquals(base.convertToDigit('B'), 1)
@@ -99,51 +98,51 @@ import java.util.Locale
9998
assertEquals(base.convertToDigit('0'), -1)
10099
}
101100

102-
@Test def test_convertNumberToI18N_base(): Unit = {
101+
test("convertNumberToI18N_base") {
103102
val base: DecimalStyle = DecimalStyle.STANDARD
104103
assertEquals(base.convertNumberToI18N("134"), "134")
105104
}
106105

107-
@Test def test_convertNumberToI18N_altered(): Unit = {
106+
test("convertNumberToI18N_altered") {
108107
val base: DecimalStyle = DecimalStyle.STANDARD.withZeroDigit('A')
109108
assertEquals(base.convertNumberToI18N("134"), "BDE")
110109
}
111110

112-
@Test def test_equalsHashCode1(): Unit = {
111+
test("equalsHashCode1") {
113112
val a: DecimalStyle = DecimalStyle.STANDARD
114113
val b: DecimalStyle = DecimalStyle.STANDARD
115114
assertEquals(a == b, true)
116115
assertEquals(b == a, true)
117116
assertEquals(a.hashCode, b.hashCode)
118117
}
119118

120-
@Test def test_equalsHashCode2(): Unit = {
119+
test("equalsHashCode2") {
121120
val a: DecimalStyle = DecimalStyle.STANDARD.withZeroDigit('A')
122121
val b: DecimalStyle = DecimalStyle.STANDARD.withZeroDigit('A')
123122
assertEquals(a == b, true)
124123
assertEquals(b == a, true)
125124
assertEquals(a.hashCode, b.hashCode)
126125
}
127126

128-
@Test def test_equalsHashCode3(): Unit = {
127+
test("equalsHashCode3") {
129128
val a: DecimalStyle = DecimalStyle.STANDARD.withZeroDigit('A')
130129
val b: DecimalStyle = DecimalStyle.STANDARD.withDecimalSeparator('A')
131130
assertEquals(a == b, false)
132131
assertEquals(b == a, false)
133132
}
134133

135-
@Test def test_equalsHashCode_bad(): Unit = {
134+
test("equalsHashCode_bad") {
136135
val a: DecimalStyle = DecimalStyle.STANDARD
137-
assertEquals(a == "", false)
136+
assertNotEquals(a, "")
138137
assertEquals(a == null, false)
139138
}
140139

141-
@Test def test_toString_base(): Unit = {
140+
test("toString_base") {
142141
val base: DecimalStyle = DecimalStyle.STANDARD
143142
assertEquals(base.toString, "DecimalStyle[0+-.]")
144143
}
145144

146-
@Test def test_toString_altered(): Unit = {
145+
test("toString_altered") {
147146
val base: DecimalStyle = DecimalStyle.of(Locale.US).withZeroDigit('A').withDecimalSeparator('@')
148147
assertEquals(base.toString, "DecimalStyle[A+-@]")
149148
}

0 commit comments

Comments
 (0)