Refactoring: Exercises moved to separate directory

Granjow · Oct 16, 2015 · 11a2bed · 11a2bed
1 parent 43e3cf2
commit 11a2bed
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 51 deletions.
diff --git a/ex2-graph-structure/graph-structure.js b/ex2-graph-structure/graph-structure.js
diff --git a/ex0-intro/intro.js → exercises/ex0-intro/intro.js b/ex0-intro/intro.js → exercises/ex0-intro/intro.js
@@ -1,6 +1,6 @@
 var path = require( 'path' ),
     verify = require( 'adventure-verify' ),
-    tools = require( '../library/tools' );
+    tools = require( '../../library/tools' );
 
 exports.problem = tools.mdProblem( path.join( __dirname, 'problem-intro.md' ), 'problem-intro.pdf' );
 exports.solution = tools.mdSolution( path.join( __dirname, 'solution-intro.js' ) );

diff --git a/ex0-intro/problem-intro.md → exercises/ex0-intro/problem-intro.md b/ex0-intro/problem-intro.md → exercises/ex0-intro/problem-intro.md
diff --git a/ex0-intro/solution-intro.js → exercises/ex0-intro/solution-intro.js b/ex0-intro/solution-intro.js → exercises/ex0-intro/solution-intro.js
diff --git a/ex1-gve/problem-gve.md → ...-vertices-edges/problem-vertices-edges.md b/ex1-gve/problem-gve.md → ...-vertices-edges/problem-vertices-edges.md
diff --git a/ex1-gve/solution-gve.js → ...vertices-edges/solution-vertices-edges.js b/ex1-gve/solution-gve.js → ...vertices-edges/solution-vertices-edges.js
diff --git a/ex1-gve/gve.js → ...ises/ex1-vertices-edges/vertices-edges.js b/ex1-gve/gve.js → ...ises/ex1-vertices-edges/vertices-edges.js
@@ -1,9 +1,9 @@
 var path = require( 'path' ),
     verify = require( 'adventure-verify' ),
-    tools = require( '../library/tools' );
+    tools = require( '../../library/tools' );
 
-exports.problem = tools.mdProblem( path.join( __dirname, 'problem-gve.md' ), 'problem-gve.pdf' );
-exports.solution = tools.mdSolution( path.join( __dirname, 'solution-gve.js' ) );
+exports.problem = tools.mdProblem( path.join( __dirname, 'problem-vertices-edges.md' ), 'problem-vertices-edges.pdf' );
+exports.solution = tools.mdSolution( path.join( __dirname, 'solution-vertices-edges.js' ) );
 
 exports.verify = verify( { modeReset: true }, function checker( args, t ) {
     var res = require( path.resolve( args[ 0 ] ) );

diff --git a/ex2-can-we-reach-it/problem-reach-it.md → ...s/ex2-can-we-reach-it/problem-reach-it.md b/ex2-can-we-reach-it/problem-reach-it.md → ...s/ex2-can-we-reach-it/problem-reach-it.md
diff --git a/exercises/ex2-graph-structure/graph-structure.js b/exercises/ex2-graph-structure/graph-structure.js
@@ -0,0 +1,28 @@
+var path = require( 'path' ),
+    verify = require( 'adventure-verify' ),
+    tools = require( '../../library/tools' );
+
+exports.problem = tools.mdProblem( path.join( __dirname, 'problem-graph-structure.md' ), 'problem-graph-structure.pdf' );
+
+exports.solution = tools.mdSolution( path.join( __dirname, 'solution-graph-structure.js' ) );
+
+exports.verify = verify( { modeReset: true }, function checker( args, t ) {
+    var Graph = require( path.resolve( args[ 0 ] ) );
+
+    var vertices = [ 'A', 'B', 'C', 'D' ];
+    var edges = [ [ 'A', 'B' ], [ 'A', 'C' ], [ 'D', 'C' ] ];
+
+    var graph = new Graph( vertices, edges );
+
+    t.ok( graph.v( 'A' ), 'Can retrieve vertex A' );
+    t.equal( graph.v( 'A' ).id, 'A', 'ID of vertex A is "A"' );
+
+    var neighbours = graph.v( 'A' ).neighbours();
+    t.ok( neighbours, 'Can retrieve neighbours of A' );
+    t.equal( neighbours.length, 2, 'A has 2 neighbours' );
+    t.ok( (neighbours[ 0 ].id == 'B' && neighbours[ 1 ].id == 'C') || (neighbours[ 0 ].id == 'C' && neighbours[ 1 ].id == 'B'),
+        'Vertex A has neighbours B and C' );
+
+    t.end();
+
+} );
diff --git a/...raph-structure/problem-graph-structure.md → ...raph-structure/problem-graph-structure.md b/...raph-structure/problem-graph-structure.md → ...raph-structure/problem-graph-structure.md
diff --git a/...aph-structure/solution-graph-structure.js → ...aph-structure/solution-graph-structure.js b/...aph-structure/solution-graph-structure.js → ...aph-structure/solution-graph-structure.js
diff --git a/...ding-problems/problem-reading-problems.md → ...ding-problems/problem-reading-problems.md b/...ding-problems/problem-reading-problems.md → ...ding-problems/problem-reading-problems.md
diff --git a/ex3-siege/problem-siege.md → exercises/ex3-siege/problem-siege.md b/ex3-siege/problem-siege.md → exercises/ex3-siege/problem-siege.md
diff --git a/runner.js b/runner.js
@@ -10,13 +10,13 @@ var shop = adventure( {
 } );
 
 shop.add( 'Intro', function () {
-    return require( './ex0-intro/intro' );
+    return require( './exercises/ex0-intro/intro' );
 } );
 shop.add( 'Vertices and Edges', function () {
-    return require( './ex1-gve/gve.js' );
+    return require( './exercises/ex1-vertices-edges/vertices-edges.js' );
 } );
 shop.add( 'Graph Structure', function () {
-    return require( './ex2-graph-structure/graph-structure' );
+    return require( './exercises/ex2-graph-structure/graph-structure' );
 } );
 
 shop.execute( process.argv.slice( 2 ) );