Adopt tests: Change http to https, adapt to OPAL upgrade

johannesduesing · Jun 17, 2021 · d6f09a0 · d6f09a0
1 parent df479f6
commit d6f09a0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/src/main/scala/de/upb/cs/swt/delphi/crawler/processing/HermesAnalyzer.scala b/src/main/scala/de/upb/cs/swt/delphi/crawler/processing/HermesAnalyzer.scala
@@ -30,7 +30,7 @@ import scala.collection.JavaConverters.asScalaIteratorConverter
   *
   */
 class HermesAnalyzer(project: Project[URL]) extends HermesCore {
-
+  initialize(HermesAnalyzer.temporaryConfigFile())
 
   override def updateProjectData(f: => Unit): Unit = HermesAnalyzer.synchronized {
     f

diff --git a/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenDownloadActorTest.scala b/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenDownloadActorTest.scala
@@ -38,13 +38,11 @@ class MavenDownloadActorTest extends TestKit(ActorSystem("DownloadActor"))
   with WordSpecLike
   with Matchers
   with BeforeAndAfterAll {
-  override def afterAll {
-    TestKit.shutdownActorSystem(system)
-  }
+
 
   "The maven download actor" must {
     "create a maven artifact with a jar and pom file" in {
-      val mavenIdentifier = new MavenIdentifier("http://central.maven.org/maven2/", "junit", "junit", "4.12")
+      val mavenIdentifier = new MavenIdentifier("https://repo1.maven.org/maven2/", "junit", "junit", "4.12")
       val downloadActor = system.actorOf(MavenDownloadActor.props)
 
       implicit val timeout = Timeout(10 seconds)

diff --git a/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenDownloaderSpec.scala b/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenDownloaderSpec.scala
@@ -21,13 +21,13 @@ import de.upb.cs.swt.delphi.crawler.preprocessing.Common._
 
 class MavenDownloaderSpec extends FlatSpec with Matchers {
   "MavenDownloader" should "save jar file" in {
-    val mavenIdentifier = new MavenIdentifier("http://central.maven.org/maven2/", "junit", "junit", "4.12")
+    val mavenIdentifier = new MavenIdentifier("https://repo1.maven.org/maven2/", "junit", "junit", "4.12")
     val downloader = new MavenDownloader(mavenIdentifier)
     val jarStream = downloader.downloadJar()
     checkJar(jarStream.is)
   }
   "MavenDownloader" should "save pom file" in {
-    val mavenIdentifier = new MavenIdentifier("http://central.maven.org/maven2/", "junit", "junit", "4.12")
+    val mavenIdentifier = new MavenIdentifier("https://repo1.maven.org/maven2/", "junit", "junit", "4.12")
     val downloader = new MavenDownloader(mavenIdentifier)
     val pomStream = downloader.downloadPom()
     checkPom(pomStream.is)

diff --git a/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenURLConstructionCheck.scala b/src/test/scala/de/upb/cs/swt/delphi/crawler/preprocessing/MavenURLConstructionCheck.scala
@@ -21,17 +21,17 @@ import org.scalatest.{FlatSpec, Matchers}
 
 class MavenURLConstructionCheck extends FlatSpec with Matchers {
   "Regular identifiers" should "create regular urls" in {
-    val reg1 = MavenIdentifier("http://repo1.maven.org/maven2/", "log4j", "log4j", "1.2.9")
-    val reg2 = MavenIdentifier("http://repo1.maven.org/maven2/", "de.tu-darmstadt.stg", "sootkeeper", "1.0")
-    val reg3 = MavenIdentifier("http://repo1.maven.org/maven2/", "de.tuebingen.uni.sfs.germanet", "germanet-api", "13.1.0")
+    val reg1 = MavenIdentifier("https://repo1.maven.org/maven2/", "log4j", "log4j", "1.2.9")
+    val reg2 = MavenIdentifier("https://repo1.maven.org/maven2/", "de.tu-darmstadt.stg", "sootkeeper", "1.0")
+    val reg3 = MavenIdentifier("https://repo1.maven.org/maven2/", "de.tuebingen.uni.sfs.germanet", "germanet-api", "13.1.0")
 
-    reg1.toJarLocation.toString shouldBe "http://repo1.maven.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.jar"
-    reg2.toJarLocation.toString shouldBe "http://repo1.maven.org/maven2/de/tu-darmstadt/stg/sootkeeper/1.0/sootkeeper-1.0.jar"
-    reg3.toJarLocation.toString shouldBe "http://repo1.maven.org/maven2/de/tuebingen/uni/sfs/germanet/germanet-api/13.1.0/germanet-api-13.1.0.jar"
+    reg1.toJarLocation.toString shouldBe "https://repo1.maven.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.jar"
+    reg2.toJarLocation.toString shouldBe "https://repo1.maven.org/maven2/de/tu-darmstadt/stg/sootkeeper/1.0/sootkeeper-1.0.jar"
+    reg3.toJarLocation.toString shouldBe "https://repo1.maven.org/maven2/de/tuebingen/uni/sfs/germanet/germanet-api/13.1.0/germanet-api-13.1.0.jar"
 
-    reg1.toPomLocation.toString shouldBe "http://repo1.maven.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.pom"
-    reg2.toPomLocation.toString shouldBe "http://repo1.maven.org/maven2/de/tu-darmstadt/stg/sootkeeper/1.0/sootkeeper-1.0.pom"
-    reg3.toPomLocation.toString shouldBe "http://repo1.maven.org/maven2/de/tuebingen/uni/sfs/germanet/germanet-api/13.1.0/germanet-api-13.1.0.pom"
+    reg1.toPomLocation.toString shouldBe "https://repo1.maven.org/maven2/log4j/log4j/1.2.9/log4j-1.2.9.pom"
+    reg2.toPomLocation.toString shouldBe "https://repo1.maven.org/maven2/de/tu-darmstadt/stg/sootkeeper/1.0/sootkeeper-1.0.pom"
+    reg3.toPomLocation.toString shouldBe "https://repo1.maven.org/maven2/de/tuebingen/uni/sfs/germanet/germanet-api/13.1.0/germanet-api-13.1.0.pom"
   }
 
 

diff --git a/src/test/scala/de/upb/cs/swt/delphi/crawler/processing/HermesTest.scala b/src/test/scala/de/upb/cs/swt/delphi/crawler/processing/HermesTest.scala
@@ -48,7 +48,7 @@ class HermesTest extends FlatSpec with Matchers with BeforeAndAfterAll {
 
   "HermesVersion" should "be a valid version string" in {
     HermesAnalyzer.HermesVersion shouldBe a [String]
-    HermesAnalyzer.HermesVersion shouldBe "1.0.0"
+    HermesAnalyzer.HermesVersion shouldBe "4.0.0"
   }