Standardize unit test hocon config

akkadotnet · Mar 5, 2021 · 7276967 · 7276967
1 parent 4093ef1
commit 7276967
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 37 deletions.
diff --git a/src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlJournalJsonSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlJournalJsonSpec.cs
@@ -21,7 +21,7 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString(@"
-            akka.persistence {
+                akka.persistence {
                     publish-plugin-commands = on
                     journal {
                         plugin = ""akka.persistence.journal.postgresql""
@@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                             stored-as = ""jsonb""
                         }
                     }
-                }");
+                }
+                akka.test.single-expect-default = 10s");
         }
 
         // TODO: hack. Replace when https://github.com/akkadotnet/akka.net/issues/3811

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlSnapshotStoreJsonSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Json/PostgreSqlSnapshotStoreJsonSpec.cs
@@ -21,7 +21,7 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString(@"
-            akka.persistence {
+                akka.persistence {
                     publish-plugin-commands = on
                     snapshot-store {
                         plugin = ""akka.persistence.snapshot-store.postgresql""
@@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
                             stored-as = ""JSONB""
                         }
                     }
-                }");
+                }
+                akka.test.single-expect-default = 10s");
         }
 
 

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Performance/PostgreSqlJournalPerfSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Performance/PostgreSqlJournalPerfSpec.cs
@@ -29,14 +29,13 @@ private static Config CreateSpecConfig(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString(@"
-            akka.loglevel = INFO
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
                 auto-initialize = on
                 connection-string = """ + DbUtils.ConnectionString + @"""
             }
-            akka.test.single-expect-default = 3s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());
         }

diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalConnectionFailureSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalConnectionFailureSpec.cs
@@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                             connection-string = """ + connectionString + @"""
                         }
                     }
-                }";
+                }
+                akka.test.single-expect-default = 10s";
 
             return ConfigurationFactory.ParseString(config);
         }

diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlJournalSpec.cs
@@ -34,7 +34,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                             connection-string = """ + DbUtils.ConnectionString + @"""
                         }
                     }
-                }";
+                }
+                akka.test.single-expect-default = 10s";
 
             return ConfigurationFactory.ParseString(config);
         }

diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreConnectionFailureSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreConnectionFailureSpec.cs
@@ -37,7 +37,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
                             connection-string = """ + connectionString + @"""
                         }
                     }
-                }";
+                }
+                akka.test.single-expect-default = 10s";
 
             return ConfigurationFactory.ParseString(config);
         }

diff --git a/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/PostgreSqlSnapshotStoreSpec.cs
@@ -35,7 +35,8 @@ class = ""Akka.Persistence.PostgreSql.Snapshot.PostgreSqlSnapshotStore, Akka.Per
                             connection-string = """ + DbUtils.ConnectionString + @"""
                         }
                     }
-                }";
+                }
+                akka.test.single-expect-default = 10s";
 
             return ConfigurationFactory.ParseString(config);
         }

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlAllEventsSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlAllEventsSpec.cs
@@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
-            akka.test.single-expect-default = 10s
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
@@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                 connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentAllEventsSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentAllEventsSpec.cs
@@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
-            akka.test.single-expect-default = 10s
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
@@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                 connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByPersistenceIdSpec.cs
@@ -23,17 +23,16 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
                 plugin-dispatcher = ""akka.actor.default-dispatcher""
                 table-name = event_journal
                 auto-initialize = on
-                connection-string = """ + DbUtils.ConnectionString + @"""
+                connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByTagSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentEventsByTagSpec.cs
@@ -26,7 +26,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 event-adapters {{
@@ -39,10 +38,10 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                 plugin-dispatcher = ""akka.actor.default-dispatcher""
                 table-name = event_journal
                 auto-initialize = on
-                connection-string = """ + DbUtils.ConnectionString + @"""
+                connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentPersistenceIdsSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlCurrentPersistenceIdsSpec.cs
@@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
-            akka.test.single-expect-default = 10s
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
@@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                 connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByPersistenceIdSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByPersistenceIdSpec.cs
@@ -23,17 +23,16 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
                 plugin-dispatcher = ""akka.actor.default-dispatcher""
                 table-name = event_journal
                 auto-initialize = on
-                connection-string = """ + DbUtils.ConnectionString + @"""
+                connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByTagSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlEventsByTagSpec.cs
@@ -23,7 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 event-adapters {{
@@ -34,12 +33,11 @@ private static Config Initialize(PostgresFixture fixture)
                 }}
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
                 plugin-dispatcher = ""akka.actor.default-dispatcher""
-                table-name = event_journal
                 auto-initialize = on
-                connection-string = """ + DbUtils.ConnectionString + @"""
+                connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlPersistenceIdsSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Query/PostgreSqlPersistenceIdsSpec.cs
@@ -23,8 +23,6 @@ private static Config Initialize(PostgresFixture fixture)
             DbUtils.Initialize(fixture);
 
             return ConfigurationFactory.ParseString($@"
-            akka.loglevel = INFO
-            akka.test.single-expect-default = 10s
             akka.persistence.journal.plugin = ""akka.persistence.journal.postgresql""
             akka.persistence.journal.postgresql {{
                 class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistence.PostgreSql""
@@ -34,7 +32,7 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                 connection-string = ""{DbUtils.ConnectionString}""
                 refresh-interval = 1s
             }}
-            akka.test.single-expect-default = 15s")
+            akka.test.single-expect-default = 10s")
                 .WithFallback(PostgreSqlPersistence.DefaultConfiguration())
                 .WithFallback(SqlReadJournal.DefaultConfiguration())
                 .WithFallback(Persistence.DefaultConfig());

diff --git a/src/Akka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlJournalSerializationSpec.cs b/src/Akka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlJournalSerializationSpec.cs
@@ -39,7 +39,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                             connection-string = """ + DbUtils.ConnectionString + @"""
                         }
                     }
-                }");
+                }
+                akka.test.single-expect-default = 10s");
         }
 
         [Fact(Skip = "Sql plugin does not support EventAdapter.Manifest")]

diff --git a/...ka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlSnapshotStoreSerializationSpec.cs b/...ka.Persistence.PostgreSql.Tests/Serialization/PostgreSqlSnapshotStoreSerializationSpec.cs
@@ -39,7 +39,8 @@ class = ""Akka.Persistence.PostgreSql.Journal.PostgreSqlJournal, Akka.Persistenc
                             connection-string = """ + DbUtils.ConnectionString + @"""
                         }
                     }
-                }");
+                }
+                akka.test.single-expect-default = 10s");
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                                 connection-string = """ + connectionString + @"""
                             }
                         }
-                    }";
+                    }
+                    akka.test.single-expect-default = 10s";
                 return ConfigurationFactory.ParseString(config);
             }
@@ Expand Down @@