Closed #73

Author: olekscode

src/DataFrame-Tests/DataFrameTest.class.st

@@ -1090,6 +1090,16 @@ DataFrameTest >> testRemoveColumnAt [
 	self assert: df equals: expected.
 ]
 
+{ #category : #tests }
+DataFrameTest >> testRemoveColumnAtOutOfRange [
+	self should: [ df removeColumnAt: 100 ] raise: SubscriptOutOfBounds.
+]
+
+{ #category : #tests }
+DataFrameTest >> testRemoveColumnNotFound [
+	self should: [ df removeColumn: #NoSuchColumn ] raise: NotFoundError.
+]
+
 { #category : #tests }
 DataFrameTest >> testRemoveRow [
 
@@ -1124,6 +1134,16 @@ DataFrameTest >> testRemoveRowAt [
 	self assert: df equals: expected.
 ]
 
+{ #category : #tests }
+DataFrameTest >> testRemoveRowAtOutOfRange [
+	self should: [ df removeRowAt: 100 ] raise: SubscriptOutOfBounds.
+]
+
+{ #category : #tests }
+DataFrameTest >> testRemoveRowNotFound [
+	self should: [ df removeRow: #NoSuchRow ] raise: NotFoundError.
+]
+
 { #category : #tests }
 DataFrameTest >> testRow [
 

src/DataFrame/DataFrame.class.st

@@ -867,6 +867,8 @@ DataFrame >> removeColumn: columnName [
 
 { #category : #removing }
 DataFrame >> removeColumnAt: columnNumber [
+	(columnNumber < 1 or: [ columnNumber > self numberOfColumns ])
+		ifTrue: [ SubscriptOutOfBounds signalFor: columnNumber ].
 
 	contents removeColumnAt: columnNumber.
 	columnNames := columnNames copyWithoutIndex: columnNumber.
@@ -882,7 +884,9 @@ DataFrame >> removeRow: rowName [
 
 { #category : #removing }
 DataFrame >> removeRowAt: rowNumber [
-
+	(rowNumber < 1 or: [ rowNumber > self numberOfRows ])
+		ifTrue: [ SubscriptOutOfBounds signalFor: rowNumber ].
+		
 	contents removeRowAt: rowNumber.
 	rowNames := rowNames copyWithoutIndex: rowNumber.
 ]