update tests to make it all work

Author: Simon Emms

components/licensor/ee/pkg/licensor/licensor_test.go

@@ -140,103 +140,33 @@ func (test *licenseTest) Run(t *testing.T) {
 	})
 }
 
-func TestSeats(t *testing.T) {
-	tests := []struct {
-		Name           string
-		Licensed       int
-		Probe          int
-		WithinLimits   bool
-		DefaultLicense bool
-		InvalidLicense bool
-		LicenseType    LicenseType
-		NeverExpires   bool
-	}{
-		{"Gitpod: unlimited seats", 0, 1000, true, false, false, LicenseTypeGitpod, false},
-		{"Gitpod: within limited seats", 50, 40, true, false, false, LicenseTypeGitpod, false},
-		{"Gitpod: within limited seats (edge)", 50, 50, true, false, false, LicenseTypeGitpod, false},
-		{"Gitpod: beyond limited seats", 50, 150, false, false, false, LicenseTypeGitpod, false},
-		{"Gitpod: beyond limited seats (edge)", 50, 51, false, false, false, LicenseTypeGitpod, false},
-		{"Gitpod: invalid license", 50, 50, false, false, true, LicenseTypeGitpod, false},
-		{"Gitpod: within default license seats", 0, 7, true, true, false, LicenseTypeGitpod, false},
-		{"Gitpod: within default license seats (edge)", 0, 10, true, true, false, LicenseTypeGitpod, false},
-		{"Gitpod: beyond default license seats", 0, 11, false, true, false, LicenseTypeGitpod, false},
-
-		// correctly missing the default license tests as Replicated always has a license
-		{"Replicated: unlimited seats", 0, 1000, true, false, false, LicenseTypeReplicated, false},
-		{"Replicated: within limited seats", 50, 40, true, false, false, LicenseTypeReplicated, false},
-		{"Replicated: within limited seats (edge)", 50, 50, true, false, false, LicenseTypeReplicated, false},
-		{"Replicated: beyond limited seats", 50, 150, false, false, false, LicenseTypeReplicated, false},
-		{"Replicated: beyond limited seats (edge)", 50, 51, false, false, false, LicenseTypeReplicated, false},
-		{"Replicated: invalid license", 50, 50, false, false, true, LicenseTypeReplicated, false},
-		{"Replicated: beyond default license seats", 0, 11, false, true, false, LicenseTypeReplicated, false},
-
-		{"Replicated: unlimited seats", 0, 1000, true, false, false, LicenseTypeReplicated, true},
-		{"Replicated: within limited seats", 50, 40, true, false, false, LicenseTypeReplicated, true},
-		{"Replicated: within limited seats (edge)", 50, 50, true, false, false, LicenseTypeReplicated, true},
-		{"Replicated: beyond limited seats", 50, 150, false, false, false, LicenseTypeReplicated, true},
-		{"Replicated: beyond limited seats (edge)", 50, 51, false, false, false, LicenseTypeReplicated, true},
-		{"Replicated: invalid license", 50, 50, false, false, true, LicenseTypeReplicated, true},
-		{"Replicated: beyond default license seats", 0, 11, false, true, false, LicenseTypeReplicated, true},
-		{"Replicated: invalid license within default seats", 50, 5, true, false, true, LicenseTypeReplicated, false},
-	}
-
-	for _, test := range tests {
-		validUntil := time.Now().Add(6 * time.Hour)
-		if test.InvalidLicense {
-			validUntil = time.Now().Add(-6 * time.Hour)
-		}
-
-		lt := licenseTest{
-			Name: test.Name,
-			License: &LicensePayload{
-				ID:         someID,
-				Domain:     domain,
-				Level:      LevelTeam,
-				Seats:      test.Licensed,
-				ValidUntil: validUntil,
-			},
-			Validate: func(t *testing.T, eval *Evaluator) {
-				withinLimits := eval.HasEnoughSeats(test.Probe)
-				if withinLimits != test.WithinLimits {
-					t.Errorf("HasEnoughSeats did not behave as expected: lic=%d probe=%d expected=%v actual=%v", test.Licensed, test.Probe, test.WithinLimits, withinLimits)
-				}
-			},
-			Type:         test.LicenseType,
-			NeverExpires: test.NeverExpires,
-		}
-		if test.DefaultLicense {
-			lt.License = nil
-		}
-		lt.Run(t)
-	}
-}
-
 func TestFeatures(t *testing.T) {
 	tests := []struct {
 		Name           string
 		DefaultLicense bool
 		Level          LicenseLevel
 		Features       []Feature
 		LicenseType    LicenseType
+		Seats          int
 	}{
-		{"Gitpod: no license", true, LicenseLevel(0), []Feature{FeaturePrebuild, FeatureAdminDashboard}, LicenseTypeGitpod},
-		{"Gitpod: invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeGitpod},
+		{"Gitpod: no license", true, LicenseLevel(0), []Feature{FeaturePrebuild, FeatureAdminDashboard}, LicenseTypeGitpod, 1},
+		{"Gitpod: invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeGitpod, 1},
 		{"Gitpod: enterprise license", false, LevelEnterprise, []Feature{
 			FeatureAdminDashboard,
 			FeatureSetTimeout,
 			FeatureWorkspaceSharing,
 			FeatureSnapshot,
 			FeaturePrebuild,
-		}, LicenseTypeGitpod},
+		}, LicenseTypeGitpod, 1},
 
-		{"Replicated: invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeReplicated},
+		{"Replicated: invalid license level", false, LicenseLevel(666), []Feature{}, LicenseTypeReplicated, 1},
 		{"Replicated: enterprise license", false, LevelEnterprise, []Feature{
 			FeatureAdminDashboard,
 			FeatureSetTimeout,
 			FeatureWorkspaceSharing,
 			FeatureSnapshot,
 			FeaturePrebuild,
-		}, LicenseTypeReplicated},
+		}, LicenseTypeReplicated, 1},
 	}
 
 	for _, test := range tests {
@@ -261,13 +191,13 @@ func TestFeatures(t *testing.T) {
 				for _, f := range test.Features {
 					delete(unavailableFeatures, f)
 
-					if !eval.Enabled(f) {
+					if !eval.Enabled(f, test.Seats) {
 						t.Errorf("license does not enable %s, but should", f)
 					}
 				}
 
 				for f := range unavailableFeatures {
-					if eval.Enabled(f) {
+					if eval.Enabled(f, test.Seats) {
 						t.Errorf("license not enables %s, but shouldn't", f)
 					}
 				}