Skip to content

Commit ed75aca

Browse files
committed
SpreadsheetViewportAnchor.urlFragment empty when NONE
1 parent c6b0e04 commit ed75aca

File tree

2 files changed

+41
-35
lines changed

2 files changed

+41
-35
lines changed

src/main/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportAnchor.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ public enum SpreadsheetViewportAnchor implements HasUrlFragment {
4848
RIGHT;
4949

5050
SpreadsheetViewportAnchor() {
51-
this.kebabText = CaseKind.kebabEnumName(this);
51+
final String kebabText = CaseKind.SNAKE.change(
52+
this.name(),
53+
CaseKind.KEBAB
54+
);
55+
this.kebabText = kebabText;
56+
this.urlFragment = kebabText.equals("none") ?
57+
UrlFragment.EMPTY :
58+
UrlFragment.with(kebabText);
5259
}
5360

5461
public String kebabText() {
@@ -221,14 +228,11 @@ private void failIfNone() {
221228

222229
@Override
223230
public UrlFragment urlFragment() {
224-
return UrlFragment.with(
225-
CaseKind.SNAKE.change(
226-
this.name(),
227-
CaseKind.KEBAB
228-
)
229-
);
231+
return this.urlFragment;
230232
}
231233

234+
private final UrlFragment urlFragment;
235+
232236
public final static SpreadsheetViewportAnchor CELL = NONE;
233237
public final static SpreadsheetViewportAnchor COLUMN = NONE;
234238
public final static SpreadsheetViewportAnchor ROW = NONE;

src/test/java/walkingkooka/spreadsheet/viewport/SpreadsheetViewportAnchorTest.java

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package walkingkooka.spreadsheet.viewport;
1919

2020
import org.junit.jupiter.api.Test;
21+
import walkingkooka.net.HasUrlFragmentTesting;
22+
import walkingkooka.net.UrlFragment;
2123
import walkingkooka.reflect.ClassTesting;
2224
import walkingkooka.reflect.JavaVisibility;
2325
import walkingkooka.spreadsheet.reference.SpreadsheetCellRangeReference;
@@ -33,7 +35,8 @@
3335
import static org.junit.jupiter.api.Assertions.assertThrows;
3436

3537
public final class SpreadsheetViewportAnchorTest implements ClassTesting<SpreadsheetViewportAnchor>,
36-
ParseStringTesting<SpreadsheetViewportAnchor> {
38+
ParseStringTesting<SpreadsheetViewportAnchor>,
39+
HasUrlFragmentTesting {
3740

3841
// constants........................................................................................................
3942

@@ -109,33 +112,6 @@ private void oppositeAndCheck2(final SpreadsheetViewportAnchor anchor,
109112
);
110113
}
111114

112-
// kebabText........................................................................................................
113-
114-
@Test
115-
public void testKebabTextLeft() {
116-
this.kebabTextAndCheck(
117-
SpreadsheetViewportAnchor.LEFT,
118-
"left"
119-
);
120-
}
121-
122-
@Test
123-
public void testKebabTextTopRight() {
124-
this.kebabTextAndCheck(
125-
SpreadsheetViewportAnchor.TOP_RIGHT,
126-
"top-right"
127-
);
128-
}
129-
130-
private void kebabTextAndCheck(final SpreadsheetViewportAnchor anchor,
131-
final String expected) {
132-
this.checkEquals(
133-
expected,
134-
anchor.kebabText(),
135-
() -> anchor + " kebabText"
136-
);
137-
}
138-
139115
// setLeft........................................................................................................
140116

141117
@Test
@@ -921,6 +897,32 @@ private void toRowOrRowRangeAnchorAndCheck(final SpreadsheetViewportAnchor ancho
921897
);
922898
}
923899

900+
// HasUrlFragment...................................................................................................
901+
902+
@Test
903+
public void testUrlFragmentNone() {
904+
this.urlFragmentAndCheck(
905+
SpreadsheetViewportAnchor.NONE,
906+
UrlFragment.EMPTY
907+
);
908+
}
909+
910+
@Test
911+
public void testUrlFragmentTopLeft() {
912+
this.urlFragmentAndCheck(
913+
SpreadsheetViewportAnchor.TOP_LEFT,
914+
"top-left"
915+
);
916+
}
917+
918+
@Test
919+
public void testUrlFragmentLeft() {
920+
this.urlFragmentAndCheck(
921+
SpreadsheetViewportAnchor.LEFT,
922+
"left"
923+
);
924+
}
925+
924926
// ClassTesting....................................................................................................
925927

926928
@Override

0 commit comments

Comments
 (0)