Skip to content

Commit 8609087

Browse files
committed
SpreadsheetMetadataTestCase2 refactoring
1 parent 5a446ea commit 8609087

7 files changed

+12
-37
lines changed

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataColorFunctionTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,7 @@ public JavaVisibility typeVisibility() {
7575
return JavaVisibility.PACKAGE_PRIVATE;
7676
}
7777

78-
// TypeNameTesting...................................................................................................
79-
80-
@Override
81-
public String typeNamePrefix() {
82-
return SpreadsheetMetadata.class.getSimpleName();
83-
}
78+
// TypeNameTesting..................................................................................................
8479

8580
@Override
8681
public String typeNameSuffix() {

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataNameToColorSpreadsheetMetadataVisitorTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,4 @@ public Class<SpreadsheetMetadataNameToColorSpreadsheetMetadataVisitor> type() {
7777
public JavaVisibility typeVisibility() {
7878
return JavaVisibility.PACKAGE_PRIVATE;
7979
}
80-
81-
// TypeNameTesting...................................................................................................
82-
83-
@Override
84-
public String typeNamePrefix() {
85-
return SpreadsheetMetadata.class.getSimpleName();
86-
}
8780
}

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataNumberToColorNameSpreadsheetMetadataVisitorTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,4 @@ public Class<SpreadsheetMetadataNumberToColorNameSpreadsheetMetadataVisitor> typ
7676
public JavaVisibility typeVisibility() {
7777
return JavaVisibility.PACKAGE_PRIVATE;
7878
}
79-
80-
// TypeNameTesting...................................................................................................
81-
82-
@Override
83-
public String typeNamePrefix() {
84-
return SpreadsheetMetadata.class.getSimpleName();
85-
}
8679
}

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataNumberToColorSpreadsheetMetadataVisitorTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,4 @@ public Class<SpreadsheetMetadataNumberToColorSpreadsheetMetadataVisitor> type()
7171
public JavaVisibility typeVisibility() {
7272
return JavaVisibility.PACKAGE_PRIVATE;
7373
}
74-
75-
// TypeNameTesting...................................................................................................
76-
77-
@Override
78-
public String typeNamePrefix() {
79-
return SpreadsheetMetadata.class.getSimpleName();
80-
}
8174
}

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataPropertyNameTest.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -657,11 +657,4 @@ public Class<SpreadsheetMetadataPropertyName<?>> type() {
657657
public JavaVisibility typeVisibility() {
658658
return JavaVisibility.PUBLIC;
659659
}
660-
661-
// TypeNameTesting...................................................................................................
662-
663-
@Override
664-
public String typeNamePrefix() {
665-
return SpreadsheetMetadata.class.getSimpleName();
666-
}
667660
}

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataPropertyNameTestCase.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import walkingkooka.locale.LocaleContext;
2424
import walkingkooka.net.HasUrlFragment;
2525
import walkingkooka.net.UrlFragment;
26+
import walkingkooka.reflect.ClassTesting;
2627
import walkingkooka.reflect.JavaVisibility;
28+
import walkingkooka.reflect.TypeNameTesting;
2729
import walkingkooka.spreadsheet.format.SpreadsheetFormatterSelector;
2830
import walkingkooka.spreadsheet.parser.SpreadsheetParserSelector;
2931
import walkingkooka.spreadsheet.reference.SpreadsheetLabelNameResolver;
@@ -41,8 +43,9 @@
4143

4244
import static org.junit.jupiter.api.Assertions.assertThrows;
4345

44-
public abstract class SpreadsheetMetadataPropertyNameTestCase<N extends SpreadsheetMetadataPropertyName<V>, V> extends SpreadsheetMetadataTestCase2<N>
45-
implements ToStringTesting<N> {
46+
public abstract class SpreadsheetMetadataPropertyNameTestCase<N extends SpreadsheetMetadataPropertyName<V>, V> implements ClassTesting<N>,
47+
TypeNameTesting<N>,
48+
ToStringTesting<N> {
4649

4750
final static SpreadsheetLabelNameResolver LABEL_NAME_RESOLVER = SpreadsheetLabelNameResolvers.fake();
4851

@@ -272,7 +275,7 @@ public final JavaVisibility typeVisibility() {
272275
return JavaVisibility.PACKAGE_PRIVATE;
273276
}
274277

275-
// TypeNameTesting...................................................................................................
278+
// TypeNameTesting..................................................................................................
276279

277280
@Override
278281
public final String typeNamePrefix() {

src/test/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataTestCase2.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,9 @@ public abstract class SpreadsheetMetadataTestCase2<T> implements ClassTesting2<T
2626
SpreadsheetMetadataTestCase2() {
2727
super();
2828
}
29+
30+
@Override
31+
public final String typeNamePrefix() {
32+
return SpreadsheetMetadata.class.getSimpleName();
33+
}
2934
}

0 commit comments

Comments
 (0)