Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ext {
espressoVersion = "3.1.0"
playServicesVersion = '17.0.1'
cameraXVersion = "1.0.0-beta07"
room_version = "2.3.0"
room_version = "2.4.3"
coroutines_version = "1.3.2"
work_manager_version = '2.7.1'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import org.catrobat.catroid.common.SoundInfo
import org.catrobat.catroid.content.Project
import org.catrobat.catroid.content.Sprite
import org.catrobat.catroid.io.SoundManager
import org.catrobat.catroid.io.XstreamSerializer
import org.catrobat.catroid.test.R
import org.catrobat.catroid.test.utils.TestUtils
import org.catrobat.catroid.test.utils.TestUtils.createSoundFile
Expand All @@ -42,21 +43,26 @@ import java.io.File

@RunWith(AndroidJUnit4::class)
class StopSoundActionTest {
private val name: String = TestUtils.DEFAULT_TEST_PROJECT_NAME
private val soundManager = SoundManager.getInstance()
lateinit var soundFile: File
lateinit var project: Project
lateinit var sprite: Sprite

@Before
fun setUp() {
project = Project(
ApplicationProvider.getApplicationContext(),
TestUtils.DEFAULT_TEST_PROJECT_NAME
)
project = Project(ApplicationProvider.getApplicationContext(), name)
XstreamSerializer.getInstance().saveProject(project)
soundFile = createSoundFile(project, R.raw.testsound, "soundTest.mp3")
sprite = Sprite(TestUtils.DEFAULT_TEST_SPRITE_NAME)
}

@After
fun tearDown() {
TestUtils.deleteProjects(name)
soundManager.clear()
}

@Test
fun testStopOneSound() {
val soundInfo = createSoundInfo(soundFile)
Expand Down Expand Up @@ -88,10 +94,5 @@ class StopSoundActionTest {
assertTrue(soundManager.mediaPlayers[1].isPlaying)
}

@After
fun tearDown() {
soundManager.clear()
}

private fun createSoundInfo(soundFile: File) = SoundInfo().also { it.file = soundFile }
}