FMWK-559-read-after-parameter

- tests update
aerospike · Oct 1, 2024 · 6ef9150 · 6ef9150
1 parent 3890ef9
commit 6ef9150
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 25 deletions.
diff --git a/io/azure/blob/reader_writer_test.go b/io/azure/blob/reader_writer_test.go
@@ -37,6 +37,7 @@ const (
 	testReadFolderWithData       = "folder_read_with_data/"
 	testReadFolderMixedData      = "folder_read_mixed_data/"
 	testReadFolderOneFile        = "folder_read_one_file/"
+	testReadFolderWithMarker     = "folder_read_with_marker/"
 	testWriteFolderEmpty         = "folder_write_empty/"
 	testWriteFolderWithData      = "folder_write_with_data/"
 	testWriteFolderWithDataError = "folder_write_with_data_error/"
@@ -113,7 +114,7 @@ func fillTestData(ctx context.Context, client *azblob.Client) error {
 			return err
 		}
 
-		fileName = fmt.Sprintf("%s%s", testWriteFolderWithData, fmt.Sprintf(testFileNameTemplate, i))
+		fileName = fmt.Sprintf("%s%s", testReadFolderWithMarker, fmt.Sprintf(testFileNameTemplate, i))
 		if _, err := client.UploadStream(ctx, testContainerName, fileName, strings.NewReader(testFileContent), nil); err != nil {
 			return err
 		}
@@ -521,12 +522,14 @@ func (s *AzureSuite) TestReader_WithMarker() {
 	client, err := azblob.NewClientWithSharedKeyCredential(testServiceAddress, cred, nil)
 	s.Require().NoError(err)
 
+	marker := fmt.Sprintf("%s%s", testReadFolderWithMarker, fmt.Sprintf(testFileNameTemplate, 2))
+
 	reader, err := NewReader(
 		ctx,
 		client,
 		testContainerName,
-		WithDir(testReadFolderEmpty),
-		WithMarker(testReadFolderEmpty),
+		WithDir(testReadFolderWithMarker),
+		WithMarker(marker),
 	)
 	s.Require().NoError(err)
 
@@ -543,7 +546,7 @@ func (s *AzureSuite) TestReader_WithMarker() {
 			s.Require().NoError(err)
 		case _, ok := <-rCH:
 			if !ok {
-				require.Equal(s.T(), 0, filesCounter)
+				require.Equal(s.T(), 2, filesCounter)
 				return
 			}
 			filesCounter++

diff --git a/io/gcp/storage/reader_writer_test.go b/io/gcp/storage/reader_writer_test.go
@@ -30,24 +30,25 @@ import (
 )
 
 const (
-	testServiceAddress           = "http://127.0.0.1:4443/storage/v1/b"
-	testProjectID                = "test-project"
-	testBucketName               = "test-bucket"
-	testReadFolderEmpty          = "folder_read_empty/"
-	testReadFolderWithData       = "folder_read_with_data/"
-	testReadFolderMixedData      = "folder_read_mixed_data/"
-	testReadFolderOneFile        = "folder_read_one_file/"
-	testWriteFolderEmpty         = "folder_write_empty/"
-	testWriteFolderWithData      = "folder_write_with_data/"
-	testWriteFolderWithDataError = "folder_write_with_data_error/"
-	testWriteFolderMixedData     = "folder_write_mixed_data/"
-	testWriteFolderOneFile       = "folder_write_one_file/"
-	testFileNameTemplate         = "backup_%d.asb"
-	testFileNameTemplateWrong    = "file_%d.zip"
-	testFileNameOneFile          = "one_file.any"
-	testFileContent              = "content"
-	testFileContentLength        = 7
-	testFilesNumber              = 5
+	testServiceAddress            = "http://127.0.0.1:4443/storage/v1/b"
+	testProjectID                 = "test-project"
+	testBucketName                = "test-bucket"
+	testReadFolderEmpty           = "folder_read_empty/"
+	testReadFolderWithData        = "folder_read_with_data/"
+	testReadFolderMixedData       = "folder_read_mixed_data/"
+	testReadFolderOneFile         = "folder_read_one_file/"
+	testReadFolderWithStartOffset = "folder_read_with_start_offset/"
+	testWriteFolderEmpty          = "folder_write_empty/"
+	testWriteFolderWithData       = "folder_write_with_data/"
+	testWriteFolderWithDataError  = "folder_write_with_data_error/"
+	testWriteFolderMixedData      = "folder_write_mixed_data/"
+	testWriteFolderOneFile        = "folder_write_one_file/"
+	testFileNameTemplate          = "backup_%d.asb"
+	testFileNameTemplateWrong     = "file_%d.zip"
+	testFileNameOneFile           = "one_file.any"
+	testFileContent               = "content"
+	testFileContentLength         = 7
+	testFilesNumber               = 5
 )
 
 type GCPSuite struct {
@@ -119,6 +120,13 @@ func fillTestData(ctx context.Context, client *storage.Client) error {
 		if err := writeContent(sw, testFileContent); err != nil {
 			return err
 		}
+
+		fileName = fmt.Sprintf("%s%s", testReadFolderWithStartOffset, fmt.Sprintf(testFileNameTemplate, i))
+		sw = client.Bucket(testBucketName).Object(fileName).NewWriter(ctx)
+		sw.ContentType = fileType
+		if err := writeContent(sw, testFileContent); err != nil {
+			return err
+		}
 		// for writing tests.
 		fileName = fmt.Sprintf("%s%s", testWriteFolderWithData, fmt.Sprintf(testFileNameTemplate, i))
 		sw = client.Bucket(testBucketName).Object(fileName).NewWriter(ctx)
@@ -593,12 +601,14 @@ func (s *GCPSuite) TestReader_WithStartOffset() {
 	)
 	s.Require().NoError(err)
 
+	startOffset := fmt.Sprintf("%s%s", testReadFolderWithStartOffset, fmt.Sprintf(testFileNameTemplate, 2))
+
 	reader, err := NewReader(
 		ctx,
 		client,
 		testBucketName,
-		WithDir(testReadFolderEmpty),
-		WithStartOffset(testReadFolderEmpty),
+		WithDir(testReadFolderWithStartOffset),
+		WithStartOffset(startOffset),
 	)
 	s.Require().NoError(err)
 
@@ -615,7 +625,7 @@ func (s *GCPSuite) TestReader_WithStartOffset() {
 			s.Require().NoError(err)
 		case _, ok := <-rCH:
 			if !ok {
-				require.Equal(s.T(), 0, filesCounter)
+				require.Equal(s.T(), 3, filesCounter)
 				return
 			}
 			filesCounter++