mP1/walkingkooka-environment#90 EnvironmentContextTesting2.testRemoveEnvironmentValueWithNullNameFails was testRemoveEnvironmentValueNameWithNullNameFails

mP1 · mP1 · commit 72f08a047d12 · 2025-08-10T12:47:11.000+10:00
- mP1/walkingkooka-environment#90 - EnvironmentContextTesting2.testRemoveEnvironmentValueWithNullNameFails was testRemoveEnvironmentValueNameWithNullNameFails
diff --git a/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java b/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineContext.java
@@ -484,6 +484,12 @@ public <T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueNa
         return this;
     }
 
+    @Override
+    public SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.providerContext.removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     public ProviderContext providerContext() {
         return this.providerContext;
diff --git a/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineSpreadsheetEngineContext.java b/src/main/java/walkingkooka/spreadsheet/engine/BasicSpreadsheetEngineSpreadsheetEngineContext.java
@@ -169,6 +169,12 @@ public <T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueNa
         return this;
     }
 
+    @Override
+    public SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.spreadsheetEngineContext.removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     public ProviderContext providerContext() {
         return this.spreadsheetEngineContext;
diff --git a/src/main/java/walkingkooka/spreadsheet/engine/FakeSpreadsheetEngineContext.java b/src/main/java/walkingkooka/spreadsheet/engine/FakeSpreadsheetEngineContext.java
@@ -186,6 +186,11 @@ public <T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueNa
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Set<EnvironmentValueName<?>> environmentValueNames() {
         throw new UnsupportedOperationException();
diff --git a/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContext.java b/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContext.java
@@ -163,4 +163,7 @@ default ExpressionNumber missingCellNumberValue() {
     @Override
     <T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueName<T> name,
                                                      final T value);
+
+    @Override
+    SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name);
 }
diff --git a/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContextDelegator.java b/src/main/java/walkingkooka/spreadsheet/engine/SpreadsheetEngineContextDelegator.java
@@ -17,6 +17,7 @@
 
 package walkingkooka.spreadsheet.engine;
 
+import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.locale.LocaleContext;
 import walkingkooka.locale.LocaleContextDelegator;
 import walkingkooka.net.AbsoluteUrl;
@@ -150,5 +151,12 @@ default LocaleContext localeContext() {
         return this.spreadsheetEngineContext();
     }
 
+    @Override
+    default SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.spreadsheetEngineContext()
+            .removeEnvironmentValue(name);
+        return this;
+    }
+
     SpreadsheetEngineContext spreadsheetEngineContext();
 }
diff --git a/src/main/java/walkingkooka/spreadsheet/expression/ConverterSpreadsheetExpressionEvaluationContext.java b/src/main/java/walkingkooka/spreadsheet/expression/ConverterSpreadsheetExpressionEvaluationContext.java
@@ -293,6 +293,11 @@ public <T> Optional<T> environmentValue(final EnvironmentValueName<T> name) {
         return this.context.environmentValue(name);
     }
 
