Skip to content

Commit 8d843ea

Browse files
cquirozcquiroz
committed
Code cleanups
1 parent 8247fdc commit 8d843ea

16 files changed

+34
-227
lines changed

‎jvm/src/test/scala/org/threeten/bp/ClassLoaderChecker.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ package org.threeten.bp
3434
import java.io.DataInputStream
3535
import java.io.FileInputStream
3636
import java.io.FileNotFoundException
37-
import java.util.ArrayList
3837
import java.util.Collections
3938
import java.util.GregorianCalendar
40-
import java.util.HashMap
41-
import java.util.TreeMap
4239
import java.util.concurrent.ConcurrentHashMap
4340
import java.util.concurrent.locks.ReentrantLock
4441
import java.util.regex.Pattern
@@ -105,4 +102,4 @@ object ClassLoaderChecker {
105102
ldt.atZone(ZoneId.of("Europe/Paris"))
106103
System.out.println("************************************************************")
107104
}
108-
}
105+
}

‎jvm/src/test/scala/org/threeten/bp/TestLocalDateTimeSerialization.scala

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,6 @@
3131
*/
3232
package org.threeten.bp
3333

34-
import org.threeten.bp.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_MONTH
35-
import org.threeten.bp.temporal.ChronoField.ALIGNED_DAY_OF_WEEK_IN_YEAR
36-
import org.threeten.bp.temporal.ChronoField.ALIGNED_WEEK_OF_MONTH
37-
import org.threeten.bp.temporal.ChronoField.ALIGNED_WEEK_OF_YEAR
38-
import org.threeten.bp.temporal.ChronoField.AMPM_OF_DAY
39-
import org.threeten.bp.temporal.ChronoField.CLOCK_HOUR_OF_AMPM
40-
import org.threeten.bp.temporal.ChronoField.CLOCK_HOUR_OF_DAY
41-
import org.threeten.bp.temporal.ChronoField.DAY_OF_MONTH
42-
import org.threeten.bp.temporal.ChronoField.DAY_OF_WEEK
43-
import org.threeten.bp.temporal.ChronoField.DAY_OF_YEAR
44-
import org.threeten.bp.temporal.ChronoField.EPOCH_DAY
45-
import org.threeten.bp.temporal.ChronoField.ERA
46-
import org.threeten.bp.temporal.ChronoField.HOUR_OF_AMPM
47-
import org.threeten.bp.temporal.ChronoField.HOUR_OF_DAY
48-
import org.threeten.bp.temporal.ChronoField.MICRO_OF_DAY
49-
import org.threeten.bp.temporal.ChronoField.MICRO_OF_SECOND
50-
import org.threeten.bp.temporal.ChronoField.MILLI_OF_DAY
51-
import org.threeten.bp.temporal.ChronoField.MILLI_OF_SECOND
52-
import org.threeten.bp.temporal.ChronoField.MINUTE_OF_DAY
53-
import org.threeten.bp.temporal.ChronoField.MINUTE_OF_HOUR
54-
import org.threeten.bp.temporal.ChronoField.MONTH_OF_YEAR
55-
import org.threeten.bp.temporal.ChronoField.NANO_OF_DAY
56-
import org.threeten.bp.temporal.ChronoField.NANO_OF_SECOND
57-
import org.threeten.bp.temporal.ChronoField.PROLEPTIC_MONTH
58-
import org.threeten.bp.temporal.ChronoField.SECOND_OF_DAY
59-
import org.threeten.bp.temporal.ChronoField.SECOND_OF_MINUTE
60-
import org.threeten.bp.temporal.ChronoField.YEAR
61-
import org.threeten.bp.temporal.ChronoField.YEAR_OF_ERA
62-
import org.threeten.bp.temporal.ChronoUnit.HALF_DAYS
63-
import org.threeten.bp.temporal.ChronoUnit.HOURS
64-
import org.threeten.bp.temporal.ChronoUnit.MICROS
65-
import org.threeten.bp.temporal.ChronoUnit.MILLIS
66-
import org.threeten.bp.temporal.ChronoUnit.MINUTES
67-
import org.threeten.bp.temporal.ChronoUnit.NANOS
68-
import org.threeten.bp.temporal.ChronoUnit.SECONDS
6934
import java.io.ByteArrayInputStream
7035
import java.io.ByteArrayOutputStream
7136
import java.io.ObjectInputStream
@@ -74,19 +39,6 @@ import java.lang.reflect.Field
7439
import java.lang.reflect.Modifier
7540

