Skip to content

Commit 091846e

Browse files
committed
Fix unimplemented methods
1 parent 506a779 commit 091846e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232
package org.threeten.bp.format
3333

3434
import java.util.Locale
35+
import java.lang.StringBuilder
3536

3637
import org.scalatest.{BeforeAndAfterEach, FunSuite}
3738
import org.threeten.bp.LocalDateTime
3839
import org.threeten.bp.ZoneId
3940
import org.threeten.bp.ZonedDateTime
4041
import org.threeten.bp.DateTimeException
4142
import org.threeten.bp.chrono.IsoChronology
42-
import org.threeten.bp.temporal.{TemporalAccessor, TemporalField, TemporalQuery}
43+
import org.threeten.bp.temporal.{TemporalAccessor, TemporalField, TemporalQuery, ValueRange}
4344
import org.threeten.bp.format.internal.TTBPDateTimeParseContext
4445
import org.threeten.bp.format.internal.TTBPDateTimePrintContext
4546

@@ -48,25 +49,23 @@ object GenTestPrinterParser {
4849
private val EMPTY: TemporalAccessor = new TemporalAccessor() {
4950
def isSupported(field: TemporalField): Boolean = true
5051
def getLong(field: TemporalField): Long = throw new DateTimeException("Mock")
51-
override def get(field: TemporalField): Int = ???
52-
53-
override def query[R](query: TemporalQuery[R]) = query.queryFrom(this)
54-
55-
override def range(field: TemporalField) = ???
52+
override def get(field: TemporalField): Int = range(field).checkValidIntValue(getLong(field), field)
53+
override def query[R](query: TemporalQuery[R]): R = query.queryFrom(this)
54+
override def range(field: TemporalField): ValueRange = field.range
5655
}
5756
}
5857

5958
trait GenTestPrinterParser extends BeforeAndAfterEach { this: FunSuite =>
6059
protected var printEmptyContext: TTBPDateTimePrintContext = null
6160
protected var printContext: TTBPDateTimePrintContext = null
6261
protected var parseContext: TTBPDateTimeParseContext = null
63-
protected var buf: java.lang.StringBuilder = null
62+
protected var buf: StringBuilder = null
6463

6564
override def beforeEach() {
6665
printEmptyContext = new TTBPDateTimePrintContext(GenTestPrinterParser.EMPTY, Locale.ENGLISH, DecimalStyle.STANDARD)
6766
val zdt: ZonedDateTime = LocalDateTime.of(2011, 6, 30, 12, 30, 40, 0).atZone(ZoneId.of("Europe/Paris"))
6867
printContext = new TTBPDateTimePrintContext(zdt, Locale.ENGLISH, DecimalStyle.STANDARD)
6968
parseContext = new TTBPDateTimeParseContext(Locale.ENGLISH, DecimalStyle.STANDARD, IsoChronology.INSTANCE)
70-
buf = new java.lang.StringBuilder
69+
buf = new StringBuilder
7170
}
7271
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import org.threeten.bp.temporal.ChronoField.NANO_OF_SECOND
6060
import org.threeten.bp.temporal.ChronoField.OFFSET_SECONDS
6161
import org.threeten.bp.temporal.ChronoField.SECOND_OF_MINUTE
6262
import org.threeten.bp.temporal.ChronoField.YEAR
63+
import org.threeten.bp.temporal.ValueRange
6364

6465
/** Test DateTimeFormatters. */
6566
object TestDateTimeFormatters {
@@ -120,9 +121,9 @@ object TestDateTimeFormatters {
120121
else
121122
null.asInstanceOf[R]
122123

123-
override def get(field: TemporalField): scala.Int = ???
124+
override def get(field: TemporalField): scala.Int = range(field).checkValidIntValue(getLong(field), field)
124125

125-
override def range(field: TemporalField) = ???
126+
override def range(field: TemporalField): ValueRange = field.range
126127

127128
override def toString: String = fields + (if (zoneId != null) " " + zoneId else "")
128129
}
@@ -881,9 +882,9 @@ class TestDateTimeFormatters extends FunSuite with GenTestPrinterParser with Ass
881882

882883
override def query[R](query: TemporalQuery[R]): R = null.asInstanceOf[R]
883884

884-
override def get(field: TemporalField): scala.Int = ???
885+
override def get(field: TemporalField): Int = range(field).checkValidIntValue(getLong(field), field)
885886

886-
override def range(field: TemporalField) = ???
887+
override def range(field: TemporalField): ValueRange = field.range
887888
}
888889
assertEquals(DateTimeFormatter.ISO_ORDINAL_DATE.format(test), "2008-231")
889890
}

0 commit comments

Comments
 (0)