Merge branch 'solutions'

Conflicts:
	quiz/src/main/scala/scalaexamples/quiz/swing/SwingGame.scala

Author: stoyle

first-class-functions/src/test/scala/scalaexamples/firstclassfunctions/PersonTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 // Comment in the tests below and make them run and pass
 

higher-order-functions/src/test/scala/scalaexamples/higherorderfunctions/PersonFilterTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 // Comment in the tests below and make them run and pass
 

higher-order-functions/src/test/scala/scalaexamples/higherorderfunctions/PersonPartitionerTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 // Comment in the tests below and make them run and pass
 

higher-order-functions/src/test/scala/scalaexamples/higherorderfunctions/PersonTransformerTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 // Comment in the tests below and make them run and pass
 

intro/src/test/scala/scalaexamples/intro/CreateStuffTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class CreateStuffTest extends EmptyTest {

intro/src/test/scala/scalaexamples/intro/MyFirstTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class MyFirstTest extends EmptyTest{

oo-traits/src/test/scala/scalaexamples/companionobject/CompanionObjectTest.scala

@@ -4,9 +4,10 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
-class CompanionObjectTest {
+class CompanionObjectTest extends EmptyTest{
 
   @Test def companionObjectTest {
     // Comment in epression for expression and make them compile and run

oo-traits/src/test/scala/scalaexamples/inheritance/ShapeTest.scala

@@ -6,6 +6,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 import Math.Pi
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class ShapeTest extends EmptyTest {

oo-traits/src/test/scala/scalaexamples/traits/BasicTraitTest.scala

@@ -6,6 +6,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 
 import util.Sorting
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class BasicTraitTest extends EmptyTest {

oo-traits/src/test/scala/scalaexamples/traits/DynamicMixinTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class DynamicMixinTest extends EmptyTest {

pattern-matching/src/test/scala/scalaexamples/patternmatching/ListMatchingTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class ListMatchingTest extends EmptyTest  {

pattern-matching/src/test/scala/scalaexamples/patternmatching/MyCaseClassMatchingTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class MyCaseClassMatchingTest extends EmptyTest {

pattern-matching/src/test/scala/scalaexamples/patternmatching/RegexMatchingTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class RegexMatchingTest extends EmptyTest {

pattern-matching/src/test/scala/scalaexamples/patternmatching/TupleTestMatchTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class TupleTestMatchTest extends EmptyTest {

pattern-matching/src/test/scala/scalaexamples/patternmatching/TypeMatchingTest.scala

@@ -4,6 +4,7 @@ import junit.framework.Assert._
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import scalaexamples.EmptyTest
 
 @RunWith(classOf[JUnit4])
 class TypeMatchingTest extends EmptyTest {