diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 6ff694a..9857fdf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml index da26943..27f022a 100644 --- a/.idea/scala_compiler.xml +++ b/.idea/scala_compiler.xml @@ -1,6 +1,11 @@ - + + + + + + \ No newline at end of file diff --git a/ParseIFTTStockEtf.iml b/ParseIFTTStockEtf.iml index f8b3ea3..3e38d48 100644 --- a/ParseIFTTStockEtf.iml +++ b/ParseIFTTStockEtf.iml @@ -1,6 +1,6 @@ - + @@ -25,5 +25,6 @@ + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d6b38b0..fb8a677 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ScalaStock + quant.com.scalastock ParseIFTTStockEtf 1.0-SNAPSHOT @@ -26,110 +26,68 @@ scala-library ${scala.version} - org.pegdown pegdown 1.2.1 test + + junit + junit + 4.8.1 + test + + - - - - net.alchim31.maven - scala-maven-plugin - 3.1.6 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - - org.scalatest - scalatest-maven-plugin - 1.0-RC2 - - - - net.alchim31.maven - scala-maven-plugin + org.scala-tools + maven-scala-plugin + 2.15.2 + scala-compile compile testCompile - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - + + + -dependencyfile + ${project.build.directory}/.scala_dependencies + + - - incremental - true - - -Xms256m - -Xmx1024m - - - -Xlint:unchecked - -Xlint:deprecation - - + - + --> org.scalatest scalatest-maven-plugin + 1.0-M2 ${project.build.directory}/surefire-reports - . - WDF TestSuite.txt - ${project.build.directory}/html/scalatest + W - test + scala-test test diff --git a/src/test/scala/TreeTests/main.scala b/src/test/scala/TreeTests/main.scala deleted file mode 100644 index c591b7f..0000000 --- a/src/test/scala/TreeTests/main.scala +++ /dev/null @@ -1,18 +0,0 @@ -package TreeTests - -import Tree.Sort -import org.scalatest.FunSuite - -/** - * Created by Frank Cash on 5/2/17. - */ -object main extends FunSuite{ - val nums: List[Double] = List(24.02, 24.01, 24.03, 24.05, 22.001, 29.001) - - test("Tests Merge Sort"){ - val sorted = Sort.mergeSort(nums) - println("tst") - assert(sorted.head == 22.001) - } - -}