beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Slow test refactoring (now using testing.Short())

Browse source
This commit is contained in:
Michael Mayer 2019-04-29 20:09:10 +02:00
parent f242f117f4
commit b079882354
13 changed files with 289 additions and 317 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
internal/photoprism/colors_test.go
View file

@ -12,8 +12,9 @@ func TestMediaFile_GetColors(t *testing.T) {
conf.InitializeTestData(t)
if mediaFile1, err := NewMediaFile(conf.ImportPath() + "/dog.jpg"); err == nil {
colors, main, l, s, err := mediaFile1.Colors()
t.Run("dog.jpg", func(t *testing.T) {
if mediaFile, err := NewMediaFile(conf.ImportPath() + "/dog.jpg"); err == nil {
colors, main, l, s, err := mediaFile.Colors()
t.Log(colors, main, l, s, err)
@ -26,9 +27,11 @@ func TestMediaFile_GetColors(t *testing.T) {
} else {
t.Error(err)
}
})
if mediaFile2, err := NewMediaFile(conf.ImportPath() + "/ape.jpeg"); err == nil {
colors, main, l, s, err := mediaFile2.Colors()
t.Run("ape.jpeg", func(t *testing.T) {
if mediaFile, err := NewMediaFile(conf.ImportPath() + "/ape.jpeg"); err == nil {
colors, main, l, s, err := mediaFile.Colors()
t.Log(colors, main, l, s, err)
@ -41,13 +44,11 @@ func TestMediaFile_GetColors(t *testing.T) {
} else {
t.Error(err)
}
})
if testing.Short() {
return
}
if mediaFile2, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG"); err == nil {
colors, main, l, s, err := mediaFile2.Colors()
t.Run("iphone/IMG_6788.JPG", func(t *testing.T) {
if mediaFile, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG"); err == nil {
colors, main, l, s, err := mediaFile.Colors()
t.Log(colors, main, l, s, err)
@ -59,9 +60,11 @@ func TestMediaFile_GetColors(t *testing.T) {
} else {
t.Error(err)
}
})
if mediaFile3, err := NewMediaFile(conf.ImportPath() + "/raw/20140717_154212_1EC48F8489.jpg"); err == nil {
colors, main, l, s, err := mediaFile3.Colors()
t.Run("raw/20140717_154212_1EC48F8489.jpg", func(t *testing.T) {
if mediaFile, err := NewMediaFile(conf.ImportPath() + "/raw/20140717_154212_1EC48F8489.jpg"); err == nil {
colors, main, l, s, err := mediaFile.Colors()
t.Log(colors, main, l, s, err)
@ -71,8 +74,8 @@ func TestMediaFile_GetColors(t *testing.T) {
assert.Equal(t, "grey", main.Name())
assert.Equal(t, MaterialColors{0x3, 0x2, 0x2, 0x1, 0x2, 0x2, 0x2, 0x2, 0x1}, colors)
} else {
t.Error(err)
}
})
}

104
internal/photoprism/converter_slow_test.go
View file

@ -1,104 +0,0 @@
// +build slow
package photoprism
import (
"os"
"testing"
"github.com/photoprism/photoprism/internal/fsutil"
"github.com/photoprism/photoprism/internal/test"
"github.com/stretchr/testify/assert"
)
func TestConverter_ConvertToJpeg(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
converter := NewConverter(conf.DarktableCli())
jpegFilename := conf.ImportPath() + "/iphone/IMG_6788.JPG"
assert.Truef(t, fsutil.Exists(jpegFilename), "file does not exist: %s", jpegFilename)
t.Logf("Testing RAW to JPEG converter with %s", jpegFilename)
jpegMediaFile, err := NewMediaFile(jpegFilename)
assert.Nil(t, err)
imageJpeg, err := converter.ConvertToJpeg(jpegMediaFile)
assert.Empty(t, err, "ConvertToJpeg() failed")
infoJpeg, err := imageJpeg.GetExifData()
assert.Emptyf(t, err, "GetExifData() failed")
assert.Equal(t, jpegFilename, imageJpeg.filename)
assert.False(t, infoJpeg == nil || err != nil, "Could not read EXIF data of JPEG image")
assert.Equal(t, "iPhone SE", infoJpeg.CameraModel)
rawFilemame := conf.ImportPath() + "/raw/IMG_1435.CR2"
t.Logf("Testing RAW to JPEG converter with %s", rawFilemame)
rawMediaFile, err := NewMediaFile(rawFilemame)
assert.Nil(t, err)
imageRaw, _ := converter.ConvertToJpeg(rawMediaFile)
assert.True(t, fsutil.Exists(conf.ImportPath()+"/raw/IMG_1435.jpg"), "Jpeg file was not found - is Darktable installed?")
assert.NotEqual(t, rawFilemame, imageRaw.filename)
infoRaw, err := imageRaw.GetExifData()
assert.False(t, infoRaw == nil || err != nil, "Could not read EXIF data of RAW image")
assert.Equal(t, "Canon EOS M10", infoRaw.CameraModel)
}
func TestConverter_ConvertAll(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
converter := NewConverter(conf.DarktableCli())
converter.ConvertAll(conf.ImportPath())
jpegFilename := conf.ImportPath() + "/raw/IMG_1435.jpg"
assert.True(t, fsutil.Exists(jpegFilename), "Jpeg file was not found - is Darktable installed?")
image, err := NewMediaFile(jpegFilename)
assert.Nil(t, err)
assert.Equal(t, jpegFilename, image.filename, "FileName must be the same")
infoRaw, err := image.GetExifData()
assert.False(t, infoRaw == nil || err != nil, "Could not read EXIF data of RAW image")
assert.Equal(t, "Canon EOS M10", infoRaw.CameraModel, "Camera model should be Canon EOS M10")
existingJpegFilename := conf.ImportPath() + "/raw/20140717_154212_1EC48F8489.jpg"
oldHash := fsutil.Hash(existingJpegFilename)
os.Remove(existingJpegFilename)
converter.ConvertAll(conf.ImportPath())
newHash := fsutil.Hash(existingJpegFilename)
assert.True(t, fsutil.Exists(existingJpegFilename), "Jpeg file was not found - is Darktable installed?")
assert.NotEqual(t, oldHash, newHash, "Fingerprint of old and new JPEG file must not be the same")
}

102
internal/photoprism/converter_test.go
View file

@ -1,8 +1,10 @@
package photoprism
import (
"os"
"testing"
"github.com/photoprism/photoprism/internal/fsutil"
"github.com/photoprism/photoprism/internal/test"
"github.com/stretchr/testify/assert"
)
@ -14,3 +16,103 @@ func TestNewConverter(t *testing.T) {
assert.IsType(t, &Converter{}, converter)
}
func TestConverter_ConvertToJpeg(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
converter := NewConverter(conf.DarktableCli())
jpegFilename := conf.ImportPath() + "/iphone/IMG_6788.JPG"
assert.Truef(t, fsutil.Exists(jpegFilename), "file does not exist: %s", jpegFilename)
t.Logf("Testing RAW to JPEG converter with %s", jpegFilename)
jpegMediaFile, err := NewMediaFile(jpegFilename)
assert.Nil(t, err)
imageJpeg, err := converter.ConvertToJpeg(jpegMediaFile)
assert.Empty(t, err, "ConvertToJpeg() failed")
infoJpeg, err := imageJpeg.GetExifData()
assert.Emptyf(t, err, "GetExifData() failed")
assert.Equal(t, jpegFilename, imageJpeg.filename)
assert.False(t, infoJpeg == nil || err != nil, "Could not read EXIF data of JPEG image")
assert.Equal(t, "iPhone SE", infoJpeg.CameraModel)
rawFilemame := conf.ImportPath() + "/raw/IMG_1435.CR2"
t.Logf("Testing RAW to JPEG converter with %s", rawFilemame)
rawMediaFile, err := NewMediaFile(rawFilemame)
assert.Nil(t, err)
imageRaw, _ := converter.ConvertToJpeg(rawMediaFile)
assert.True(t, fsutil.Exists(conf.ImportPath()+"/raw/IMG_1435.jpg"), "Jpeg file was not found - is Darktable installed?")
assert.NotEqual(t, rawFilemame, imageRaw.filename)
infoRaw, err := imageRaw.GetExifData()
assert.False(t, infoRaw == nil || err != nil, "Could not read EXIF data of RAW image")
assert.Equal(t, "Canon EOS M10", infoRaw.CameraModel)
}
func TestConverter_ConvertAll(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
converter := NewConverter(conf.DarktableCli())
converter.ConvertAll(conf.ImportPath())
jpegFilename := conf.ImportPath() + "/raw/IMG_1435.jpg"
assert.True(t, fsutil.Exists(jpegFilename), "Jpeg file was not found - is Darktable installed?")
image, err := NewMediaFile(jpegFilename)
assert.Nil(t, err)
assert.Equal(t, jpegFilename, image.filename, "FileName must be the same")
infoRaw, err := image.GetExifData()
assert.False(t, infoRaw == nil || err != nil, "Could not read EXIF data of RAW image")
assert.Equal(t, "Canon EOS M10", infoRaw.CameraModel, "Camera model should be Canon EOS M10")
existingJpegFilename := conf.ImportPath() + "/raw/20140717_154212_1EC48F8489.jpg"
oldHash := fsutil.Hash(existingJpegFilename)
os.Remove(existingJpegFilename)
converter.ConvertAll(conf.ImportPath())
newHash := fsutil.Hash(existingJpegFilename)
assert.True(t, fsutil.Exists(existingJpegFilename), "Jpeg file was not found - is Darktable installed?")
assert.NotEqual(t, oldHash, newHash, "Fingerprint of old and new JPEG file must not be the same")
}

28
internal/photoprism/exif_slow_test.go
View file

@ -1,28 +0,0 @@
// +build slow
package photoprism
import (
"testing"
"github.com/photoprism/photoprism/internal/test"
"github.com/stretchr/testify/assert"
)
func TestMediaFile_GetExifData_Slow(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
image2, err := NewMediaFile(conf.ImportPath() + "/raw/IMG_1435.CR2")
assert.Nil(t, err)
info, err := image2.GetExifData()
assert.Empty(t, err)
assert.IsType(t, &ExifData{}, info)
assert.Equal(t, "Canon EOS M10", info.CameraModel)
}

22
internal/photoprism/exif_test.go
View file

@ -24,3 +24,25 @@ func TestMediaFile_GetExifData(t *testing.T) {
assert.Equal(t, "iPhone SE", info.CameraModel)
}
func TestMediaFile_GetExifData_Slow(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
image2, err := NewMediaFile(conf.ImportPath() + "/raw/IMG_1435.CR2")
assert.Nil(t, err)
info, err := image2.GetExifData()
assert.Empty(t, err)
assert.IsType(t, &ExifData{}, info)
assert.Equal(t, "Canon EOS M10", info.CameraModel)
}

25
internal/photoprism/importer_slow_test.go
View file

@ -1,25 +0,0 @@
// +build slow
package photoprism
import (
"testing"
"github.com/photoprism/photoprism/internal/test"
)
func TestImporter_ImportPhotosFromDirectory(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
indexer := NewIndexer(conf.OriginalsPath(), tensorFlow, conf.Db())
converter := NewConverter(conf.DarktableCli())
importer := NewImporter(conf.OriginalsPath(), indexer, converter)
importer.ImportPhotosFromDirectory(conf.ImportPath())
}

20
internal/photoprism/importer_test.go
View file

@ -43,3 +43,23 @@ func TestImporter_GetDestinationFilename(t *testing.T) {
assert.Equal(t, conf.OriginalsPath()+"/2018/02/20180204_170813_863A6248DCCA.cr2", filename)
}
func TestImporter_ImportPhotosFromDirectory(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
indexer := NewIndexer(conf.OriginalsPath(), tensorFlow, conf.Db())
converter := NewConverter(conf.DarktableCli())
importer := NewImporter(conf.OriginalsPath(), indexer, converter)
importer.ImportPhotosFromDirectory(conf.ImportPath())
}

42
internal/photoprism/mediafile_slow_test.go
View file

@ -1,42 +0,0 @@
// +build slow
package photoprism
import (
"testing"
"github.com/photoprism/photoprism/internal/test"
"github.com/stretchr/testify/assert"
)
func TestMediaFile_GetPerceptiveHash_Slow(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
mediaFile1, err := NewMediaFile(conf.ImportPath() + "/20130203_193332_0AE340D280.jpg")
assert.Nil(t, err)
hash1, _ := mediaFile1.GetPerceptualHash()
assert.Equal(t, "ef95", hash1)
mediaFile2, err := NewMediaFile(conf.ImportPath() + "/20130203_193332_0AE340D280_V2.jpg")
assert.Nil(t, err)
hash2, _ := mediaFile2.GetPerceptualHash()
assert.Equal(t, "6f95", hash2)
distance, _ := mediaFile1.GetPerceptualDistance(hash2)
assert.Equal(t, 1, distance)
mediaFile3, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG")
assert.Nil(t, err)
hash3, _ := mediaFile3.GetPerceptualHash()
assert.Equal(t, "ad73", hash3)
distance, _ = mediaFile1.GetPerceptualDistance(hash3)
assert.Equal(t, 7, distance)
}

36
internal/photoprism/mediafile_test.go
View file

@ -120,3 +120,39 @@ func TestMediaFile_Exists(t *testing.T) {
assert.NotNil(t, err)
assert.Nil(t, mediaFile)
}
func TestMediaFile_GetPerceptiveHash_Slow(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
mediaFile1, err := NewMediaFile(conf.ImportPath() + "/20130203_193332_0AE340D280.jpg")
assert.Nil(t, err)
hash1, _ := mediaFile1.GetPerceptualHash()
assert.Equal(t, "ef95", hash1)
mediaFile2, err := NewMediaFile(conf.ImportPath() + "/20130203_193332_0AE340D280_V2.jpg")
assert.Nil(t, err)
hash2, _ := mediaFile2.GetPerceptualHash()
assert.Equal(t, "6f95", hash2)
distance, _ := mediaFile1.GetPerceptualDistance(hash2)
assert.Equal(t, 1, distance)
mediaFile3, err := NewMediaFile(conf.ImportPath() + "/iphone/IMG_6788.JPG")
assert.Nil(t, err)
hash3, _ := mediaFile3.GetPerceptualHash()
assert.Equal(t, "ad73", hash3)
distance, _ = mediaFile1.GetPerceptualDistance(hash3)
assert.Equal(t, 7, distance)
}

36
internal/photoprism/tensorflow_slow_test.go
View file

@ -1,36 +0,0 @@
// +build slow
package photoprism
import (
"io/ioutil"
"math"
"testing"
"github.com/photoprism/photoprism/internal/test"
"github.com/stretchr/testify/assert"
)
func TestTensorFlow_GetImageTags(t *testing.T) {
conf := test.NewConfig()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
if imageBuffer, err := ioutil.ReadFile(conf.ImportPath() + "/iphone/IMG_6788.JPG"); err != nil {
t.Error(err)
} else {
result, err := tensorFlow.GetImageTags(string(imageBuffer))
assert.NotNil(t, result)
assert.Nil(t, err)
assert.IsType(t, []TensorFlowLabel{}, result)
assert.Equal(t, 5, len(result))
assert.Equal(t, "tabby", result[0].Label)
assert.Equal(t, "tiger cat", result[1].Label)
assert.Equal(t, float64(0.165), math.Round(float64(result[1].Probability)*1000)/1000)
}
}

29
internal/photoprism/tensorflow_test.go
View file

@ -1,6 +1,7 @@
package photoprism
import (
"io/ioutil"
"math"
"testing"
@ -27,3 +28,31 @@ func TestTensorFlow_GetImageTagsFromFile(t *testing.T) {
assert.Equal(t, float64(0.165), math.Round(float64(result[1].Probability)*1000)/1000)
}
func TestTensorFlow_GetImageTags(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
if imageBuffer, err := ioutil.ReadFile(conf.ImportPath() + "/iphone/IMG_6788.JPG"); err != nil {
t.Error(err)
} else {
result, err := tensorFlow.GetImageTags(string(imageBuffer))
assert.NotNil(t, result)
assert.Nil(t, err)
assert.IsType(t, []TensorFlowLabel{}, result)
assert.Equal(t, 5, len(result))
assert.Equal(t, "tabby", result[0].Label)
assert.Equal(t, "tiger cat", result[1].Label)
assert.Equal(t, float64(0.165), math.Round(float64(result[1].Probability)*1000)/1000)
}
}

31
internal/photoprism/thumbnails_slow_test.go
View file

@ -1,31 +0,0 @@
// +build slow
package photoprism
import (
"testing"
"github.com/photoprism/photoprism/internal/test"
)
func TestCreateThumbnailsFromOriginals(t *testing.T) {
conf := test.NewConfig()
conf.CreateDirectories()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
indexer := NewIndexer(conf.OriginalsPath(), tensorFlow, conf.Db())
converter := NewConverter(conf.DarktableCli())
importer := NewImporter(conf.OriginalsPath(), indexer, converter)
importer.ImportPhotosFromDirectory(conf.ImportPath())
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 600, false)
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 300, true)
}

26
internal/photoprism/thumbnails_test.go
View file

@ -40,3 +40,29 @@ func TestMediaFile_GetSquareThumbnail(t *testing.T) {
assert.IsType(t, &MediaFile{}, thumbnail1)
}
func TestCreateThumbnailsFromOriginals(t *testing.T) {
if testing.Short() {
t.Skip("skipping test in short mode.")
}
conf := test.NewConfig()
conf.CreateDirectories()
conf.InitializeTestData(t)
tensorFlow := NewTensorFlow(conf.TensorFlowModelPath())
indexer := NewIndexer(conf.OriginalsPath(), tensorFlow, conf.Db())
converter := NewConverter(conf.DarktableCli())
importer := NewImporter(conf.OriginalsPath(), indexer, converter)
importer.ImportPhotosFromDirectory(conf.ImportPath())
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 600, false)
CreateThumbnailsFromOriginals(conf.OriginalsPath(), conf.ThumbnailsPath(), 300, true)
}