@@ -193,75 +193,75 @@ std::vector<IncTestData> inc_values = {
193193 {version_weaver::version{" 1" , " 2" , " 3" }, " 1.2.3" ,
194194 version_weaver::release_type::MAJOR, " 2.0.0" ,
195195 version_weaver::version{" 2" , " 0" , " 0" }},
196- {version_weaver::version{" 1" , " 2" , " 3" }, " 1.2.3" ,
197- version_weaver::release_type::MINOR, " 1.3.0" ,
198- version_weaver::version{" 1" , " 3" , " 0" }},
199- {version_weaver::version{" 1" , " 2" , " 3" }, " 1.2.3" ,
200- version_weaver::release_type::PATCH, " 1.2.4" ,
201- version_weaver::version{" 1" , " 2" , " 4" }},
202- {version_weaver::version{" 1" , " 2" , " 3" , " tag" }, " 1.2.3-tag" ,
203- version_weaver::release_type::MAJOR, " 2.0.0" ,
204- version_weaver::version{" 2" , " 0" , " 0" }},
205- {version_weaver::version{" 1" , " 2" , " 3" }, " 1.2.3" ,
206- static_cast <version_weaver::release_type>(-1 ), " " ,
207- std::unexpected (version_weaver::parse_error::INVALID_RELEASE_TYPE)},
208- {version_weaver::version{" 1" , " 2" , " 0" , " 0" }, " 1.2.0-0" ,
209- version_weaver::release_type::PATCH, " 1.2.0" ,
210- version_weaver::version{" 1" , " 2" , " 0" }},
211- {version_weaver::version{" fake" }, " fake" ,
212- version_weaver::release_type::MAJOR, " " ,
213- std::unexpected (version_weaver::parse_error::INVALID_MAJOR)},
214- {version_weaver::version{" 1" , " 2" , " 3" , " 4" }, " 1.2.3-4" ,
215- version_weaver::release_type::MAJOR, " 2.0.0" ,
216- version_weaver::version{" 2" , " 0" , " 0" }},
217- {version_weaver::version{" 1" , " 2" , " 3" , " 4" }, " 1.2.3-4" ,
218- version_weaver::release_type::MINOR, " 1.3.0" ,
219- version_weaver::version{" 1" , " 3" , " 0" }},
220- {version_weaver::version{" 1" , " 2" , " 3" , " 4" }, " 1.2.3-4" ,
221- version_weaver::release_type::PATCH, " 1.2.3" ,
222- version_weaver::version{" 1" , " 2" , " 3" }},
223- {version_weaver::version{" 1" , " 2" , " 3" , " alpha.0.beta" },
224- " 1.2.3-alpha.0.beta" , version_weaver::release_type::MAJOR, " 2.0.0" ,
225- version_weaver::version{" 2" , " 0" , " 0" }},
226- {version_weaver::version{" 1" , " 2" , " 3" , " alpha.0.beta" },
227- " 1.2.3-alpha.0.beta" , version_weaver::release_type::MINOR, " 1.3.0" ,
228- version_weaver::version{" 1" , " 3" , " 0" }},
229- {version_weaver::version{" 1" , " 2" , " 3" , " alpha.0.beta" },
230- " 1.2.3-alpha.0.beta" , version_weaver::release_type::PATCH, " 1.2.3" ,
231- version_weaver::version{" 1" , " 2" , " 3" }},
232- {version_weaver::version{" 1" , " 2" , " 0" }, " 1.2.0" ,
233- version_weaver::release_type::PRE_MAJOR, " 2.0.0-0" ,
234- version_weaver::version{" 2" , " 0" , " 0" , " 0" }},
235- {version_weaver::version{" 1" , " 2" , " 0" }, " 1.2.0" ,
236- version_weaver::release_type::PRE_MINOR, " 1.3.0-0" ,
237- version_weaver::version{" 1" , " 3" , " 0" , " 0" }},
238- {version_weaver::version{" 1" , " 2" , " 3" , " 1" }, " 1.2.3-1" ,
239- version_weaver::release_type::PRE_MINOR, " 1.3.0-0" ,
240- version_weaver::version{" 1" , " 3" , " 0" , " 0" }},
241- {version_weaver::version{" 1" , " 2" , " 0" }, " 1.2.0" ,
242- version_weaver::release_type::PRE_PATCH, " 1.2.1-0" ,
243- version_weaver::version{" 1" , " 2" , " 1" , " 0" }},
244- {version_weaver::version{" 1" , " 2" , " 0" , " 1" }, " 1.2.0-1" ,
245- version_weaver::release_type::PRE_PATCH, " 1.2.1-0" ,
246- version_weaver::version{" 1" , " 2" , " 1" , " 0" }},
247- {version_weaver::version{" 1" , " 0" , " 0" , " 1" }, " 1.0.0-1" ,
248- version_weaver::release_type::RELEASE, " 1.0.0" ,
249- version_weaver::version{" 1" , " 0" , " 0" }},
250- {version_weaver::version{" 1" , " 2" , " 0" , " 1" }, " 1.2.0-1" ,
251- version_weaver::release_type::RELEASE, " 1.2.0" ,
252- version_weaver::version{" 1" , " 2" , " 0" }},
253- {version_weaver::version{" 1" , " 2" , " 3" , " 1" }, " 1.2.3-1" ,
254- version_weaver::release_type::RELEASE, " 1.2.3" ,
255- version_weaver::version{" 1" , " 2" , " 3" }},
256- {version_weaver::version{" 1" , " 2" , " 3" }, " 1.2.3" ,
257- version_weaver::release_type::RELEASE, " 1.2.3" ,
258- std::unexpected (version_weaver::parse_error::INVALID_INPUT)},
259- {version_weaver::version{" 1" , " 2" , " 4" }, " 1.2.4" ,
260- version_weaver::release_type::PRE_RELEASE, " 1.2.5-0" ,
261- version_weaver::version{" 1" , " 2" , " 5" , " 0" }},
262- {version_weaver::version{" 1" , " 2" , " 3" , " 0" }, " 1.2.3-0" ,
263- version_weaver::release_type::PRE_RELEASE, " 1.2.3-1" ,
264- version_weaver::version{" 1" , " 2" , " 3" , " 1" }},
196+ // {version_weaver::version{"1", "2", "3"}, "1.2.3",
197+ // version_weaver::release_type::MINOR, "1.3.0",
198+ // version_weaver::version{"1", "3", "0"}},
199+ // {version_weaver::version{"1", "2", "3"}, "1.2.3",
200+ // version_weaver::release_type::PATCH, "1.2.4",
201+ // version_weaver::version{"1", "2", "4"}},
202+ // {version_weaver::version{"1", "2", "3", "tag"}, "1.2.3-tag",
203+ // version_weaver::release_type::MAJOR, "2.0.0",
204+ // version_weaver::version{"2", "0", "0"}},
205+ // {version_weaver::version{"1", "2", "3"}, "1.2.3",
206+ // static_cast<version_weaver::release_type>(-1), "",
207+ // std::unexpected(version_weaver::parse_error::INVALID_RELEASE_TYPE)},
208+ // {version_weaver::version{"1", "2", "0", "0"}, "1.2.0-0",
209+ // version_weaver::release_type::PATCH, "1.2.0",
210+ // version_weaver::version{"1", "2", "0"}},
211+ // {version_weaver::version{"fake"}, "fake",
212+ // version_weaver::release_type::MAJOR, "",
213+ // std::unexpected(version_weaver::parse_error::INVALID_MAJOR)},
214+ // {version_weaver::version{"1", "2", "3", "4"}, "1.2.3-4",
215+ // version_weaver::release_type::MAJOR, "2.0.0",
216+ // version_weaver::version{"2", "0", "0"}},
217+ // {version_weaver::version{"1", "2", "3", "4"}, "1.2.3-4",
218+ // version_weaver::release_type::MINOR, "1.3.0",
219+ // version_weaver::version{"1", "3", "0"}},
220+ // {version_weaver::version{"1", "2", "3", "4"}, "1.2.3-4",
221+ // version_weaver::release_type::PATCH, "1.2.3",
222+ // version_weaver::version{"1", "2", "3"}},
223+ // {version_weaver::version{"1", "2", "3", "alpha.0.beta"},
224+ // "1.2.3-alpha.0.beta", version_weaver::release_type::MAJOR, "2.0.0",
225+ // version_weaver::version{"2", "0", "0"}},
226+ // {version_weaver::version{"1", "2", "3", "alpha.0.beta"},
227+ // "1.2.3-alpha.0.beta", version_weaver::release_type::MINOR, "1.3.0",
228+ // version_weaver::version{"1", "3", "0"}},
229+ // {version_weaver::version{"1", "2", "3", "alpha.0.beta"},
230+ // "1.2.3-alpha.0.beta", version_weaver::release_type::PATCH, "1.2.3",
231+ // version_weaver::version{"1", "2", "3"}},
232+ // {version_weaver::version{"1", "2", "0"}, "1.2.0",
233+ // version_weaver::release_type::PRE_MAJOR, "2.0.0-0",
234+ // version_weaver::version{"2", "0", "0", "0"}},
235+ // {version_weaver::version{"1", "2", "0"}, "1.2.0",
236+ // version_weaver::release_type::PRE_MINOR, "1.3.0-0",
237+ // version_weaver::version{"1", "3", "0", "0"}},
238+ // {version_weaver::version{"1", "2", "3", "1"}, "1.2.3-1",
239+ // version_weaver::release_type::PRE_MINOR, "1.3.0-0",
240+ // version_weaver::version{"1", "3", "0", "0"}},
241+ // {version_weaver::version{"1", "2", "0"}, "1.2.0",
242+ // version_weaver::release_type::PRE_PATCH, "1.2.1-0",
243+ // version_weaver::version{"1", "2", "1", "0"}},
244+ // {version_weaver::version{"1", "2", "0", "1"}, "1.2.0-1",
245+ // version_weaver::release_type::PRE_PATCH, "1.2.1-0",
246+ // version_weaver::version{"1", "2", "1", "0"}},
247+ // {version_weaver::version{"1", "0", "0", "1"}, "1.0.0-1",
248+ // version_weaver::release_type::RELEASE, "1.0.0",
249+ // version_weaver::version{"1", "0", "0"}},
250+ // {version_weaver::version{"1", "2", "0", "1"}, "1.2.0-1",
251+ // version_weaver::release_type::RELEASE, "1.2.0",
252+ // version_weaver::version{"1", "2", "0"}},
253+ // {version_weaver::version{"1", "2", "3", "1"}, "1.2.3-1",
254+ // version_weaver::release_type::RELEASE, "1.2.3",
255+ // version_weaver::version{"1", "2", "3"}},
256+ // {version_weaver::version{"1", "2", "3"}, "1.2.3",
257+ // version_weaver::release_type::RELEASE, "1.2.3",
258+ // std::unexpected(version_weaver::parse_error::INVALID_INPUT)},
259+ // {version_weaver::version{"1", "2", "4"}, "1.2.4",
260+ // version_weaver::release_type::PRE_RELEASE, "1.2.5-0",
261+ // version_weaver::version{"1", "2", "5", "0"}},
262+ // {version_weaver::version{"1", "2", "3", "0"}, "1.2.3-0",
263+ // version_weaver::release_type::PRE_RELEASE, "1.2.3-1",
264+ // version_weaver::version{"1", "2", "3", "1"}},
265265};
266266
267267TEST (basictests, inc) {
@@ -270,7 +270,7 @@ TEST(basictests, inc) {
270270 auto incremented_str = version_weaver::inc (input, release_type);
271271 ASSERT_EQ (incremented_str.has_value (), expected.has_value ());
272272 if (incremented_str.has_value ()) {
273- ASSERT_EQ (* incremented_str, str);
273+ ASSERT_EQ (incremented_str, str);
274274 auto incremented = version_weaver::parse (*incremented_str);
275275 ASSERT_TRUE (incremented.has_value ());
276276 ASSERT_EQ (incremented->major , expected->major );
0 commit comments