style(tests): ShouldNot(HaveOccurred()) -> Should(Succeed())

0xERR0R · Dec 1, 2023 · fe5c753 · fe5c753
1 parent a330174
commit fe5c753
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -278,7 +278,7 @@ blocking:
 				data := "bootstrapDns: 0.0.0.0"
 
 				err := unmarshalConfig([]byte(data), &cfg)
-				Expect(err).ShouldNot(HaveOccurred())
+				Expect(err).Should(Succeed())
 				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("0.0.0.0"))
 			})
 			It("should be backwards compatible to 'single item definition'", func() {
@@ -290,7 +290,7 @@ bootstrapDns:
     - 0.0.0.0
 `
 				err := unmarshalConfig([]byte(data), &cfg)
-				Expect(err).ShouldNot(HaveOccurred())
+				Expect(err).Should(Succeed())
 				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("dns.example.com"))
 				Expect(cfg.BootstrapDNS[0].IPs).Should(HaveLen(1))
 			})
@@ -304,7 +304,7 @@ bootstrapDns:
   - upstream: 1.2.3.4
 `
 				err := unmarshalConfig([]byte(data), &cfg)
-				Expect(err).ShouldNot(HaveOccurred())
+				Expect(err).Should(Succeed())
 				Expect(cfg.BootstrapDNS).Should(HaveLen(2))
 				Expect(cfg.BootstrapDNS[0].Upstream.Host).Should(Equal("dns.example.com"))
 				Expect(cfg.BootstrapDNS[0].Upstream.Net).Should(Equal(NetProtocolTcpTls))

diff --git a/resolver/ecs_resolver_test.go b/resolver/ecs_resolver_test.go
@@ -42,7 +42,7 @@ var _ = Describe("EcsResolver", func() {
 		DeferCleanup(cancelFn)
 
 		err = defaults.Set(&sutConfig)
-		Expect(err).ShouldNot(HaveOccurred())
+		Expect(err).Should(Succeed())
 
 		mockAnswer = new(dns.Msg)
 		origIP = net.ParseIP("1.2.3.4")
@@ -184,7 +184,7 @@ var _ = Describe("EcsResolver", func() {
 			mask := config.ECSv4Mask(24)
 
 			mip, err := maskIP(ip, mask)
-			Expect(err).ShouldNot(HaveOccurred())
+			Expect(err).Should(Succeed())
 			Expect(mip).Should(Equal(net.ParseIP("192.168.10.0").To4()))
 		})
 	})

diff --git a/resolver/parallel_best_resolver_test.go b/resolver/parallel_best_resolver_test.go
@@ -120,7 +120,7 @@ var _ = Describe("ParallelBestResolver", Label("parallelBestResolver"), func() {
 				sutVerify = noVerifyUpstreams
 			})
 			It("should start", func() {
-				Expect(err).ShouldNot(HaveOccurred())
+				Expect(err).Should(Succeed())
 			})
 		})
 	})

diff --git a/resolver/strict_resolver_test.go b/resolver/strict_resolver_test.go
@@ -112,7 +112,7 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 		})
 
 		It("should start normally", func() {
-			Expect(err).ShouldNot(HaveOccurred())
+			Expect(err).Should(Succeed())
 		})
 	})
 
@@ -138,7 +138,7 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 				sutVerify = noVerifyUpstreams
 			})
 			It("should start", func() {
-				Expect(err).ShouldNot(HaveOccurred())
+				Expect(err).Should(Succeed())
 			})
 		})
 	})