From cd18642deabca8b6b11fd50071709d59917d69a4 Mon Sep 17 00:00:00 2001 From: Prohich Date: Thu, 24 Oct 2019 19:01:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=98=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD=D1=8B=20=D0=BA=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BA=D0=BE=D0=BC=D0=B5=D0=BD=D0=B4=D1=83=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B=D0=BC=20=D1=81=D0=BE=D0=B3=D0=BB=D0=B0=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=20Golang=20Naming=20Conventions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- homework01-go/caesar/caesar_test.go | 48 ++++++------- homework01-go/rsa/rsa_test.go | 89 ++++++++++++------------- homework01-go/vigenere/vigenere_test.go | 50 +++++++------- 3 files changed, 91 insertions(+), 96 deletions(-) diff --git a/homework01-go/caesar/caesar_test.go b/homework01-go/caesar/caesar_test.go index 765e43c..b55ac6c 100644 --- a/homework01-go/caesar/caesar_test.go +++ b/homework01-go/caesar/caesar_test.go @@ -4,60 +4,60 @@ import "testing" func TestEncryptCaesar(t *testing.T) { result := EncryptCaesar("PYTHON", 3) - expected_result := "SBWKRQ" + expectedResult := "SBWKRQ" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptCaesar("python", 3) - expected_result = "sbwkrq" + expectedResult = "sbwkrq" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptCaesar("Python3.6", 3) - expected_result = "Sbwkrq3.6" + expectedResult = "Sbwkrq3.6" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptCaesar("", 3) - expected_result = "" + expectedResult = "" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } } func TestDecryptCaesar(t *testing.T) { result := DecryptCaesar("SBWKRQ", 3) - expected_result := "PYTHON" + expectedResult := "PYTHON" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptCaesar("sbwkrq", 3) - expected_result = "python" + expectedResult = "python" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptCaesar("Sbwkrq3.6", 3) - expected_result = "Python3.6" + expectedResult = "Python3.6" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptCaesar("", 3) - expected_result = "" + expectedResult = "" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } } diff --git a/homework01-go/rsa/rsa_test.go b/homework01-go/rsa/rsa_test.go index 0681502..fba398f 100644 --- a/homework01-go/rsa/rsa_test.go +++ b/homework01-go/rsa/rsa_test.go @@ -1,69 +1,64 @@ package rsa import ( - "testing" - "reflect" + "reflect" + "testing" ) func TestIsPrime(t *testing.T) { - result := isPrime(2) - expected_result := true - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result := isPrime(2) + expectedResult := true + if result != expectedResult { + t.Fatalf("Expected '%t' but got '%t'", expectedResult, result) + } - result = isPrime(8) - expected_result = false - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result = isPrime(8) + expectedResult = false + if result != expectedResult { + t.Fatalf("Expected '%t' but got '%t'", expectedResult, result) + } - result = isPrime(11) - expected_result = true - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result = isPrime(11) + expectedResult = true + if result != expectedResult { + t.Fatalf("Expected '%t' but got '%t'", expectedResult, result) + } } - func TestGCD(t *testing.T) { - result := gcd(12, 15) - expected_result := 3 - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result := gcd(12, 15) + expectedResult := 3 + if result != expectedResult { + t.Fatalf("Expected '%d' but got '%d'", expectedResult, result) + } - result = gcd(3, 7) - expected_result = 1 - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result = gcd(3, 7) + expectedResult = 1 + if result != expectedResult { + t.Fatalf("Expected '%d' but got '%d'", expectedResult, result) + } } - func TestMultiplicativeInverse(t *testing.T) { - result := multiplicativeInverse(7, 40) - expected_result := 23 - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result := multiplicativeInverse(7, 40) + expectedResult := 23 + if result != expectedResult { + t.Fatalf("Expected '%d' but got '%d'", expectedResult, result) + } } - func TestEncrypt(t *testing.T) { - result := Encrypt(Key{19, 187}, "secret") - expected_result := []int{174, 50, 143, 113, 50, 24} - if !reflect.DeepEqual(result, expected_result) { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result := Encrypt(Key{19, 187}, "secret") + expectedResult := []int{174, 50, 143, 113, 50, 24} + if !reflect.DeepEqual(result, expectedResult) { + t.Fatalf("Expected '%v' but got '%v'", expectedResult, result) + } } - func TestDecrypt(t *testing.T) { - result := Decrypt(Key{59, 187}, []int{174, 50, 143, 113, 50, 24}) - expected_result := "secret" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) - } + result := Decrypt(Key{59, 187}, []int{174, 50, 143, 113, 50, 24}) + expectedResult := "secret" + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) + } } - diff --git a/homework01-go/vigenere/vigenere_test.go b/homework01-go/vigenere/vigenere_test.go index aa303cf..31ed229 100644 --- a/homework01-go/vigenere/vigenere_test.go +++ b/homework01-go/vigenere/vigenere_test.go @@ -1,63 +1,63 @@ -package caesar +package vigenere import "testing" func TestEncryptVigenere(t *testing.T) { result := EncryptVigenere("PYTHON", "A") - expected_result := "PYTHON" + expectedResult := "PYTHON" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptVigenere("python", "a") - expected_result = "python" + expectedResult = "python" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptVigenere("Python3.6", "a") - expected_result = "Python3.6" + expectedResult = "Python3.6" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = EncryptVigenere("ATTACKATDAWN", "LEMON") - expected_result = "LXFOPVEFRNHR" + expectedResult = "LXFOPVEFRNHR" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } } func TestDecryptVigenere(t *testing.T) { result := DecryptVigenere("PYTHON", "A") - expected_result := "PYTHON" + expectedResult := "PYTHON" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptVigenere("python", "a") - expected_result = "python" + expectedResult = "python" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptVigenere("Python3.6", "a") - expected_result = "Python3.6" + expectedResult = "Python3.6" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } result = DecryptVigenere("LXFOPVEFRNHR", "LEMON") - expected_result = "ATTACKATDAWN" + expectedResult = "ATTACKATDAWN" - if result != expected_result { - t.Fatalf("Expected '%s' but got '%s'", expected_result, result) + if result != expectedResult { + t.Fatalf("Expected '%s' but got '%s'", expectedResult, result) } }