Merge pull request square#1581 from bric3/shark-test-module

pyricau · web-flow · commit c44b7c7a9d6c · 2019-09-11T09:42:20.000-07:00
Introduces a Shark test module
diff --git a/settings.gradle b/settings.gradle
@@ -12,3 +12,4 @@ include ':shark-cli'
 include ':shark-graph'
 include ':shark-hprof'
 include ':shark-log'
+include ':shark-test'
diff --git a/shark-graph/build.gradle b/shark-graph/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 
   testImplementation deps.assertj_core
   testImplementation deps.junit
+  testImplementation project(':shark-test')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/shark-hprof/build.gradle b/shark-hprof/build.gradle
@@ -12,6 +12,7 @@ dependencies {
 
   testImplementation deps.assertj_core
   testImplementation deps.junit
+  testImplementation project(':shark-test')
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/shark-hprof/src/test/java/shark/HprofReaderPrimitiveArrayTest.kt b/shark-hprof/src/test/java/shark/HprofReaderPrimitiveArrayTest.kt
@@ -1,9 +1,8 @@
+package shark
+
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
-import shark.Hprof
-import shark.HprofRecord
-import shark.OnHprofRecordListener
 import kotlin.text.Charsets.UTF_8
 
 class HprofReaderPrimitiveArrayTest {
@@ -24,7 +23,9 @@ class HprofReaderPrimitiveArrayTest {
 
     @Test
     fun reads_primitive_arrays_correctly() {
-        val byteArray = "mybytes".toByteArray(UTF_8)
+        val byteArray = ("Sharks also have a sensory organ called the \"ampullae of Lorenzini\" " +
+                         "which they use to \"feel\" the electrical field coming from its prey.")
+                .toByteArray(UTF_8)
 
         val heapDump = heapDumpRule.dumpHeap()
 
diff --git a/shark-test/build.gradle b/shark-test/build.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+dependencies {
+    implementation deps.kotlin.stdlib
+    implementation deps.assertj_core
+    implementation deps.junit
+}
+
diff --git a/shark-test/src/main/kotlin/shark/HeapDumpRule.kt b/shark-test/src/main/kotlin/shark/HeapDumpRule.kt
@@ -1,10 +1,9 @@
-import com.sun.management.HotSpotDiagnosticMXBean
+package shark
+
 import org.junit.rules.ExternalResource
 import org.junit.rules.TemporaryFolder
-
 import java.io.File
 import java.io.IOException
-import java.lang.management.ManagementFactory
 import java.util.UUID
 
 class HeapDumpRule : ExternalResource() {
@@ -21,13 +20,8 @@ class HeapDumpRule : ExternalResource() {
 
     @Throws(IOException::class)
     fun dumpHeap(): File {
-        val hotSpotDiag = ManagementFactory.newPlatformMXBeanProxy(
-                ManagementFactory.getPlatformMBeanServer(),
-                "com.sun.management:type=HotSpotDiagnostic",
-                HotSpotDiagnosticMXBean::class.java
-        )
         val hprof = File(temporaryFolder.root, "heapDump" + UUID.randomUUID() + ".hprof")
-        hotSpotDiag.dumpHeap(hprof.absolutePath, true)
+        JvmTestHeapDumper.dumpHeap(hprof.absolutePath)
         return hprof
     }
 }
diff --git a/shark-test/src/main/kotlin/shark/JvmTestHeapDumper.kt b/shark-test/src/main/kotlin/shark/JvmTestHeapDumper.kt

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ dependencies {`
`12`	`12`
`13`	`13`	`testImplementation deps.assertj_core`
`14`	`14`	`testImplementation deps.junit`
	`15`	`+ testImplementation project(':shark-test')`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`apply from: rootProject.file('gradle/gradle-mvn-push.gradle')`