7641
import org.scalatest.{BeforeAndAfter, FunSuite}
77-
import org.threeten.bp.chrono.IsoChronology
78-
import org.threeten.bp.format.DateTimeFormatter
79-
import org.threeten.bp.format.DateTimeParseException
80-
import org.threeten.bp.temporal.ChronoField
81-
import org.threeten.bp.temporal.ChronoUnit
82-
import org.threeten.bp.temporal.JulianFields
83-
import org.threeten.bp.temporal.MockFieldNoValue
84-
import org.threeten.bp.temporal.Temporal
85-
import org.threeten.bp.temporal.TemporalAccessor
86-
import org.threeten.bp.temporal.TemporalAdjuster
87-
import org.threeten.bp.temporal.TemporalField
88-
import org.threeten.bp.temporal.TemporalQueries
89-
import org.threeten.bp.temporal.TemporalUnit
9042

9143
class TestLocalDateTimeSerialization extends FunSuite with AssertionsHelper with BeforeAndAfter {
9244
private val TEST_2007_07_15_12_30_40_987654321: LocalDateTime = LocalDateTime.of(2007, 7, 15, 12, 30, 40, 987654321)

‎jvm/src/test/scala/org/threeten/bp/TestLocalTimeSerialization.scala

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,14 @@
3131
*/
3232
package org.threeten.bp
3333

34-
import org.scalatest.{BeforeAndAfter, FunSuite}
35-
import org.threeten.bp.format.{DateTimeFormatter, DateTimeParseException}
36-
import org.threeten.bp.temporal.ChronoField._
37-
import org.threeten.bp.temporal.ChronoUnit._
38-
import org.threeten.bp.temporal._
39-
40-
import scala.collection.JavaConverters._
41-
42-
class TestLocalTimeSerialization extends FunSuite with AssertionsHelper with BeforeAndAfter with AbstractTest {
43-
private var TEST_12_30_40_987654321: LocalTime = null
44-
45-
before {
46-
TEST_12_30_40_987654321 = LocalTime.of(12, 30, 40, 987654321)
47-
}
34+
import org.scalatest.FunSuite
4835

36+
class TestLocalTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
4937
test("test_serialization_format") {
5038
assertEqualsSerialisedForm(LocalTime.of(22, 17, 59, 460 * 1000000))
5139
}
5240

5341
test("test_serialization") {
54-
assertSerializable(TEST_12_30_40_987654321)
42+
assertSerializable(LocalTime.of(12, 30, 40, 987654321))
5543
}
5644
}

‎jvm/src/test/scala/org/threeten/bp/TestOffsetDateTimeSerialization.scala

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,11 @@ package org.threeten.bp
3333

3434
import java.lang.reflect.{Constructor, InvocationTargetException}
3535

36-
import org.scalatest.{BeforeAndAfter, FunSuite}
37-
38-
class TestOffsetDateTimeSerialization extends FunSuite with AssertionsHelper with BeforeAndAfter with AbstractTest {
39-
private var TEST_2008_6_30_11_30_59_000000500: OffsetDateTime = null
40-
41-
before {
42-
TEST_2008_6_30_11_30_59_000000500 = OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 500), TestOffsetDateTime.OFFSET_PONE)
43-
}
36+
import org.scalatest.FunSuite
4437

38+
class TestOffsetDateTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
4539
test("test_serialization") {
46-
assertSerializable(TEST_2008_6_30_11_30_59_000000500)
40+
assertSerializable(OffsetDateTime.of(LocalDate.of(2008, 6, 30), LocalTime.of(11, 30, 59, 500), TestOffsetDateTime.OFFSET_PONE))
4741
assertSerializable(OffsetDateTime.MIN)
4842
assertSerializable(OffsetDateTime.MAX)
4943
}

‎jvm/src/test/scala/org/threeten/bp/TestOffsetTimeSerialization.scala

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,11 @@ package org.threeten.bp
3333

3434
import java.lang.reflect.{Constructor, InvocationTargetException}
3535