+    @Override
+    public SpreadsheetExpressionEvaluationContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Set<EnvironmentValueName<?>> environmentValueNames() {
         return this.context.environmentValueNames();
diff --git a/src/main/java/walkingkooka/spreadsheet/expression/FakeSpreadsheetExpressionEvaluationContext.java b/src/main/java/walkingkooka/spreadsheet/expression/FakeSpreadsheetExpressionEvaluationContext.java
@@ -144,6 +144,11 @@ public <T> SpreadsheetExpressionEvaluationContext setEnvironmentValue(final Envi
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public SpreadsheetExpressionEvaluationContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Set<EnvironmentValueName<?>> environmentValueNames() {
         throw new UnsupportedOperationException();
diff --git a/src/main/java/walkingkooka/spreadsheet/expression/SpreadsheetExpressionEvaluationContextDelegator.java b/src/main/java/walkingkooka/spreadsheet/expression/SpreadsheetExpressionEvaluationContextDelegator.java
@@ -18,6 +18,7 @@
 package walkingkooka.spreadsheet.expression;
 
 import walkingkooka.convert.ConverterContext;
+import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.net.AbsoluteUrl;
 import walkingkooka.spreadsheet.SpreadsheetCell;
 import walkingkooka.spreadsheet.convert.SpreadsheetConverterContext;
@@ -94,6 +95,11 @@ default SpreadsheetExpressionEvaluationContext expressionEvaluationContext() {
 
     // StorageExpressionEvaluationContextDelegator......................................................................
 
+    @Override
+    default SpreadsheetExpressionEvaluationContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     default StorageExpressionEvaluationContext storageExpressionEvaluationContext() {
         return this.spreadsheetExpressionEvaluationContext();
diff --git a/src/main/java/walkingkooka/spreadsheet/format/BasicSpreadsheetFormatterProviderSamplesContext.java b/src/main/java/walkingkooka/spreadsheet/format/BasicSpreadsheetFormatterProviderSamplesContext.java
@@ -111,6 +111,12 @@ public <T> SpreadsheetFormatterProviderSamplesContext setEnvironmentValue(final
         return this;
     }
 
+    @Override
+    public SpreadsheetFormatterProviderSamplesContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.providerContext.removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     public ProviderContext providerContext() {
         return this.providerContext;
diff --git a/src/main/java/walkingkooka/spreadsheet/format/FakeSpreadsheetFormatterProviderSamplesContext.java b/src/main/java/walkingkooka/spreadsheet/format/FakeSpreadsheetFormatterProviderSamplesContext.java
@@ -56,6 +56,12 @@ public <T> FakeSpreadsheetFormatterProviderSamplesContext setEnvironmentValue(fi
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public SpreadsheetFormatterProviderSamplesContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        Objects.requireNonNull(name, "name");
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public Set<EnvironmentValueName<?>> environmentValueNames() {
         throw new UnsupportedOperationException();
diff --git a/src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContext.java b/src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContext.java
@@ -28,6 +28,9 @@ public interface SpreadsheetFormatterProviderSamplesContext extends SpreadsheetF
     <T> SpreadsheetFormatterProviderSamplesContext setEnvironmentValue(final EnvironmentValueName<T> name,
                                                                        final T value);
 
+    @Override
+    SpreadsheetFormatterProviderSamplesContext removeEnvironmentValue(final EnvironmentValueName<?> name);
+
     @Override
     SpreadsheetFormatterProviderSamplesContext setPreProcessor(final JsonNodeUnmarshallContextPreProcessor processor);
 }
diff --git a/src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContextDelegator.java b/src/main/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContextDelegator.java
@@ -17,6 +17,7 @@
 package walkingkooka.spreadsheet.format;
 
 import walkingkooka.convert.ConverterContext;
+import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.plugin.ProviderContext;
 import walkingkooka.plugin.ProviderContextDelegator;
 
@@ -37,6 +38,13 @@ default SpreadsheetFormatterContext spreadsheetFormatterContext() {
 
     // ProviderContextDelegator.........................................................................................
 
+    @Override
+    default SpreadsheetFormatterProviderSamplesContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.spreadsheetFormatterProviderSamplesContext()
+            .removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     default ProviderContext providerContext() {
         return this.spreadsheetFormatterProviderSamplesContext();
diff --git a/src/main/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataEnvironmentContext.java b/src/main/java/walkingkooka/spreadsheet/meta/SpreadsheetMetadataEnvironmentContext.java
@@ -86,6 +86,14 @@ public <T> EnvironmentContext setEnvironmentValue(final EnvironmentValueName<T>
         return this;
     }
 
+    @Override
+    public EnvironmentContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        Objects.requireNonNull(name, "name");
+
+        this.context.removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     public Set<EnvironmentValueName<?>> environmentValueNames() {
         if (null == this.names) {
diff --git a/src/main/java/walkingkooka/spreadsheet/provider/BasicProviderContext.java b/src/main/java/walkingkooka/spreadsheet/provider/BasicProviderContext.java
@@ -141,6 +141,12 @@ public <T> ProviderContext setEnvironmentValue(final EnvironmentValueName<T> nam
         return this;
     }
 
+    @Override
+    public ProviderContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.environmentContext.removeEnvironmentValue(name);
+        return this;
+    }
+
     @Override
     public EnvironmentContext environmentContext() {
         return this.environmentContext;
diff --git a/src/main/java/walkingkooka/spreadsheet/validation/form/BasicSpreadsheetFormHandlerContext.java b/src/main/java/walkingkooka/spreadsheet/validation/form/BasicSpreadsheetFormHandlerContext.java
@@ -251,6 +251,12 @@ public <T> SpreadsheetFormHandlerContext setEnvironmentValue(final EnvironmentVa
         return this;
     }
 
+    @Override
+    public SpreadsheetFormHandlerContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+        this.context.removeEnvironmentValue(name);
+        return this;
+    }
+
     // EnvironmentContextDelegator......................................................................................
 
     @Override
diff --git a/src/test/java/walkingkooka/spreadsheet/expression/BasicSpreadsheetExpressionEvaluationContextTest.java b/src/test/java/walkingkooka/spreadsheet/expression/BasicSpreadsheetExpressionEvaluationContextTest.java
@@ -617,6 +617,11 @@ public void testEnvironmentValueWithNullFails() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void testRemoveEnvironmentValueWithNullNameFails() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void testLoadFormFieldValueWithNullFails() {
         throw new UnsupportedOperationException();
diff --git a/src/test/java/walkingkooka/spreadsheet/expression/ConverterSpreadsheetExpressionEvaluationContextTest.java b/src/test/java/walkingkooka/spreadsheet/expression/ConverterSpreadsheetExpressionEvaluationContextTest.java
@@ -614,6 +614,11 @@ public void testSetEnvironmentValueNameWithNullNameFails() {
         throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void testRemoveEnvironmentValueWithNullNameFails() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public void testSetEnvironmentValueNameWithNullValueFails() {
         throw new UnsupportedOperationException();
diff --git a/src/test/java/walkingkooka/spreadsheet/expression/LocalReferencesSpreadsheetExpressionEvaluationContextTest.java b/src/test/java/walkingkooka/spreadsheet/expression/LocalReferencesSpreadsheetExpressionEvaluationContextTest.java
@@ -495,6 +495,12 @@ public <T> FakeSpreadsheetExpressionEvaluationContext setEnvironmentValue(final
                     Objects.requireNonNull(value, "value");
                     throw new UnsupportedOperationException();
                 }
+
+                @Override
+                public FakeSpreadsheetExpressionEvaluationContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+                    Objects.requireNonNull(name, "name");
+                    throw new UnsupportedOperationException();
+                }
             }
         );
     }
diff --git a/src/test/java/walkingkooka/spreadsheet/expression/SpreadsheetExpressionEvaluationContextDelegatorTest.java b/src/test/java/walkingkooka/spreadsheet/expression/SpreadsheetExpressionEvaluationContextDelegatorTest.java
@@ -229,6 +229,12 @@ public <T> TestSpreadsheetExpressionEvaluationContextDelegator setEnvironmentVal
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public TestSpreadsheetExpressionEvaluationContextDelegator removeEnvironmentValue(final EnvironmentValueName<?> name) {
+            Objects.requireNonNull(name, "name");
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public String toString() {
             return this.getClass().getSimpleName();
diff --git a/src/test/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContextDelegatorTest.java b/src/test/java/walkingkooka/spreadsheet/format/SpreadsheetFormatterProviderSamplesContextDelegatorTest.java
@@ -58,6 +58,12 @@ public <T> TestSpreadsheetFormatterProviderSamplesContextDelegator setEnvironmen
             Objects.requireNonNull(value, "value");
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public TestSpreadsheetFormatterProviderSamplesContextDelegator removeEnvironmentValue(final EnvironmentValueName<?> name) {
+            Objects.requireNonNull(name, "name");
+            throw new UnsupportedOperationException();
+        }
     }
 
     @Override
diff --git a/src/test/java/walkingkooka/spreadsheet/provider/BasicProviderContextTest.java b/src/test/java/walkingkooka/spreadsheet/provider/BasicProviderContextTest.java
@@ -81,6 +81,13 @@ public <T> EnvironmentContext setEnvironmentValue(final EnvironmentValueName<T>
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public EnvironmentContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+            Objects.requireNonNull(name, "name");
+
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public Optional<EmailAddress> user() {
             return Optional.empty();
diff --git a/src/test/java/walkingkooka/spreadsheet/validation/BasicSpreadsheetValidatorContextTest.java b/src/test/java/walkingkooka/spreadsheet/validation/BasicSpreadsheetValidatorContextTest.java
@@ -57,6 +57,11 @@ public void testSetValidationReferenceSameDifferentKind() {
         );
     }
 
+    @Override
+    public void testRemoveEnvironmentValueWithNullNameFails() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     public BasicSpreadsheetValidatorContext createContext() {
         return Cast.to(
diff --git a/src/test/java/walkingkooka/spreadsheet/validation/SpreadsheetValidatorContextTestingTest.java b/src/test/java/walkingkooka/spreadsheet/validation/SpreadsheetValidatorContextTestingTest.java
@@ -77,6 +77,12 @@ public <T> TestSpreadsheetValidatorContext setEnvironmentValue(final Environment
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public TestSpreadsheetValidatorContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+            Objects.requireNonNull(name, "name");
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public EnvironmentContext environmentContext() {
             return SpreadsheetMetadataTesting.ENVIRONMENT_CONTEXT;
diff --git a/src/test/java/walkingkooka/spreadsheet/validation/form/BasicSpreadsheetFormHandlerContextTest.java b/src/test/java/walkingkooka/spreadsheet/validation/form/BasicSpreadsheetFormHandlerContextTest.java
@@ -23,9 +23,11 @@
 import walkingkooka.collect.set.Sets;
 import walkingkooka.convert.ConverterContexts;
 import walkingkooka.convert.Converters;
+import walkingkooka.environment.EnvironmentValueName;
 import walkingkooka.spreadsheet.SpreadsheetCell;
 import walkingkooka.spreadsheet.engine.FakeSpreadsheetEngineContext;
 import walkingkooka.spreadsheet.engine.SpreadsheetDelta;
+import walkingkooka.spreadsheet.engine.SpreadsheetEngineContext;
 import walkingkooka.spreadsheet.engine.SpreadsheetEngineContexts;
 import walkingkooka.spreadsheet.expression.FakeSpreadsheetExpressionEvaluationContext;
 import walkingkooka.spreadsheet.expression.SpreadsheetExpressionEvaluationContext;
@@ -49,6 +51,7 @@
 import walkingkooka.validation.form.FormName;
 
 import java.math.MathContext;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
@@ -502,6 +505,13 @@ public Optional<SpreadsheetSelection> resolveLabel(final SpreadsheetLabelName la
                             null
                     );
                 }
+
+
+                @Override
+                public SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name) {
+                    Objects.requireNonNull(name, "name");
+                    throw new UnsupportedOperationException();
+                }
             }
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -163,4 +163,7 @@ default ExpressionNumber missingCellNumberValue() {`
`163`	`163`	`@Override`
`164`	`164`	`<T> SpreadsheetEngineContext setEnvironmentValue(final EnvironmentValueName<T> name,`
`165`	`165`	`final T value);`
	`166`	`+`
	`167`	`+ @Override`
	`168`	`+ SpreadsheetEngineContext removeEnvironmentValue(final EnvironmentValueName<?> name);`
`166`	`169`	`}`