Use constant

Author: theory

tests/common/mod.rs

@@ -207,7 +207,7 @@ pub fn test_tags_schema(mut compiler: Compiler, version: u8) -> Result<(), Box<d
     Ok(())
 }
 
-pub fn test_schema_version(version: i8) -> Result<(), Box<dyn Error>> {
+pub fn test_schema_version(version: u8) -> Result<(), Box<dyn Error>> {
     let mut compiler = Compiler::new();
     compiler.enable_format_assertions();
     let mut loaded: HashMap<String, Vec<Value>> = HashMap::new();

tests/v1_schema_test.rs

@@ -10,9 +10,11 @@ use serde_json::{json, Map, Value};
 mod common;
 use common::*;
 
+const SCHEMA_VERSION: u8 = 1;
+
 #[test]
 fn test_schema_v1() -> Result<(), Box<dyn Error>> {
-    test_schema_version(1)
+    test_schema_version(SCHEMA_VERSION)
 }
 
 #[derive(Deserialize, Serialize)]
@@ -27,7 +29,7 @@ fn test_corpus_v1_valid() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the root schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "distribution");
+    let id = id_for(SCHEMA_VERSION, "distribution");
     let index = compiler.compile(&id, &mut schemas)?;
 
     // Test each meta JSON in the corpus.
@@ -50,7 +52,7 @@ fn test_corpus_v1_invalid() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the root schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "distribution");
+    let id = id_for(SCHEMA_VERSION, "distribution");
     let index = compiler.compile(&id, &mut schemas)?;
 
     // Test each meta JSON in the corpus.
@@ -75,22 +77,22 @@ fn test_corpus_v1_invalid() -> Result<(), Box<dyn Error>> {
 fn test_v1_term() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the term schema.
     let compiler = new_compiler("schema/v1")?;
-    test_term_schema(compiler, 1)
+    test_term_schema(compiler, SCHEMA_VERSION)
 }
 
 #[test]
 fn test_v1_tags() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the tags schema.
     let compiler = new_compiler("schema/v1")?;
-    test_tags_schema(compiler, 1)
+    test_tags_schema(compiler, SCHEMA_VERSION)
 }
 
 #[test]
 fn test_v1_version() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the version schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "version");
+    let id = id_for(SCHEMA_VERSION, "version");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_version in VALID_SEMVERS {
@@ -115,7 +117,7 @@ fn test_v1_version_range() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the version_range schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "version_range");
+    let id = id_for(SCHEMA_VERSION, "version_range");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_version in VALID_SEMVERS {
@@ -186,7 +188,7 @@ fn test_v1_license() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the license schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "license");
+    let id = id_for(SCHEMA_VERSION, "license");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     // Test valid license values.
@@ -254,7 +256,7 @@ fn test_v1_provides() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the provides schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "provides");
+    let id = id_for(SCHEMA_VERSION, "provides");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_provides in [
@@ -353,7 +355,7 @@ fn test_v1_extension() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the extension schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "extension");
+    let id = id_for(SCHEMA_VERSION, "extension");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_extension in [
@@ -529,7 +531,7 @@ fn test_v1_maintainer() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "maintainer");
+    let id = id_for(SCHEMA_VERSION, "maintainer");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_maintainer in [
@@ -578,7 +580,7 @@ fn test_v1_meta_spec() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "meta-spec");
+    let id = id_for(SCHEMA_VERSION, "meta-spec");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_meta_spec in [
@@ -632,7 +634,7 @@ fn test_v1_bugtracker() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "bugtracker");
+    let id = id_for(SCHEMA_VERSION, "bugtracker");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_bugtracker in [
@@ -686,7 +688,7 @@ fn test_v1_no_index() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "no_index");
+    let id = id_for(SCHEMA_VERSION, "no_index");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_no_index in [
@@ -751,7 +753,7 @@ fn test_v1_prereq_relationship() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "prereq_relationship");
+    let id = id_for(SCHEMA_VERSION, "prereq_relationship");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_prereq_relationship in [
@@ -804,7 +806,7 @@ fn test_v1_prereq_phase() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "prereq_phase");
+    let id = id_for(SCHEMA_VERSION, "prereq_phase");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_prereq_phase in [
@@ -916,7 +918,7 @@ fn test_v1_prereqs() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the maintainer schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "prereqs");
+    let id = id_for(SCHEMA_VERSION, "prereqs");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_prereqs in [
@@ -1064,7 +1066,7 @@ fn test_v1_repository() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the repository schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "repository");
+    let id = id_for(SCHEMA_VERSION, "repository");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_repository in [
@@ -1141,7 +1143,7 @@ fn test_v1_resources() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the resources schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "resources");
+    let id = id_for(SCHEMA_VERSION, "resources");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_resources in [
@@ -1278,7 +1280,7 @@ fn test_v1_distribution() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the distribution schema.
     let mut compiler = new_compiler("schema/v1")?;
     let mut schemas = Schemas::new();
-    let id = id_for(1, "distribution");
+    let id = id_for(SCHEMA_VERSION, "distribution");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     // Make sure the valid distribution is in fact valid.

tests/v2_schema_test.rs

@@ -7,31 +7,33 @@ use serde_json::json;
 mod common;
 use common::*;
 
+const SCHEMA_VERSION: u8 = 2;
+
 #[test]
 fn test_schema_v1() -> Result<(), Box<dyn Error>> {
-    test_schema_version(2)
+    test_schema_version(SCHEMA_VERSION)
 }
 
 #[test]
 fn test_v2_term() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the term schema.
     let compiler = new_compiler("schema/v2")?;
-    test_term_schema(compiler, 2)
+    test_term_schema(compiler, SCHEMA_VERSION)
 }
 
 #[test]
 fn test_v2_tags() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the tags schema.
     let compiler = new_compiler("schema/v2")?;
-    test_tags_schema(compiler, 2)
+    test_tags_schema(compiler, SCHEMA_VERSION)
 }
 
 #[test]
 fn test_v2_semver() -> Result<(), Box<dyn Error>> {
     // Load the schemas and compile the semver schema.
     let mut compiler = new_compiler("schema/v2")?;
     let mut schemas = Schemas::new();
-    let id = id_for(2, "semver");
+    let id = id_for(SCHEMA_VERSION, "semver");
     let idx = compiler.compile(&id, &mut schemas)?;
 
     for valid_version in VALID_SEMVERS {