36-
import org.scalatest.{BeforeAndAfter, FunSuite}
37-
import org.threeten.bp.format.{DateTimeFormatter, DateTimeParseException}
38-
import org.threeten.bp.temporal.ChronoField._
39-
import org.threeten.bp.temporal.ChronoUnit.{DAYS, NANOS, SECONDS}
40-
import org.threeten.bp.temporal._
41-
42-
class TestOffsetTimeSerialization extends FunSuite with AssertionsHelper with BeforeAndAfter with AbstractTest {
43-
private var TEST_11_30_59_500_PONE: OffsetTime = null
44-
45-
before {
46-
TEST_11_30_59_500_PONE = OffsetTime.of(LocalTime.of(11, 30, 59, 500), TestOffsetTime.OFFSET_PONE)
47-
}
36+
import org.scalatest.FunSuite
4837

38+
class TestOffsetTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
4939
test("test_serialization") {
50-
assertSerializable(TEST_11_30_59_500_PONE)
40+
assertSerializable(OffsetTime.of(LocalTime.of(11, 30, 59, 500), TestOffsetTime.OFFSET_PONE))
5141
assertSerializable(OffsetTime.MIN)
5242
assertSerializable(OffsetTime.MAX)
5343
}

‎jvm/src/test/scala/org/threeten/bp/TestZoneIdSerialization.scala

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,10 @@
3232
package org.threeten.bp
3333

3434
import java.lang.reflect.{Field, Modifier}
35-
import java.util.{Locale, SimpleTimeZone, TimeZone}
3635

3736
import org.scalatest.FunSuite
38-
import org.threeten.bp.format.TextStyle
39-
import org.threeten.bp.temporal.TemporalAccessor
40-
import org.threeten.bp.zone.{ZoneOffsetTransition, ZoneRules, ZoneRulesException}
4137

4238
/** Test ZoneId. */
43-
object TestZoneIdSerialization {
44-
private val ZONE_PARIS: ZoneId = ZoneId.of("Europe/Paris")
45-
val LATEST_TZDB: String = "2010i"
46-
private val OVERLAP: Int = 2
47-
private val GAP: Int = 0
48-
}
49-
5039
class TestZoneIdSerialization extends FunSuite with AssertionsHelper with AbstractTest {
5140
test("immutable") {
5241
val cls: Class[ZoneId] = classOf[ZoneId]

‎jvm/src/test/scala/org/threeten/bp/TestZonedDateTimeSerialization.scala

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,11 @@
3131
*/
3232
package org.threeten.bp
3333

34-
import org.scalatest.{BeforeAndAfter, FunSuite}
35-
import org.threeten.bp.Month.JANUARY
36-
import org.threeten.bp.chrono.IsoChronology
37-
import org.threeten.bp.format.{DateTimeFormatter, DateTimeParseException}
38-
import org.threeten.bp.temporal.ChronoField._
39-
import org.threeten.bp.temporal.ChronoUnit.{HOURS, MINUTES, NANOS, SECONDS}
40-
import org.threeten.bp.temporal._
41-
42-
class TestZonedDateTimeSerialization extends FunSuite with AssertionsHelper with BeforeAndAfter with AbstractTest {
43-
private var TEST_PARIS_GAP_2008_03_30_02_30: LocalDateTime = null
44-
private var TEST_PARIS_OVERLAP_2008_10_26_02_30: LocalDateTime = null
45-
private var TEST_LOCAL_2008_06_30_11_30_59_500: LocalDateTime = null
46-
private var TEST_DATE_TIME: ZonedDateTime = null
47-
private var TEST_DATE_TIME_PARIS: ZonedDateTime = null
48-
49-
before {
50-
TEST_LOCAL_2008_06_30_11_30_59_500 = LocalDateTime.of(2008, 6, 30, 11, 30, 59, 500)
51-
TEST_DATE_TIME = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, TestZonedDateTime.ZONE_0100)
52-
TEST_DATE_TIME_PARIS = ZonedDateTime.of(TEST_LOCAL_2008_06_30_11_30_59_500, TestZonedDateTime.ZONE_PARIS)
53-
TEST_PARIS_OVERLAP_2008_10_26_02_30 = LocalDateTime.of(2008, 10, 26, 2, 30)
54-
TEST_PARIS_GAP_2008_03_30_02_30 = LocalDateTime.of(2008, 3, 30, 2, 30)
55-
}
34+
import org.scalatest.FunSuite
5635

36+
class TestZonedDateTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
5737
test("test_serialization") {
58-
assertSerializable(TEST_DATE_TIME)
38+
assertSerializable(ZonedDateTime.of(LocalDateTime.of(2008, 6, 30, 11, 30, 59, 500), TestZonedDateTime.ZONE_0100))
5939
}
6040

6141
test("test_serialization_format") {

‎jvm/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDateSerialization.scala

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,18 @@ import java.io.ByteArrayInputStream
3737
import java.io.ByteArrayOutputStream
3838
import java.io.ObjectInputStream
3939
import java.io.ObjectOutputStream
40-
import java.util.Locale
4140
import org.threeten.bp.AssertionsHelper
4241
import org.threeten.bp.AbstractTest
43-
import org.threeten.bp.Duration
4442
import org.threeten.bp.LocalDate
45-
import org.threeten.bp.format.ResolverStyle
46-
import org.threeten.bp.temporal.ChronoUnit
47-
import org.threeten.bp.temporal.Temporal
48-
import org.threeten.bp.temporal.TemporalAccessor
49-
import org.threeten.bp.temporal.TemporalAdjuster
50-
import org.threeten.bp.temporal.TemporalAmount
51-
import org.threeten.bp.temporal.TemporalField
52-
import org.threeten.bp.temporal.TemporalUnit
53-
import org.threeten.bp.temporal.ValueRange
5443

5544
class TestChronoLocalDateSerialization extends FunSuite with AssertionsHelper with AbstractTest {
5645
val data_of_calendars: List[Chronology] = {
5746
List[Chronology](
58-
(HijrahChronology.INSTANCE),
59-
(IsoChronology.INSTANCE),
60-
(JapaneseChronology.INSTANCE),
61-
(MinguoChronology.INSTANCE),
62-
(ThaiBuddhistChronology.INSTANCE))
47+
HijrahChronology.INSTANCE,
48+
IsoChronology.INSTANCE,
49+
JapaneseChronology.INSTANCE,
50+
MinguoChronology.INSTANCE,
51+
ThaiBuddhistChronology.INSTANCE)
6352
}
6453

6554
test("test_ChronoSerialization") {

‎jvm/src/test/scala/org/threeten/bp/chrono/TestChronoLocalDateTimeSerialization.scala

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,19 @@ import java.io.ByteArrayInputStream
3737
import java.io.ByteArrayOutputStream
3838
import java.io.ObjectInputStream
3939
import java.io.ObjectOutputStream
40-
import java.util.Locale
4140
import org.threeten.bp.AssertionsHelper
4241
import org.threeten.bp.AbstractTest
43-
import org.threeten.bp.Duration
4442
import org.threeten.bp.LocalDate
4543
import org.threeten.bp.LocalDateTime
46-
import org.threeten.bp.LocalTime
47-
import org.threeten.bp.format.ResolverStyle
48-
import org.threeten.bp.temporal.ChronoUnit
49-
import org.threeten.bp.temporal.Temporal
50-
import org.threeten.bp.temporal.TemporalAccessor
51-
import org.threeten.bp.temporal.TemporalAdjuster
52-
import org.threeten.bp.temporal.TemporalAmount
53-
import org.threeten.bp.temporal.TemporalField
54-
import org.threeten.bp.temporal.TemporalUnit
55-
import org.threeten.bp.temporal.ValueRange
5644

5745
class TestChronoLocalDateTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
5846
val data_of_calendars: List[Chronology] = {
5947
List(
60-
(HijrahChronology.INSTANCE),
61-
(IsoChronology.INSTANCE),
62-
(JapaneseChronology.INSTANCE),
63-
(MinguoChronology.INSTANCE),
64-
(ThaiBuddhistChronology.INSTANCE))
48+
HijrahChronology.INSTANCE,
49+
IsoChronology.INSTANCE,
50+
JapaneseChronology.INSTANCE,
51+
MinguoChronology.INSTANCE,
52+
ThaiBuddhistChronology.INSTANCE)
6553
}
6654

6755
test("test_ChronoLocalDateTimeSerialization") {

‎jvm/src/test/scala/org/threeten/bp/chrono/TestChronoZonedDateTimeSerialization.scala

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,20 @@ import java.io.ByteArrayInputStream
3737
import java.io.ByteArrayOutputStream
3838
import java.io.ObjectInputStream
3939
import java.io.ObjectOutputStream
40-
import java.util.Locale
4140
import org.threeten.bp.AssertionsHelper
4241
import org.threeten.bp.AbstractTest
43-
import org.threeten.bp.Duration
4442
import org.threeten.bp.LocalDate
45-
import org.threeten.bp.LocalTime
4643
import org.threeten.bp.ZoneId
47-
import org.threeten.bp.ZoneOffset
4844
import org.threeten.bp.ZonedDateTime
49-
import org.threeten.bp.format.ResolverStyle
50-
import org.threeten.bp.temporal.ChronoUnit
51-
import org.threeten.bp.temporal.Temporal
52-
import org.threeten.bp.temporal.TemporalAccessor
53-
import org.threeten.bp.temporal.TemporalAdjuster
54-
import org.threeten.bp.temporal.TemporalAmount
55-
import org.threeten.bp.temporal.TemporalField
56-
import org.threeten.bp.temporal.TemporalUnit
57-
import org.threeten.bp.temporal.ValueRange
5845

5946
class TestChronoZonedDateTimeSerialization extends FunSuite with AssertionsHelper with AbstractTest {
6047
val data_of_calendars: List[Chronology] = {
6148
List(
62-
(HijrahChronology.INSTANCE),
63-
(IsoChronology.INSTANCE),
64-
(JapaneseChronology.INSTANCE),
65-
(MinguoChronology.INSTANCE),
66-
(ThaiBuddhistChronology.INSTANCE))
49+
HijrahChronology.INSTANCE,
50+
IsoChronology.INSTANCE,
51+
JapaneseChronology.INSTANCE,
52+
MinguoChronology.INSTANCE,
53+
ThaiBuddhistChronology.INSTANCE)
6754
}
6855

6956
test("test_ChronoZonedDateTimeSerialization") {

‎jvm/src/test/scala/org/threeten/bp/chrono/TestChronologySerialization.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class TestChronologySerialization extends FunSuite with BeforeAndAfterEach with
5252

5353
test("test_chronoSerializationSingleton") {
5454
data_CalendarType.foreach {
55-
case (chrono, calendarType) =>
55+
case (chrono, _) =>
5656
val orginal: Chronology = chrono
5757
val baos: ByteArrayOutputStream = new ByteArrayOutputStream
5858
val out: ObjectOutputStream = new ObjectOutputStream(baos)

‎jvm/src/test/scala/org/threeten/bp/temporal/TestMonthDaySerialization.scala

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,13 @@
3232
package org.threeten.bp.temporal
3333

3434
import org.scalatest.FunSuite
35-
import org.scalatest.BeforeAndAfter
36-
import org.threeten.bp.temporal.ChronoField.DAY_OF_MONTH
37-
import org.threeten.bp.temporal.ChronoField.MONTH_OF_YEAR
38-
import java.io.IOException
39-
import java.util.Arrays
4035

4136
import org.threeten.bp._
42-
import org.threeten.bp.chrono.IsoChronology
43-
import org.threeten.bp.format.DateTimeFormatter
44-
import org.threeten.bp.format.DateTimeParseException
4537

4638
/** Test MonthDay. */
47-
class TestMonthDaySerialization extends FunSuite with BeforeAndAfter with AbstractTest {
48-
private var TEST_07_15: MonthDay = null
49-
50-
before {
51-
TEST_07_15 = MonthDay.of(7, 15)
52-
}
53-
39+
class TestMonthDaySerialization extends FunSuite with AbstractTest {
5440
test("test_serialization") {
55-
assertSerializable(TEST_07_15)
41+
assertSerializable(MonthDay.of(7, 15))
5642
}
5743

5844
test("test_serialization_format") {

‎jvm/src/test/scala/org/threeten/bp/temporal/TestYearMonthSerialization.scala

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,12 @@
3232
package org.threeten.bp.temporal
3333

3434
import org.scalatest.FunSuite
35-
import org.threeten.bp.temporal.ChronoField.ERA
36-
import org.threeten.bp.temporal.ChronoField.MONTH_OF_YEAR
37-
import org.threeten.bp.temporal.ChronoField.PROLEPTIC_MONTH
38-
import org.threeten.bp.temporal.ChronoField.YEAR
39-
import org.threeten.bp.temporal.ChronoField.YEAR_OF_ERA
40-
import java.io.IOException
41-
import java.util.Arrays
4235
import org.threeten.bp._
43-
import org.threeten.bp.chrono.IsoChronology
44-
import org.threeten.bp.format.DateTimeFormatter
45-
import org.threeten.bp.format.DateTimeParseException
4636

4737
/** Test YearMonth. */
4838
class TestYearMonthSerialization extends FunSuite with AbstractTest {
49-
private var TEST_2008_06: YearMonth = null
50-
5139
test("test_serialization") {
52-
assertSerializable(TEST_2008_06)
40+
assertSerializable(YearMonth.of(2008, 8))
5341
}
5442

5543
test("test_serialization_format") {

0 commit comments

Comments
 (0)