Merge branch 'main' into dev/audio_worklet

kunitoki · Dec 3, 2024 · 13b0602 · 13b0602
2 parents 76d0127 + db9d0b4
commit 13b0602
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/tests/juce_core/juce_ReferenceCountedObject.cpp b/tests/juce_core/juce_ReferenceCountedObject.cpp
@@ -74,7 +74,7 @@ TEST (ReferenceCountedObjectTests, DecReferenceCountWithoutDeleting)
     EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
     EXPECT_EQ (obj->getReferenceCount(), 0);
 
-    delete obj;
+    obj = nullptr;
 }
 
 TEST (ReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
@@ -85,7 +85,7 @@ TEST (ReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
     EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
     EXPECT_EQ (obj->getReferenceCount(), 0);
 
-    delete obj;
+    obj = nullptr;
 }
 
 // SingleThreadedReferenceCountedObject tests
@@ -125,7 +125,7 @@ TEST (SingleThreadedReferenceCountedObjectTests, DecReferenceCountWithoutDeletin
     EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
     EXPECT_EQ (obj->getReferenceCount(), 0);
 
-    delete obj;
+    obj = nullptr;
 }
 
 TEST (SingleThreadedReferenceCountedObjectTests, DecConstReferenceCountWithoutDeleting)
@@ -136,7 +136,7 @@ TEST (SingleThreadedReferenceCountedObjectTests, DecConstReferenceCountWithoutDe
     EXPECT_TRUE (obj->decReferenceCountWithoutDeleting());
     EXPECT_EQ (obj->getReferenceCount(), 0);
 
-    delete obj;
+    obj = nullptr;
 }
 
 // ReferenceCountedObjectPtr tests

diff --git a/tests/juce_core/juce_ZipFile.cpp b/tests/juce_core/juce_ZipFile.cpp
@@ -244,7 +244,7 @@ TEST_F (ZipFileTests, CreateStreamForEntryByName)
     ZipFile zip (zipFile);
 
     const ZipFile::ZipEntry* entry = zip.getEntry ("nonexistent.txt");
-    EXPECT_EQ (zip.createStreamForEntry (*entry), nullptr); // Assumes the test.zip does not contain this file
+    ASSERT_EQ (nullptr, entry);
 }
 
 TEST_F (ZipFileTests, UncompressTo)