Merge 9ad3a2a into 05f0499

ba-st · Jan 3, 2019 · 811eddc · 811eddc
2 parents 05f0499 + 9ad3a2a
commit 811eddc
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 4 deletions.
diff --git a/source/BaselineOfBuoy/BaselineOfBuoy.class.st b/source/BaselineOfBuoy/BaselineOfBuoy.class.st
@@ -18,6 +18,7 @@ BaselineOfBuoy >> baseline: spec [
 				baselineCollections: spec;
 				baselineConditions: spec;
 				baselineDynamicBinding: spec;
+				baselineExceptionHandling: spec;
 				baselineMath: spec;
 				baselineMetaprogramming: spec;
 				baselineSUnit: spec;
@@ -68,6 +69,16 @@ BaselineOfBuoy >> baselineDynamicBinding: spec [
 		group: 'Tests' with: 'Buoy-Dynamic-Binding-Tests'
 ]
 
+{ #category : #baselines }
+BaselineOfBuoy >> baselineExceptionHandling: spec [
+
+	spec
+		package: 'Buoy-Exception-Handling';
+		group: 'Deployment' with: 'Buoy-Exception-Handling';
+		package: 'Buoy-Exception-Handling-Tests' with: [ spec requires: 'Buoy-Exception-Handling' ];
+		group: 'Tests' with: 'Buoy-Exception-Handling-Tests'
+]
+
 { #category : #baselines }
 BaselineOfBuoy >> baselineMath: spec [
 

diff --git a/source/Buoy-Exception-Handling-System-Tests/package.st b/source/Buoy-Exception-Handling-System-Tests/package.st
diff --git a/source/Buoy-Exception-Handling-System/package.st b/source/Buoy-Exception-Handling-System/package.st
diff --git a/...ests/ExceptionHandlingSystemTest.class.st → ...ests/ExceptionHandlingSystemTest.class.st b/...ests/ExceptionHandlingSystemTest.class.st → ...ests/ExceptionHandlingSystemTest.class.st
@@ -4,7 +4,7 @@ I'm a test case for the exception handling system.
 Class {
 	#name : #ExceptionHandlingSystemTest,
 	#superclass : #TestCase,
-	#category : #'Buoy-Exception-Handling-System-Tests'
+	#category : #'Buoy-Exception-Handling-Tests'
 }
 
 { #category : #private }

diff --git a/source/Buoy-Exception-Handling-Tests/package.st b/source/Buoy-Exception-Handling-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Exception-Handling-Tests' }
diff --git a/...Handling-System/BlockClosure.extension.st → ...eption-Handling/BlockClosure.extension.st b/...Handling-System/BlockClosure.extension.st → ...eption-Handling/BlockClosure.extension.st
@@ -1,6 +1,6 @@
 Extension { #name : #BlockClosure }
 
-{ #category : #'*Buoy-Exception-Handling-System' }
+{ #category : #'*Buoy-Exception-Handling' }
 BlockClosure >> on: selector except: exclusionSelector do: action [
 
 	^ self

diff --git a/source/Buoy-Exception-Handling/package.st b/source/Buoy-Exception-Handling/package.st
@@ -0,0 +1 @@
+Package { #name : #'Buoy-Exception-Handling' }
diff --git a/source/Buoy-Math-Tests/PerMilleTest.class.st b/source/Buoy-Math-Tests/PerMilleTest.class.st
@@ -17,6 +17,34 @@ PerMilleTest >> testAbs [
 		assert: -15 perMille abs printString equals: '15‰'
 ]
 
+{ #category : #'tests - converting' }
+PerMilleTest >> testAsFloat [
+
+	self
+		assert: 0 perMille asFloat equals: 0.0;
+		assert: 1000 perMille asFloat equals: 1.0;
+		assert: 500 perMille asFloat equals: 0.5;
+		assert: 5.0 perMille asFloat equals: 0.005
+]
+
+{ #category : #'tests - converting' }
+PerMilleTest >> testAsFraction [
+
+	self
+		assert: 0 perMille asFraction equals: 0;
+		assert: 1000 perMille asFraction equals: 1;
+		assert: 500 perMille asFraction equals: 1 / 2
+]
+
+{ #category : #'tests - converting' }
+PerMilleTest >> testAsNumber [
+
+	self
+		assert: 0 perMille asNumber equals: 0;
+		assert: 1000 perMille asNumber equals: 1;
+		assert: 500 perMille asNumber equals: 1 / 2
+]
+
 { #category : #'tests-magnitude-API' }
 PerMilleTest >> testBetweenAnd [
 

diff --git a/source/Buoy-Math-Tests/PercentageTest.class.st b/source/Buoy-Math-Tests/PercentageTest.class.st
@@ -17,6 +17,34 @@ PercentageTest >> testAbs [
 		assert: (Percentage of: -15) abs printString equals: '15%'
 ]
 
+{ #category : #'tests - converting' }
+PercentageTest >> testAsFloat [
+
+	self
+		assert: 0 percent asFloat equals: 0.0;
+		assert: 100 percent asFloat equals: 1.0;
+		assert: 50 percent asFloat equals: 0.5;
+		assert: 5.0 percent asFloat equals: 0.05
+]
+
+{ #category : #'tests - converting' }
+PercentageTest >> testAsFraction [
+
+	self
+		assert: Percentage zero asFraction equals: 0;
+		assert: Percentage oneHundred asFraction equals: 1;
+		assert: ( Percentage of: 50 ) asFraction equals: 1 / 2
+]
+
+{ #category : #'tests - converting' }
+PercentageTest >> testAsNumber [
+
+	self
+		assert: 0 percent asNumber equals: 0;
+		assert: 100 percent asNumber equals: 1;
+		assert: 50 percent asNumber equals: 1 / 2
+]
+
 { #category : #'tests-magnitude-API' }
 PercentageTest >> testBetweenAnd [
 

diff --git a/source/Buoy-Math/PartsPerFraction.class.st b/source/Buoy-Math/PartsPerFraction.class.st
@@ -86,6 +86,12 @@ PartsPerFraction >> asFloat [
 	^ ratio asFloat
 ]
 
+{ #category : #converting }
+PartsPerFraction >> asFraction [
+
+	^ ratio asFraction
+]
+
 { #category : #converting }
 PartsPerFraction >> asNumber [