Merge branch 'Tests' of https://github.com/ucsd-cse110-fa23/cse-110-p…

…roject-team-33 into Tests
ucsd-cse110-fa23 · Dec 6, 2023 · 3ef725c · 3ef725c
2 parents c64b27d + 1256c6a
commit 3ef725c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/app/src/main/java/cse/gradle/AudioRecorder.java b/app/src/main/java/cse/gradle/AudioRecorder.java
@@ -52,7 +52,6 @@ public void startRecording(String fileName) {
                         @Override
                         public void run() {
                             try {
-                                // System.out.println("Start recording");
                                 // the format of the TargetDataLine
                                 DataLine.Info dataLineInfo = new DataLine.Info(
                                         TargetDataLine.class,
@@ -67,12 +66,12 @@ public void run() {
                                         targetDataLine);
 
                                 // the file that will contain the audio data
-                                // File audioFile = new File("recording.wav");
                                 File audioFile = new File(fileName);
                                 AudioSystem.write(
                                         audioInputStream,
                                         AudioFileFormat.Type.WAVE,
                                         audioFile);
+                                audioInputStream.close();
                             } catch (Exception ex) {
                                 ex.printStackTrace();
                             }

diff --git a/app/src/main/java/cse/gradle/MockAudioRecorder.java b/app/src/main/java/cse/gradle/MockAudioRecorder.java
@@ -0,0 +1,37 @@
+package cse.gradle;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import java.io.File;
+
+public class MockAudioRecorder extends AudioRecorder {
+
+    private boolean isRecordingStarted = false;
+
+    @Override
+    public void startRecording(String fileName) {
+        if (!isRecordingStarted) {
+            isRecordingStarted = true;
+            // Simulate the start of recording without actual audio capture
+            simulateRecording(fileName);
+        }
+    }
+
+    @Override
+    public void stopRecording() {
+        if (isRecordingStarted) {
+            // Simulate the stop of recording without actual audio capture
+            isRecordingStarted = false;
+        }
+    }
+
+    // Simulate the recording process without actual audio capture
+    private void simulateRecording(String fileName) {
+        try {
+            AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(new File(fileName));
+            audioInputStream.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/app/src/main/java/cse/gradle/MockModel.java b/app/src/main/java/cse/gradle/MockModel.java
@@ -9,7 +9,7 @@ public class MockModel extends Model {
 
     public MockModel() {
         // call the super constructor with the test server url
-        super(mockUrlString); 
+        super(mockUrlString);
         // hard code the user id to be the test user
         this.userId = mockUserId;
     }

diff --git a/app/src/main/java/cse/gradle/Model.java b/app/src/main/java/cse/gradle/Model.java
@@ -24,9 +24,7 @@
 import java.net.URISyntaxException;
 
 import java.io.*;
-import java.net.*;
 import java.util.*;
-import org.json.*;
 
 public class Model implements ModelSubject {
     protected String userId;